Skip to content

Commit 4ca2f0b

Browse files
committed
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: Olof Johansson <olof@lixom.net>
2 parents 35911e0 + 3eb1b95 commit 4ca2f0b

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

arch/arm/boot/dts/da850.dtsi

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,7 @@
549549
gpio-controller;
550550
#gpio-cells = <2>;
551551
reg = <0x226000 0x1000>;
552-
interrupts = <42 IRQ_TYPE_EDGE_BOTH
553-
43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
554-
45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH
555-
47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH
556-
49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;
552+
interrupts = <42 43 44 45 46 47 48 49 50>;
557553
ti,ngpio = <144>;
558554
ti,davinci-gpio-unbanked = <0>;
559555
status = "disabled";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ static struct gpiod_lookup_table mmc_gpios_table = {
774774
GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",
775775
GPIO_ACTIVE_LOW),
776776
GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",
777-
GPIO_ACTIVE_LOW),
777+
GPIO_ACTIVE_HIGH),
778778
},
779779
};
780780

0 commit comments

Comments
 (0)