summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/am3517.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-01-22 12:36:57 +0100
committerArnd Bergmann <arnd@arndb.de>2018-01-22 12:36:57 +0100
commit6ab1e867acb9d73c36dd60dd1c97da1b74a42e0d (patch)
treed190344863a0f13abf5fb4a02efbf538b99d58f7 /arch/arm/boot/dts/am3517.dtsi
parente8bfa0422469cdfc86be3f525f621b1d44d2481b (diff)
parente14d7e5320ebae9bffe4fbd585dfdd9d6de2550f (diff)
downloadtalos-obmc-linux-6ab1e867acb9d73c36dd60dd1c97da1b74a42e0d.tar.gz
talos-obmc-linux-6ab1e867acb9d73c36dd60dd1c97da1b74a42e0d.zip
Merge tag 'omap-for-v4.16/dt-clk-dts-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "Few omap interconnect dts fixes for v4.16 merge window" from Tony Lindgren: Now that we have the dts clocks for the clkctrl clock and the interconnect binding, we need to update the existing ti-sysc users according to the binding to make it usable for drivers. Apologies for not being able to send this earlier but it took me few revisions to get the smartreflex changes right and tested with yet to be posted patches to make smartreflex probe with dts and I wanted to have it sit in next for a while to make sure we're not introducing regressions for legacy platform data based booting. Note that this is based on a merge with commit 20a2742e5784 ("dt-bindings: ti-sysc: Update binding for timers and capabilities") to avoid a merge conflict with the binding changes. * tag 'omap-for-v4.16/dt-clk-dts-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Update ti-sysc data for existing users ARM: dts: Fix smartreflex compatible for omap3 shared mpu-iva instance dt-bindings: ti-sysc: Update binding for timers and capabilities
Diffstat (limited to 'arch/arm/boot/dts/am3517.dtsi')
-rw-r--r--arch/arm/boot/dts/am3517.dtsi4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index 76994165fb3a..ca294914bbb1 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -99,9 +99,5 @@
status = "disabled";
};
-&smartreflex_mpu_iva {
- status = "disabled";
-};
-
/include/ "am35xx-clocks.dtsi"
/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
OpenPOWER on IntegriCloud