lkml.org 
[lkml]   [2022]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 29/88] ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35
    Date
    From: Adam Ford <aford173@gmail.com>

    [ Upstream commit 46ff3df87215ff42c0cd2c4bdb7d74540384a69c ]

    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: f8a2e3ff7103 ("ARM: dts: Add minimal support for LogicPD OMAP35xx SOM-LV devkit")
    Signed-off-by: Adam Ford <aford173@gmail.com>
    Message-Id: <20220303171818.11060-1-aford173@gmail.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 15 +++++++++++++++
    arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 15 +++++++++++++++
    arch/arm/boot/dts/logicpd-som-lv.dtsi | 15 ---------------
    3 files changed, 30 insertions(+), 15 deletions(-)

    diff --git a/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts
    index 32d0dc371fc3..4cd72b5e612b 100644
    --- a/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts
    +++ b/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts
    @@ -15,3 +15,18 @@ / {
    model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit";
    compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3";
    };
    +
    +&omap3_pmx_core2 {
    + pinctrl-names = "default";
    + pinctrl-0 = <&hsusb2_2_pins>;
    + hsusb2_2_pins: pinmux_hsusb2_2_pins {
    + pinctrl-single,pins = <
    + OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
    + OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
    + OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */
    + OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */
    + OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */
    + OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */
    + >;
    + };
    +};
    diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
    index 24283739526c..2aca9111c699 100644
    --- a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
    +++ b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
    @@ -15,3 +15,18 @@ / {
    model = "LogicPD Zoom DM3730 SOM-LV Development Kit";
    compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3";
    };
    +
    +&omap3_pmx_core2 {
    + pinctrl-names = "default";
    + pinctrl-0 = <&hsusb2_2_pins>;
    + hsusb2_2_pins: pinmux_hsusb2_2_pins {
    + pinctrl-single,pins = <
    + OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
    + OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
    + OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */
    + OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */
    + OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */
    + OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */
    + >;
    + };
    +};
    diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
    index c5d54c4d3747..499eea86e102 100644
    --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
    +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
    @@ -269,21 +269,6 @@ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
    };
    };

    -&omap3_pmx_core2 {
    - pinctrl-names = "default";
    - pinctrl-0 = <&hsusb2_2_pins>;
    - hsusb2_2_pins: pinmux_hsusb2_2_pins {
    - pinctrl-single,pins = <
    - OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */
    - OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */
    - OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */
    - OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */
    - OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */
    - OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */
    - >;
    - };
    -};
    -
    &uart2 {
    interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;
    pinctrl-names = "default";
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-10 15:36    [W:4.522 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site