diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 08:56:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 08:56:43 +0200 |
| commit | 461f8cfc7ea788428240271818363333ceff5c4c (patch) | |
| tree | a3d6e3737c203ea29f8db2a6ddaadc326247376c /dts/src/arm/am335x-nano.dts | |
| parent | 6345d37ae50c3ac8dd0e6176bc846fe211cbddd4 (diff) | |
| download | barebox-461f8cfc7ea788428240271818363333ceff5c4c.tar.gz barebox-461f8cfc7ea788428240271818363333ceff5c4c.tar.xz | |
dts: update to v4.1-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/am335x-nano.dts')
| -rw-r--r-- | dts/src/arm/am335x-nano.dts | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/dts/src/arm/am335x-nano.dts b/dts/src/arm/am335x-nano.dts index a3466455b1..5ed4ca6eaf 100644 --- a/dts/src/arm/am335x-nano.dts +++ b/dts/src/arm/am335x-nano.dts @@ -213,7 +213,9 @@ pinctrl-0 = <&i2c0_pins>; gpio@20 { - compatible = "mcp,mcp23017"; + compatible = "microchip,mcp23017"; + gpio-controller; + #gpio-cells = <2>; reg = <0x20>; }; @@ -222,7 +224,7 @@ }; eeprom@53 { - compatible = "mcp,24c02"; + compatible = "microchip,24c02"; reg = <0x53>; pagesize = <8>; }; @@ -297,8 +299,8 @@ | |-->0x004FFFFF-> Kernel end | |-->0x00500000-> File system start | | - | |-->0x014FFFFF-> File system end - | |-->0x01500000-> User data start + | |-->0x01FFFFFF-> File system end + | |-->0x02000000-> User data start | | | |-->0x03FFFFFF-> User data end | |-->0x04000000-> Data storage start @@ -327,12 +329,12 @@ partition@4 { label = "rootfs"; - reg = <0x00500000 0x01000000>; /* 16MB */ + reg = <0x00500000 0x01b00000>; /* 27MB */ }; partition@5 { label = "user"; - reg = <0x01500000 0x02b00000>; /* 43MB */ + reg = <0x02000000 0x02000000>; /* 32MB */ }; partition@6 { @@ -343,7 +345,7 @@ }; &mac { - dual_emac = <1>; + dual_emac; status = "okay"; }; @@ -353,11 +355,13 @@ &cpsw_emac0 { phy_id = <&davinci_mdio>, <0>; + phy-mode = "mii"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { phy_id = <&davinci_mdio>, <1>; + phy-mode = "mii"; dual_emac_res_vlan = <2>; }; |