diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-14 23:30:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-14 23:30:36 -0700 |
| commit | 6d81dc87c0fac76efabcde6884fcbe4cec874a83 (patch) | |
| tree | 5cf7268e8693832f0e1af446883c0d5e651b7576 /arch/arm | |
| parent | 9a2ad529ed26c4dd81368d0bc87fc77db1febb35 (diff) | |
| parent | b16ccfe02313acd829debfccac45531f45d797cd (diff) | |
| download | blackbird-obmc-linux-6d81dc87c0fac76efabcde6884fcbe4cec874a83.tar.gz blackbird-obmc-linux-6d81dc87c0fac76efabcde6884fcbe4cec874a83.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -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 @@ ethernet@gpmc { compatible = "smsc,lan91c94"; + + status = "disabled"; + interrupt-parent = <&gpio2>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ 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 CONFIG_SOC_DRA7XX=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ERRATA_411920=y +CONFIG_ARM_ERRATA_430973=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_CMA=y |
