lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 258/530] arm64: dts: ti: k3-j7200: fix main pinmux range
    Date
    From: Matt Ranostay <mranostay@ti.com>

    [ Upstream commit 0d0a0b4413460383331088b2203ba09a6971bc3a ]

    Range size of 0x2b4 was incorrect since there isn't 173 configurable
    pins for muxing. Additionally there is a non-addressable region in the
    mapping which requires splitting into two ranges.

    main_pmx0 -> 67 pins
    main_pmx1 -> 3 pins

    Fixes: d361ed88455f ("arm64: dts: ti: Add support for J7200 SoC")
    Signed-off-by: Matt Ranostay <mranostay@ti.com>
    Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
    Tested-by: Vaishnav Achath <vaishnav.a@ti.com>
    Link: https://lore.kernel.org/r/20220919205723.8342-1-mranostay@ti.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 10 ++++++----
    arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 11 ++++++++++-
    2 files changed, 16 insertions(+), 5 deletions(-)

    diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
    index d14f3c18b65f..c3406e7f10a9 100644
    --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
    +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
    @@ -131,15 +131,17 @@
    >;
    };

    - main_usbss0_pins_default: main-usbss0-pins-default {
    + vdd_sd_dv_pins_default: vdd-sd-dv-pins-default {
    pinctrl-single,pins = <
    - J721E_IOPAD(0x120, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
    + J721E_IOPAD(0xd0, PIN_OUTPUT, 7) /* (T5) SPI0_D1.GPIO0_55 */
    >;
    };
    +};

    - vdd_sd_dv_pins_default: vdd-sd-dv-pins-default {
    +&main_pmx1 {
    + main_usbss0_pins_default: main-usbss0-pins-default {
    pinctrl-single,pins = <
    - J721E_IOPAD(0xd0, PIN_OUTPUT, 7) /* (T5) SPI0_D1.GPIO0_55 */
    + J721E_IOPAD(0x04, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
    >;
    };
    };
    diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
    index 000b5732ea0c..b1df17525dea 100644
    --- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
    +++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
    @@ -295,7 +295,16 @@
    main_pmx0: pinctrl@11c000 {
    compatible = "pinctrl-single";
    /* Proxy 0 addressing */
    - reg = <0x00 0x11c000 0x00 0x2b4>;
    + reg = <0x00 0x11c000 0x00 0x10c>;
    + #pinctrl-cells = <1>;
    + pinctrl-single,register-width = <32>;
    + pinctrl-single,function-mask = <0xffffffff>;
    + };
    +
    + main_pmx1: pinctrl@11c11c {
    + compatible = "pinctrl-single";
    + /* Proxy 0 addressing */
    + reg = <0x00 0x11c11c 0x00 0xc>;
    #pinctrl-cells = <1>;
    pinctrl-single,register-width = <32>;
    pinctrl-single,function-mask = <0xffffffff>;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 16:01    [W:4.225 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site