Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ca2f0b9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v4.18' of... 

Merge tag 'davinci-fixes-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

This fixes polarity of SD card write-protect pin on DA850 EVM
and fixes interrupt property for DA850 SoC GPIO as defined in
device-tree.

Both of these are not introduced with v4.18 merge but have
existed prior.

* tag 'davinci-fixes-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: dts: da850: Fix interrups property for gpio
  ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 35911e01 3eb1b955

arch/arm/boot/dts/da850.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -549,11 +549,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			reg = <0x226000 0x1000>;

			interrupts = <42 IRQ_TYPE_EDGE_BOTH

				43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH

				45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH

				47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH

				49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;

			interrupts = <42 43 44 45 46 47 48 49 50>;

			ti,ngpio = <144>;

			ti,davinci-gpio-unbanked = <0>;

			status = "disabled";

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static struct gpiod_lookup_table mmc_gpios_table = { 
		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",

			    GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",

			    GPIO_ACTIVE_LOW),

			    GPIO_ACTIVE_HIGH),

	},

};