Skip to contentSkip to conversation

ARM: dts: logicpd-som-lv: Resync with Kernel 5.1.9

PATCH New Adam Ford 2 participants 2 messages Jun 12, 2019 – Jul 14, 2019 Arm (32-bit)

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 ARM: dts: logicpd-som-lv: Resync with Kernel 5.1.9

The MMC card-detect pin was incorrectly defined which was fixed. This patch resync's the dts and removes the u-boot specific fix.

arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi +0 -4
index b3da8b1a73..956199a2b4 100644
@@ -20,10 +20,6 @@
 	clock-frequency = <400000>;
 };
 
-&mmc1 {
-	cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;		/* gpio_110 */
-};
-
 &mmc2 {
       status = "disabled";
 };
arch/arm/dts/logicpd-som-lv-baseboard.dtsi +2 -2
index 3524766515..4990ed90dc 100644
@@ -152,8 +152,8 @@
 	interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc1_pins>;
-	wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;	/* gpio_126 */
-	cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;		/* gpio_110 */
+	wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;		/* gpio_126 */
+	cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>;		/* gpio_110 */
 	vmmc-supply = <&vmmc1>;
 	bus-width = <4>;
 	cap-power-off-card;
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 ARM: dts: logicpd-som-lv: Resync with Kernel 5.1.9

arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi

Quoted 7 lines · Adam Ford

The MMC card-detect pin was incorrectly defined which was fixed. This patch resync's the dts and removes the u-boot specific fix.

arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi +0 -0
index b3da8b1a73..956199a2b4 100644

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190714/15a896d8/attachment.sig>