Commit 163d65cb authored May 15, 2019 by Olof Johansson

Merge tag 'omap-for-v5.1/fixes-rc6' of...

Merge tag 'omap-for-v5.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/late

Two regression fixes for omaps

Two one-liners to fix board-ams-delta booting regression and
logicpd-som-lv MMC card detect to use GPIO_ACTIVE_LOW instead of
IRQ_TYPE_LEVEL_LOW. Note that the board-ams-delta regression has
been in there already since v5.0, so if necessary these can wait
for the merge window.

* tag 'omap-for-v5.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: logicpd-som-lv: Fix MMC1 card detect
  ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled

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

parents 8e7b65a6 6a38df67

arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&mmc1_pins>;
		wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */
		cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */
		cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* gpio_110 */
		vmmc-supply = <&vmmc1>;
		bus-width = <4>;
		cap-power-off-card;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -749,7 +749,7 @@ static void __init ams_delta_init(void)
		ARRAY_SIZE(ams_delta_gpio_tables));

		leds_pdev = gpio_led_register_device(PLATFORM_DEVID_NONE, &leds_pdata);
		if (!IS_ERR(leds_pdev)) {
		if (!IS_ERR_OR_NULL(leds_pdev)) {
		leds_gpio_table.dev_id = dev_name(&leds_pdev->dev);
		gpiod_add_lookup_table(&leds_gpio_table);
		}

Admin message