diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-13 01:20:02 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-13 01:20:02 +0300 |
| commit | 24161e726f67cf7047141893c18d3f1591a52159 (patch) | |
| tree | 36b81b2b5b5b3347ecea3bfc566f33fc2a33078f /arch/arm/boot | |
| parent | 0603a9a84679eb12d9dadb97f4e0ba017e684c7b (diff) | |
| parent | 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 (diff) | |
| download | linux-24161e726f67cf7047141893c18d3f1591a52159.tar.xz | |
Merge tag 'omap-for-v4.20/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Few device fixes for omaps
Here's a collection of minor fixes for annoying usability issues
people have noticed using various devices.
There are two regression fixes:
- A regression fix for omap5 usb3 dual role mode
- A regression fix to ams-delta audio being muted permanently
And two one-liners:
- Fix polarity for am335x-pdu001 SD card detection
- Fix non-working omap4-sdp Ethernet startup for rebind
It would be nice to get these merged during the -rc cycle if
possible. Naturally these can all wait for the merge window too
if we start running out of time.
* tag 'omap-for-v4.20/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: Fix OMAP4430 SDP Ethernet startup
ARM: dts: am335x-pdu001: Fix polarity of card detection input
ARM: OMAP1: ams-delta: Fix audio permanently muted
ARM: dts: omap5: Fix dual-role mode on Super-Speed port
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/am335x-pdu001.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5-board-common.dtsi | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-pdu001.dts b/arch/arm/boot/dts/am335x-pdu001.dts index 6dd9d487aaeb..ae43d61f4e8b 100644 --- a/arch/arm/boot/dts/am335x-pdu001.dts +++ b/arch/arm/boot/dts/am335x-pdu001.dts @@ -585,7 +585,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; - cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; }; &sham { diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 490726b52216..9dc7ec7655cb 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -33,6 +33,7 @@ gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ enable-active-high; regulator-boot-on; + startup-delay-us = <25000>; }; vbat: fixedregulator-vbat { diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi index bf7ca00f4c21..bc853ebeda22 100644 --- a/arch/arm/boot/dts/omap5-board-common.dtsi +++ b/arch/arm/boot/dts/omap5-board-common.dtsi @@ -701,6 +701,7 @@ }; &dwc3 { + extcon = <&extcon_usb3>; dr_mode = "otg"; }; |