diff options
| author | Olof Johansson | 2019-06-16 22:33:51 +0200 |
|---|---|---|
| committer | Olof Johansson | 2019-06-16 22:33:51 +0200 |
| commit | 80d1d46525459df73b670b72328d04e9f8d7e0da (patch) | |
| tree | afab5c14236612b791b56e4ec5d71c63952dd31a /arch/arm/boot/dts/am335x-pcm-953.dtsi | |
| parent | Merge tag 'davinci-fixes-for-v5.2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: dts: am335x phytec boards: Fix cd-gpios active level (diff) | |
| download | kernel-qcow2-linux-80d1d46525459df73b670b72328d04e9f8d7e0da.tar.gz kernel-qcow2-linux-80d1d46525459df73b670b72328d04e9f8d7e0da.tar.xz kernel-qcow2-linux-80d1d46525459df73b670b72328d04e9f8d7e0da.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/am335x-pcm-953.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am335x-pcm-953.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi index baceaa7bb33b..20a3d9827692 100644 --- a/arch/arm/boot/dts/am335x-pcm-953.dtsi +++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi @@ -197,7 +197,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; }; |