Merge tag 'omap-for-v4.20/fixes-rc6' of... (24161e72) · Commits · 戴 / test

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>

arch/arm/boot/dts/am335x-pdu001.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {

arch/arm/boot/dts/omap4-sdp.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -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 {

arch/arm/boot/dts/omap5-board-common.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -701,6 +701,7 @@
		};

		&dwc3 {
		extcon = <&extcon_usb3>;
		dr_mode = "otg";
		};

arch/arm/mach-omap1/board-ams-delta.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -247,8 +247,8 @@ static struct platform_device latch2_gpio_device = {
		#define LATCH2_PIN_SCARD_CMDVCC 11
		#define LATCH2_PIN_MODEM_NRESET 12
		#define LATCH2_PIN_MODEM_CODEC 13
		#define LATCH2_PIN_HOOKFLASH1 14
		#define LATCH2_PIN_HOOKFLASH2 15
		#define LATCH2_PIN_AUDIO_MUTE 14
		#define LATCH2_PIN_HOOKFLASH 15

		static struct regulator_consumer_supply modem_nreset_consumers[] = {
		REGULATOR_SUPPLY("RESET#", "serial8250.1"),
		@@ -588,6 +588,8 @@ static int gpiochip_match_by_label(struct gpio_chip chip, void data)
		static struct gpiod_hog ams_delta_gpio_hogs[] = {
		GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT, "keybrd_dataout",
		GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW),
		GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_AUDIO_MUTE, "audio_mute",
		GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW),
		{},
		};

Admin message