| Message ID | 20180608142630.24686-1-aford173@gmail.com |
|---|---|
| State | Accepted |
| Commit | acaee30608ce203289a180d664b7f0abb2e64ee7 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] ARM: DTS: resync a3517.dtsi with Linux 4.17 | expand |
On Fri, Jun 08, 2018 at 09:26:30AM -0500, Adam Ford wrote: > Linux 4.17 was just released with some minor changes to the > am3517.dtsi. This patch re-syncs the file. > > Signed-off-by: Adam Ford <aford173@gmail.com> > > diff --git a/arch/arm/dts/am3517.dtsi b/arch/arm/dts/am3517.dtsi > index 00da3f2c40..ca294914bb 100644 Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/am3517.dtsi b/arch/arm/dts/am3517.dtsi index 00da3f2c40..ca294914bb 100644 --- a/arch/arm/dts/am3517.dtsi +++ b/arch/arm/dts/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"
Linux 4.17 was just released with some minor changes to the am3517.dtsi. This patch re-syncs the file. Signed-off-by: Adam Ford <aford173@gmail.com>