diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-05 08:53:55 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-05 08:53:55 +0100 |
commit | d76450cb737840af6a13d9c615f96f2502f8383e (patch) | |
tree | 15796a3e69de663efa26d3180b54e1703a0ab0ae /dts/src/arm/am3517.dtsi | |
parent | bd5af051ed921539730ff96c8f4d4aee79d75d14 (diff) | |
parent | ab95809200f63b7ce74caac03d72639b3cf64669 (diff) | |
download | barebox-d76450cb737840af6a13d9c615f96f2502f8383e.tar.gz barebox-d76450cb737840af6a13d9c615f96f2502f8383e.tar.xz |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm/am3517.dtsi')
-rw-r--r-- | dts/src/arm/am3517.dtsi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/dts/src/arm/am3517.dtsi b/dts/src/arm/am3517.dtsi index 00da3f2c40..ca294914bb 100644 --- a/dts/src/arm/am3517.dtsi +++ b/dts/src/arm/am3517.dtsi @@ -26,7 +26,7 @@ interrupt-names = "mc"; }; - davinci_emac: ethernet@0x5c000000 { + davinci_emac: ethernet@5c000000 { compatible = "ti,am3517-emac"; ti,hwmods = "davinci_emac"; status = "disabled"; @@ -41,7 +41,7 @@ local-mac-address = [ 00 00 00 00 00 00 ]; }; - davinci_mdio: ethernet@0x5c030000 { + davinci_mdio: ethernet@5c030000 { compatible = "ti,davinci_mdio"; ti,hwmods = "davinci_mdio"; status = "disabled"; @@ -99,9 +99,5 @@ status = "disabled"; }; -&smartreflex_mpu_iva { - status = "disabled"; -}; - /include/ "am35xx-clocks.dtsi" /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi" |