Skip to content

Commit 46ff3df

Browse files
aford173tmlind
authored andcommitted
ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35
The pinout of the OMAP35 and DM37 variants of the SOM-LV are the same, but the macros which define the pinmuxing are different between OMAP3530 and DM3730. The pinmuxing was correct for for the DM3730, but wrong for the OMAP3530. Since the boot loader was correctly pin-muxing the pins, this was not obvious. As the bootloader not guaranteed to pinmux all the pins any more, this causes an issue, so the pinmux needs to be moved from a common file to their respective board files. Fixes: f8a2e3f ("ARM: dts: Add minimal support for LogicPD OMAP35xx SOM-LV devkit") Signed-off-by: Adam Ford <[email protected]> Message-Id: <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 942da3a commit 46ff3df

File tree

3 files changed

+30
-15
lines changed

3 files changed

+30
-15
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,18 @@
1111
model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit";
1212
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3430", "ti,omap3";
1313
};
14+
15+
&omap3_pmx_core2 {
16+
pinctrl-names = "default";
17+
pinctrl-0 = <&hsusb2_2_pins>;
18+
hsusb2_2_pins: pinmux_hsusb2_2_pins {
19+
pinctrl-single,pins = <
20+
OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
21+
OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
22+
OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */
23+
OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */
24+
OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */
25+
OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */
26+
>;
27+
};
28+
};

arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,18 @@
1111
model = "LogicPD Zoom DM3730 SOM-LV Development Kit";
1212
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3";
1313
};
14+
15+
&omap3_pmx_core2 {
16+
pinctrl-names = "default";
17+
pinctrl-0 = <&hsusb2_2_pins>;
18+
hsusb2_2_pins: pinmux_hsusb2_2_pins {
19+
pinctrl-single,pins = <
20+
OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
21+
OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
22+
OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */
23+
OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */
24+
OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */
25+
OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */
26+
>;
27+
};
28+
};

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -265,21 +265,6 @@
265265
};
266266
};
267267

268-
&omap3_pmx_core2 {
269-
pinctrl-names = "default";
270-
pinctrl-0 = <&hsusb2_2_pins>;
271-
hsusb2_2_pins: pinmux_hsusb2_2_pins {
272-
pinctrl-single,pins = <
273-
OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
274-
OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
275-
OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */
276-
OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */
277-
OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */
278-
OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */
279-
>;
280-
};
281-
};
282-
283268
&uart2 {
284269
interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
285270
pinctrl-names = "default";

0 commit comments

Comments
 (0)