diff options
| -rw-r--r-- | arch/arm/boot/dts/am335x-nano.dts | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts index a3466455b171..5ed4ca6eaf55 100644 --- a/arch/arm/boot/dts/am335x-nano.dts +++ b/arch/arm/boot/dts/am335x-nano.dts | |||
| @@ -213,7 +213,9 @@ | |||
| 213 | pinctrl-0 = <&i2c0_pins>; | 213 | pinctrl-0 = <&i2c0_pins>; |
| 214 | 214 | ||
| 215 | gpio@20 { | 215 | gpio@20 { |
| 216 | compatible = "mcp,mcp23017"; | 216 | compatible = "microchip,mcp23017"; |
| 217 | gpio-controller; | ||
| 218 | #gpio-cells = <2>; | ||
| 217 | reg = <0x20>; | 219 | reg = <0x20>; |
| 218 | }; | 220 | }; |
| 219 | 221 | ||
| @@ -222,7 +224,7 @@ | |||
| 222 | }; | 224 | }; |
| 223 | 225 | ||
| 224 | eeprom@53 { | 226 | eeprom@53 { |
| 225 | compatible = "mcp,24c02"; | 227 | compatible = "microchip,24c02"; |
| 226 | reg = <0x53>; | 228 | reg = <0x53>; |
| 227 | pagesize = <8>; | 229 | pagesize = <8>; |
| 228 | }; | 230 | }; |
| @@ -297,8 +299,8 @@ | |||
| 297 | | |-->0x004FFFFF-> Kernel end | 299 | | |-->0x004FFFFF-> Kernel end |
| 298 | | |-->0x00500000-> File system start | 300 | | |-->0x00500000-> File system start |
| 299 | | | | 301 | | | |
| 300 | | |-->0x014FFFFF-> File system end | 302 | | |-->0x01FFFFFF-> File system end |
| 301 | | |-->0x01500000-> User data start | 303 | | |-->0x02000000-> User data start |
| 302 | | | | 304 | | | |
| 303 | | |-->0x03FFFFFF-> User data end | 305 | | |-->0x03FFFFFF-> User data end |
| 304 | | |-->0x04000000-> Data storage start | 306 | | |-->0x04000000-> Data storage start |
| @@ -327,12 +329,12 @@ | |||
| 327 | 329 | ||
| 328 | partition@4 { | 330 | partition@4 { |
| 329 | label = "rootfs"; | 331 | label = "rootfs"; |
| 330 | reg = <0x00500000 0x01000000>; /* 16MB */ | 332 | reg = <0x00500000 0x01b00000>; /* 27MB */ |
| 331 | }; | 333 | }; |
| 332 | 334 | ||
| 333 | partition@5 { | 335 | partition@5 { |
| 334 | label = "user"; | 336 | label = "user"; |
| 335 | reg = <0x01500000 0x02b00000>; /* 43MB */ | 337 | reg = <0x02000000 0x02000000>; /* 32MB */ |
| 336 | }; | 338 | }; |
| 337 | 339 | ||
| 338 | partition@6 { | 340 | partition@6 { |
| @@ -343,7 +345,7 @@ | |||
| 343 | }; | 345 | }; |
| 344 | 346 | ||
| 345 | &mac { | 347 | &mac { |
| 346 | dual_emac = <1>; | 348 | dual_emac; |
| 347 | status = "okay"; | 349 | status = "okay"; |
| 348 | }; | 350 | }; |
| 349 | 351 | ||
| @@ -353,11 +355,13 @@ | |||
| 353 | 355 | ||
| 354 | &cpsw_emac0 { | 356 | &cpsw_emac0 { |
| 355 | phy_id = <&davinci_mdio>, <0>; | 357 | phy_id = <&davinci_mdio>, <0>; |
| 358 | phy-mode = "mii"; | ||
| 356 | dual_emac_res_vlan = <1>; | 359 | dual_emac_res_vlan = <1>; |
| 357 | }; | 360 | }; |
| 358 | 361 | ||
| 359 | &cpsw_emac1 { | 362 | &cpsw_emac1 { |
| 360 | phy_id = <&davinci_mdio>, <1>; | 363 | phy_id = <&davinci_mdio>, <1>; |
| 364 | phy-mode = "mii"; | ||
| 361 | dual_emac_res_vlan = <2>; | 365 | dual_emac_res_vlan = <2>; |
| 362 | }; | 366 | }; |
| 363 | 367 | ||
