Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'omap-for-v5.2/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omap variants

Three fixes mostly for dra7 SoC variants that have some devices disabled
compared to the base SoC. These got broken by the change of making devices
probe with ti-sysc interconnect target module and went unnnoticed for a
while. And there is no clkcel bit for timer12 unlike timer1. Also included
is a GPIO direction fix for phytec SDIO card detection.

* tag 'omap-for-v5.2/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x phytec boards: Fix cd-gpios active level
ARM: dts: dra72x: Disable usb4_tm target module
ARM: dts: Drop bogus CLKSEL for timer12 on dra7

Signed-off-by: Olof Johansson <olof@lixom.net>

+6 -4
+1 -1
arch/arm/boot/dts/am335x-pcm-953.dtsi
··· 197 197 bus-width = <4>; 198 198 pinctrl-names = "default"; 199 199 pinctrl-0 = <&mmc1_pins>; 200 - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; 200 + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 201 201 status = "okay"; 202 202 }; 203 203
+1 -1
arch/arm/boot/dts/am335x-wega.dtsi
··· 157 157 bus-width = <4>; 158 158 pinctrl-names = "default"; 159 159 pinctrl-0 = <&mmc1_pins>; 160 - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; 160 + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 161 161 status = "okay"; 162 162 }; 163 163
-2
arch/arm/boot/dts/dra7-l4.dtsi
··· 4450 4450 timer12: timer@0 { 4451 4451 compatible = "ti,omap5430-timer"; 4452 4452 reg = <0x0 0x80>; 4453 - clocks = <&wkupaon_clkctrl DRA7_WKUPAON_TIMER12_CLKCTRL 24>; 4454 - clock-names = "fck"; 4455 4453 interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; 4456 4454 ti,timer-alwon; 4457 4455 ti,timer-secure;
+4
arch/arm/boot/dts/dra72x.dtsi
··· 62 62 &pcie2_rc { 63 63 compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie"; 64 64 }; 65 + 66 + &usb4_tm { 67 + status = "disabled"; 68 + };