Skip to contentSkip to conversation

ARM: dts: logicpd-torpedo: Resyc DTS files with Linux 5.17-rc5

PATCH In review Adam Ford 2 participants 2 messages Feb 26, 2022 – Mar 14, 2022 Arm (32-bit)

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 ARM: dts: logicpd-torpedo: Resyc DTS files with Linux 5.17-rc5

Resyc DTS files with Linux 5.17-rc5.

arch/arm/dts/logicpd-torpedo-35xx-devkit.dts +9 -1
index 7675bc3fa8..cb08aa62d9 100644
@@ -9,5 +9,13 @@
 
 / {
 	model = "LogicPD Zoom OMAP35xx Torpedo Development Kit";
-	compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3";
+	compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3430", "ti,omap3";
+};
+
+&omap3_pmx_core {
+	isp1763_pins: pinmux_isp1763_pins {
+		pinctrl-single,pins = <
+			OMAP3_CORE1_IOPAD(0x2154,  PIN_INPUT_PULLUP | MUX_MODE4)	/* sdmmc1_dat6.gpio_128 */
+		>;
+	};
 };
arch/arm/dts/logicpd-torpedo-37xx-devkit.dts +23 -0
index 18c27e8505..07ea822fe4 100644
@@ -50,6 +50,20 @@
 	};
 };
 
+&uart2 {
+	/delete-property/dma-names;
+	bluetooth {
+		compatible = "ti,wl1283-st";
+		enable-gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio 162 */
+		max-speed = <3000000>;
+	};
+};
+
+/* The DM3730 has a faster L3 than OMAP35, so increase pixel clock */
+&mt9p031_out {
+	pixel-clock-frequency = <90000000>;
+};
+
 &omap3_pmx_core {
 	mmc3_pins: pinmux_mm3_pins {
 		pinctrl-single,pins = <
@@ -71,3 +85,12 @@
 		>;
 	};
 };
+
+/* The gpio muxing between omap3530 and dm3730 is different for GPIO_128 */
+&omap3_pmx_wkup {
+	isp1763_pins: pinmux_isp1763_pins {
+		pinctrl-single,pins = <
+			OMAP3_WKUP_IOPAD(0x2a58, PIN_INPUT_PULLUP | MUX_MODE4)	/* reserved.gpio_128 */
+		>;
+	};
+};
arch/arm/dts/logicpd-torpedo-baseboard.dtsi +62 -33

147 lines not on this page · raw message

arch/arm/dts/logicpd-torpedo-som.dtsi +9 -0
index 3fdd0a72f8..3a5228562b 100644
@@ -35,6 +35,11 @@
 	};
 };
 
+/* The Torpedo doesn't route the USB host pins */
+&usbhshost {
+	status = "disabled";
+};
+
 &gpmc {
 	ranges = <0 0 0x30000000 0x1000000>;	/* CS0: 16MB for NAND */
 
@@ -192,3 +197,7 @@
 &twl_gpio {
 	ti,use-leds;
 };
+
+&twl_keypad {
+	status = "disabled";
+};
Signature · 1 line
2.34.1
#1 lore raw

arch/arm/dts/logicpd-torpedo-35xx-devkit.dts

Quoted 6 lines · Adam Ford

Resyc DTS files with Linux 5.17-rc5.

arch/arm/dts/logicpd-torpedo-35xx-devkit.dts +0 -0
index 7675bc3fa8..cb08aa62d9 100644

Applied to u-boot/next, thanks!

Signature · 1 line
Tom