diff options
-rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 3 | ||||
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 9b0494a8ab45..739fcf29c643 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts | |||
@@ -659,6 +659,9 @@ | |||
659 | 659 | ||
660 | ethernet@gpmc { | 660 | ethernet@gpmc { |
661 | compatible = "smsc,lan91c94"; | 661 | compatible = "smsc,lan91c94"; |
662 | |||
663 | status = "disabled"; | ||
664 | |||
662 | interrupt-parent = <&gpio2>; | 665 | interrupt-parent = <&gpio2>; |
663 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ | 666 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ |
664 | reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ | 667 | reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ |
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 69c7bed3c634..16e719c268dd 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
@@ -51,6 +51,7 @@ CONFIG_SOC_AM43XX=y | |||
51 | CONFIG_SOC_DRA7XX=y | 51 | CONFIG_SOC_DRA7XX=y |
52 | CONFIG_ARM_THUMBEE=y | 52 | CONFIG_ARM_THUMBEE=y |
53 | CONFIG_ARM_ERRATA_411920=y | 53 | CONFIG_ARM_ERRATA_411920=y |
54 | CONFIG_ARM_ERRATA_430973=y | ||
54 | CONFIG_SMP=y | 55 | CONFIG_SMP=y |
55 | CONFIG_NR_CPUS=2 | 56 | CONFIG_NR_CPUS=2 |
56 | CONFIG_CMA=y | 57 | CONFIG_CMA=y |