On 27.12.2022 17:38, Dzmitry Sankouski wrote:
> resin node was moved to pm8998.dtsi file, and introduced duplication
> with other dts files, defining resin node.
>
> Fixes: f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit")
> Signed-off-by: Dzmitry Sankouski <dsankouski@xxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 11 +++--------
> .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 11 +++--------
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 11 +++--------
> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 11 +++--------
> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 11 +++--------
> .../boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 11 +++--------
> arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 11 +++--------
> 7 files changed, 21 insertions(+), 56 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
> index 310f7a2df1e8..510d12c8c512 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
> @@ -364,14 +364,9 @@ cam_snapshot_pin_a: cam-snapshot-btn-active-state {
> };
> };
>
> -&pm8998_pon {
> - resin {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - bias-pull-up;
> - debounce = <15625>;
> - linux,code = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &qusb2phy {
> diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
> index 5da87baa2b23..3bbd5df196bf 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
> @@ -357,14 +357,9 @@ vib_default: vib-en-state {
> };
> };
>
> -&pm8998_pon {
> - resin {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEUP>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEUP>;
> + status = "okay";
> };
>
> &qusb2phy {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index f41c6d600ea8..878801f540c5 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -615,14 +615,9 @@ vol_up_pin_a: vol-up-active-state {
> };
> };
>
> -&pm8998_pon {
> - resin {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &pmi8998_lpg {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> index 1eb423e4be24..943287804e1a 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
> @@ -482,14 +482,9 @@ &mss_pil {
> status = "okay";
> };
>
> -&pm8998_pon {
> - resin {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &sdhc_2 {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> index bb77ccfdc68c..e6191602c70a 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> @@ -522,14 +522,9 @@ pinconf {
> };
> };
>
> -&pm8998_pon {
> - volume_down_resin: resin {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &pmi8998_lpg {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index eb6b2b676eca..1b12b1a4dcbc 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -325,14 +325,9 @@ &pmi8998_wled {
> qcom,cabc;
> };
>
> -&pm8998_pon {
> - resin {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEDOWN>;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &pmi8998_rradc {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> index 38ba809a95cd..fba229d0bd10 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
> @@ -530,14 +530,9 @@ pinconf {
> };
> };
>
> -&pm8998_pon {
> - resin {
> - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - compatible = "qcom,pm8941-resin";
> - linux,code = <KEY_VOLUMEDOWN>;
> - debounce = <15625>;
> - bias-pull-up;
> - };
> +&pm8998_resin {
> + linux,code = <KEY_VOLUMEDOWN>;
> + status = "okay";
> };
>
> &q6afedai {
