| Message ID | 20230329000833.2507594-3-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: sc8280xp: remove duplication in PMIC declarations | expand |
On 29.03.2023 02:08, Dmitry Baryshkov wrote: > To reduce a possibility of the conflicts, rename pmk8350's pon_pwrkey > and pon_resin to contain the PMIC name too. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/pmk8350.dtsi | 4 ++-- > arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 8 ++++---- > arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 8 ++++---- > arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 4 ++-- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi > index f26fb7d32faf..455ffffb5f5c 100644 > --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi > @@ -25,14 +25,14 @@ pmk8350_pon: pon@1300 { > reg = <0x1300>, <0x800>; > reg-names = "hlos", "pbs"; > > - pon_pwrkey: pwrkey { > + pmk8350_pon_pwrkey: pwrkey { > compatible = "qcom,pmk8350-pwrkey"; > interrupts = <PMK8350_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>; > linux,code = <KEY_POWER>; > status = "disabled"; > }; > > - pon_resin: resin { > + pmk8350_pon_resin: resin { > compatible = "qcom,pmk8350-resin"; > interrupts = <PMK8350_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; > status = "disabled"; > diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts > index d21d2aacf201..152601832cbc 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts > +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts > @@ -285,17 +285,17 @@ &mpss { > firmware-name = "qcom/sm8350/modem.mbn"; > }; > > -&pmk8350_rtc { > +&pmk8350_pon_pwrkey { > status = "okay"; > }; > > -&pon_pwrkey { > +&pmk8350_pon_resin { > status = "okay"; > + linux,code = <KEY_VOLUMEDOWN>; > }; > > -&pon_resin { > +&pmk8350_rtc { > status = "okay"; > - linux,code = <KEY_VOLUMEDOWN>; > }; > > &qupv3_id_0 { > diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi > index 89382ad73133..e28f49e31b9f 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi > @@ -618,17 +618,17 @@ vol_down_n: vol-down-n-state { > }; > }; > > -&pmk8350_rtc { > +&pmk8350_pon_pwrkey { > status = "okay"; > }; > > -&pon_pwrkey { > +&pmk8350_pon_resin { > status = "okay"; > + linux,code = <KEY_VOLUMEUP>; > }; > > -&pon_resin { > +&pmk8350_rtc { > status = "okay"; > - linux,code = <KEY_VOLUMEUP>; > }; > > &qupv3_id_0 { > diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi > index 67538b5a557e..99e9b776b93d 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi > @@ -684,11 +684,11 @@ &pmk8350_gpios { > "PMK8350_OPTION"; > }; > > -&pon_pwrkey { > +&pmk8350_pon_pwrkey { > status = "okay"; > }; > > -&pon_resin { > +&pmk8350_pon_resin { > linux,code = <KEY_VOLUMEUP>; > status = "okay"; > };
diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi index f26fb7d32faf..455ffffb5f5c 100644 --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi @@ -25,14 +25,14 @@ pmk8350_pon: pon@1300 { reg = <0x1300>, <0x800>; reg-names = "hlos", "pbs"; - pon_pwrkey: pwrkey { + pmk8350_pon_pwrkey: pwrkey { compatible = "qcom,pmk8350-pwrkey"; interrupts = <PMK8350_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>; linux,code = <KEY_POWER>; status = "disabled"; }; - pon_resin: resin { + pmk8350_pon_resin: resin { compatible = "qcom,pmk8350-resin"; interrupts = <PMK8350_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; status = "disabled"; diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts index d21d2aacf201..152601832cbc 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts @@ -285,17 +285,17 @@ &mpss { firmware-name = "qcom/sm8350/modem.mbn"; }; -&pmk8350_rtc { +&pmk8350_pon_pwrkey { status = "okay"; }; -&pon_pwrkey { +&pmk8350_pon_resin { status = "okay"; + linux,code = <KEY_VOLUMEDOWN>; }; -&pon_resin { +&pmk8350_rtc { status = "okay"; - linux,code = <KEY_VOLUMEDOWN>; }; &qupv3_id_0 { diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi index 89382ad73133..e28f49e31b9f 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi @@ -618,17 +618,17 @@ vol_down_n: vol-down-n-state { }; }; -&pmk8350_rtc { +&pmk8350_pon_pwrkey { status = "okay"; }; -&pon_pwrkey { +&pmk8350_pon_resin { status = "okay"; + linux,code = <KEY_VOLUMEUP>; }; -&pon_resin { +&pmk8350_rtc { status = "okay"; - linux,code = <KEY_VOLUMEUP>; }; &qupv3_id_0 { diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi index 67538b5a557e..99e9b776b93d 100644 --- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi @@ -684,11 +684,11 @@ &pmk8350_gpios { "PMK8350_OPTION"; }; -&pon_pwrkey { +&pmk8350_pon_pwrkey { status = "okay"; }; -&pon_resin { +&pmk8350_pon_resin { linux,code = <KEY_VOLUMEUP>; status = "okay"; };
To reduce a possibility of the conflicts, rename pmk8350's pon_pwrkey and pon_resin to contain the PMIC name too. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/pmk8350.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 8 ++++---- arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 8 ++++---- arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)