Commit 6d81dc87 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'fixes-for-v3.18-merge-window' of...

Merge tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "Two omap fixes for v3.18 merge window" from Tony Lindgren:

Two omap fixes for issues noticed during the merge window:

- We need to enable ARM errata 430973 for omap3

- The smc91x on some early n900 boards need to be disabled
  for now until the dependencies to specific a bootloader
  version are fixed

* tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Disable smc91x on n900 until bootloader dependency is removed
  ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9a2ad529 b16ccfe0
...@@ -659,6 +659,9 @@ partition@5 { ...@@ -659,6 +659,9 @@ partition@5 {
ethernet@gpmc { ethernet@gpmc {
compatible = "smsc,lan91c94"; compatible = "smsc,lan91c94";
status = "disabled";
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */
......
...@@ -51,6 +51,7 @@ CONFIG_SOC_AM43XX=y ...@@ -51,6 +51,7 @@ CONFIG_SOC_AM43XX=y
CONFIG_SOC_DRA7XX=y CONFIG_SOC_DRA7XX=y
CONFIG_ARM_THUMBEE=y CONFIG_ARM_THUMBEE=y
CONFIG_ARM_ERRATA_411920=y CONFIG_ARM_ERRATA_411920=y
CONFIG_ARM_ERRATA_430973=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_NR_CPUS=2 CONFIG_NR_CPUS=2
CONFIG_CMA=y CONFIG_CMA=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment