From b135d097eb1a2586ee2c0ebcc0d0aa4a9b641b68 Mon Sep 17 00:00:00 2001 From: Konrad Dybcio Date: Sun, 13 Jun 2021 14:48:22 +0200 Subject: arm64: dts: qcom: sm8[12]50-pm8150: Move RESIN to pm8150 dtsi It's not worth duplicating the same node over and over and over and over again, so let's keep the common bits in the pm8150 DTSI, making only changing the status and keycode necessary. Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20210613124822.124039-1-konrad.dybcio@somainline.org Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/pm8150.dtsi | 9 +++++++++ arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 18 +++++++----------- arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 18 +++++++----------- arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 20 ++++++++------------ 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi index 35ddac1ccd46..c566a64b1373 100644 --- a/arch/arm64/boot/dts/qcom/pm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi @@ -60,6 +60,15 @@ status = "disabled"; }; + + pon_resin: resin { + compatible = "qcom,pm8941-resin"; + interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; + debounce = <15625>; + bias-pull-up; + + status = "disabled"; + }; }; pm8150_temp: temp-alarm@2400 { diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts index 50ee3bb97325..335aa0753fc0 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts @@ -362,18 +362,14 @@ status = "okay"; }; -&pon { - pwrkey { - status = "okay"; - }; +&pon_pwrkey { + status = "okay"; +}; - resin { - compatible = "qcom,pm8941-resin"; - interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; - debounce = <15625>; - bias-pull-up; - linux,code = ; - }; +&pon_resin { + status = "okay"; + + linux,code = ; }; &qupv3_id_1 { diff --git a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts index 7de54b2e497e..53edf7541169 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts @@ -357,18 +357,14 @@ status = "okay"; }; -&pon { - pwrkey { - status = "okay"; - }; +&pon_pwrkey { + status = "okay"; +}; - resin { - compatible = "qcom,pm8941-resin"; - interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; - debounce = <15625>; - bias-pull-up; - linux,code = ; - }; +&pon_resin { + status = "okay"; + + linux,code = ; }; &qupv3_id_1 { diff --git a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts index bc6f81254ef7..47742816ac2f 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts @@ -372,22 +372,18 @@ status = "okay"; }; -&qupv3_id_1 { +&pon_pwrkey { status = "okay"; }; -&pon { - pwrkey { - status = "okay"; - }; +&pon_resin { + status = "okay"; - resin { - compatible = "qcom,pm8941-resin"; - interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>; - debounce = <15625>; - bias-pull-up; - linux,code = ; - }; + linux,code = ; +}; + +&qupv3_id_1 { + status = "okay"; }; &tlmm { -- cgit