On 20/11/2021 21:42, Dang Huynh wrote:
> It's not worth duplicating the same node over and over again,
> so let's keep the common bits in the pm660 DTSI, making only
> changing the status and keycode necessary.
>
> Also, disable RESIN/PWR by default just in case if there are
> devices that doesn't use them.
>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx>
> Signed-off-by: Dang Huynh <danct12@xxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/pm660.dtsi | 12 +++++++++++-
> .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 16 ++++++++--------
> 2 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/pm660.dtsi b/arch/arm64/boot/dts/qcom/pm660.dtsi
> index d0ef8a1675e2..c482663aad56 100644
> --- a/arch/arm64/boot/dts/qcom/pm660.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pm660.dtsi
> @@ -54,14 +54,24 @@ pon: pon@800 {
> mode-bootloader = <0x2>;
> mode-recovery = <0x1>;
>
> - pwrkey {
> + pon_pwrkey: pwrkey {
> compatible = "qcom,pm8941-pwrkey";
> interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
> debounce = <15625>;
> bias-pull-up;
> linux,code = <KEY_POWER>;
> +
> + status = "disabled";
> };
>
> + pon_resin: resin {
> + compatible = "qcom,pm8941-resin";
> + interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> + debounce = <15625>;
> + bias-pull-up;
> +
> + status = "disabled";
> + };
> };
>
> pm660_temp: temp-alarm@2400 {
> diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> index 11d0a8c1cf35..e90c9ec84675 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> @@ -215,14 +215,14 @@ &blsp2_uart1 {
> /* HCI Bluetooth */
> };
>
> -&pon {
> - volup {
> - compatible = "qcom,pm8941-resin";
> - interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> - debounce = <15625>;
> - bias-pull-up;
> - linux,code = <KEY_VOLUMEUP>;
> - };
> +&pon_pwrkey {
> + status = "okay";
> +};
> +
> +&pon_resin {
> + status = "okay";
> +
> + linux,code = <KEY_VOLUMEUP>;
> };
>
> &qusb2phy {
> --
> 2.33.1
>
Reviewed-by: Caleb Connolly <caleb@xxxxxxxxxxxxx>
--
Kind Regards,
Caleb
