openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: omap4-devkit8000: fix gpmc ranges property 

With two separate &gpmc nodes the second ranges property overwrites the
first. So put nand and ethernet in a single node and merge the ranges.

While at it also fix the ethernet suffix.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Uwe Kleine-König 2017-05-18 15:00:09 +02:00 committed by Tony Lindgren
parent 5c73cdf2bd
commit bd71af3c71
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
View File

@ -201,7 +201,8 @@ &mcbsp2 {
}; };
&gpmc { &gpmc {
ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */ ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */
6 0 0x2c000000 0x1000000>; /* CS6: 16MB for DM9000 */
nand@0,0 { nand@0,0 {
compatible = "ti,omap2-nand"; compatible = "ti,omap2-nand";
@ -256,12 +257,8 @@ filesystem@680000 {
reg = <0x680000 0xf980000>; reg = <0x680000 0xf980000>;
}; };
}; };
};
&gpmc { ethernet@6,0 {
ranges = <6 0 0x2c000000 0x1000000>; /* CS6: 16MB for DM9000 */
ethernet@0,0 {
compatible = "davicom,dm9000"; compatible = "davicom,dm9000";
reg = <6 0x000 2 reg = <6 0x000 2
6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */ 6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */