diff options
| author |   Tony Lindgren <tony@atomide.com> | 2016-02-26 10:42:54 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-02-26 10:42:54 -0800 |
| commit | 26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c (patch) | |
| tree | f937c2fad897c6ea1edf51cb9453707533763967 /arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | |
| parent | ARM: dts: am57xx-beagle-x15: Add eeprom information (diff) | |
| parent | ARM: dts: omap3: Fix NAND device nodes (diff) | |
| download | linux-dev-26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c.tar.xz linux-dev-26c23ee6577fffbb11f6d22dcf6fa4b3602dd26c.zip | |
Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt
Diffstat (limited to 'arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts')
| -rw-r--r-- | arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts index 6cbcce26eaca..3f91b60487a3 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts @@ -102,7 +102,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"; |