diff options
| author | Adam Ford <aford173@gmail.com> | 2017-10-31 19:42:13 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-11-28 16:04:44 +0100 |
| commit | 3c18bbf3d11d2005da08b57ff26f44ff1c2b12d0 (patch) | |
| tree | 2feef3e343d42c94d09f6da59fb95b571c42c3d7 | |
| parent | ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen (diff) | |
| download | linux-3c18bbf3d11d2005da08b57ff26f44ff1c2b12d0.tar.xz linux-3c18bbf3d11d2005da08b57ff26f44ff1c2b12d0.zip | |
ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet
This patch fixes and issue where the NAND and GPMC based ethernet
controller stopped working. This also updates the GPMC settings
to be consistent with the Logic PD Torpedo development from the
commit listed above.
Fixes: 44e4716499b8 ("ARM: dts: omap3: Fix NAND device nodes")
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/logicpd-som-lv.dtsi | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts index 38faa90007d7..2fa5eb4bd402 100644 --- a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts @@ -72,7 +72,8 @@ }; &gpmc { - ranges = <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */ + ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */ + 1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */ ethernet@gpmc { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index 26cce4d18405..c5edc7fe4837 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -37,7 +37,7 @@ }; &gpmc { - ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ + ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */ nand@0,0 { compatible = "ti,omap2-nand"; |