From: Tony Lindgren Date: Wed, 20 Nov 2019 18:01:38 +0000 (-0800) Subject: Merge tag 'omap-for-v5.5/soc-late-signed' into omap-for-v5.5/ti-sysc-late X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b82049f2c1395d0bf99f0ae291c748c9dcb7d507;p=linux.git Merge tag 'omap-for-v5.5/soc-late-signed' into omap-for-v5.5/ti-sysc-late Few late SoC changes for v5.5 merge window These changes just clean up few typos, and there is one non-critical correction of missing put_device() after calling of_platform_populate() for display controller. Naturally none of this is urgent and can be merged when suitable. --- b82049f2c1395d0bf99f0ae291c748c9dcb7d507 diff --cc arch/arm/boot/dts/am33xx-l4.dtsi index b75ed0b0aa8b4,7a9eb2b0d45b0..3a8a205c27b58 --- a/arch/arm/boot/dts/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/am33xx-l4.dtsi @@@ -127,8 -127,9 +127,8 @@@ ranges = <0x0 0x5000 0x1000>; }; - target-module@7000 { /* 0x44e07000, ap 14 20.0 */ + gpio0_target: target-module@7000 { /* 0x44e07000, ap 14 20.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "gpio1"; reg = <0x7000 0x4>, <0x7010 0x4>, <0x7114 0x4>;