lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 199/779] arm64: dts: qcom: sm6125: Move sdc2 pinctrl from seine-pdx201 to sm6125
    Date
    From: Marijn Suijten <marijn.suijten@somainline.org>

    [ Upstream commit 6990640a93ba4e76dd62ca3ea1082a7354db09d7 ]

    Both the sdc2-on and sdc2-off pinctrl nodes are used by the
    sdhci@4784000 node in sm6125.dtsi. Surprisingly sdc2-off is defined in
    sm6125, yet its sdc2-on counterpart is only defined in board-specific DT
    for the Sony Seine PDX201 board/device resulting in an "undefined label
    &sdc2_state_on" error if sm6125.dtsi were included elsewhere.
    This sm6125 base dtsi should not rely on externally defined labels; the
    properties referencing it should then also be written externally.
    Since the sdc2-on pin configuration is board-independent just like
    sdc2-off, move it from seine-pdx201.dts into sm6125.dtsi.

    The SDCard-detect pin (gpio98) is however board-specific, and remains as
    an overwrite in seine-pdx201.dts for both the on and off state.

    As a drive-by cleanup, reorder bias- and drive-strength properties.

    Fixes: cff4bbaf2a2d ("arm64: dts: qcom: Add support for SM6125")
    Fixes: 82e1783890b7 ("arm64: dts: qcom: sm6125: Add support for Sony Xperia 10II")
    Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20220508100336.127176-1-marijn.suijten@somainline.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../qcom/sm6125-sony-xperia-seine-pdx201.dts | 34 +++++--------------
    arch/arm64/boot/dts/qcom/sm6125.dtsi | 24 +++++++++++--
    2 files changed, 30 insertions(+), 28 deletions(-)

    diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
    index 58b6b2742d3f..d4f0a15b763d 100644
    --- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
    +++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
    @@ -91,8 +91,16 @@ &hsusb_phy1 {
    &sdc2_state_off {
    sd-cd {
    pins = "gpio98";
    + drive-strength = <2>;
    bias-disable;
    + };
    +};
    +
    +&sdc2_state_on {
    + sd-cd {
    + pins = "gpio98";
    drive-strength = <2>;
    + bias-pull-up;
    };
    };

    @@ -102,32 +110,6 @@ &sdhc_1 {

    &tlmm {
    gpio-reserved-ranges = <22 2>, <28 6>;
    -
    - sdc2_state_on: sdc2-on {
    - clk {
    - pins = "sdc2_clk";
    - bias-disable;
    - drive-strength = <16>;
    - };
    -
    - cmd {
    - pins = "sdc2_cmd";
    - bias-pull-up;
    - drive-strength = <10>;
    - };
    -
    - data {
    - pins = "sdc2_data";
    - bias-pull-up;
    - drive-strength = <10>;
    - };
    -
    - sd-cd {
    - pins = "gpio98";
    - bias-pull-up;
    - drive-strength = <2>;
    - };
    - };
    };

    &usb3 {
    diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
    index 9f476e3d0720..cc16c05a2856 100644
    --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
    @@ -339,20 +339,40 @@ tlmm: pinctrl@500000 {
    sdc2_state_off: sdc2-off {
    clk {
    pins = "sdc2_clk";
    - bias-disable;
    drive-strength = <2>;
    + bias-disable;
    };

    cmd {
    pins = "sdc2_cmd";
    + drive-strength = <2>;
    bias-pull-up;
    + };
    +
    + data {
    + pins = "sdc2_data";
    drive-strength = <2>;
    + bias-pull-up;
    + };
    + };
    +
    + sdc2_state_on: sdc2-on {
    + clk {
    + pins = "sdc2_clk";
    + drive-strength = <16>;
    + bias-disable;
    + };
    +
    + cmd {
    + pins = "sdc2_cmd";
    + drive-strength = <10>;
    + bias-pull-up;
    };

    data {
    pins = "sdc2_data";
    + drive-strength = <10>;
    bias-pull-up;
    - drive-strength = <2>;
    };
    };
    };
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 20:39    [W:4.109 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site