diff --git a/arch/arm64/boot/dts/qcom/trinket-seine-common.dtsi b/arch/arm64/boot/dts/qcom/trinket-seine-common.dtsi index f383bdb68f95d..e0141297366af 100644 --- a/arch/arm64/boot/dts/qcom/trinket-seine-common.dtsi +++ b/arch/arm64/boot/dts/qcom/trinket-seine-common.dtsi @@ -158,6 +158,10 @@ memory-region = "log"; }; + nfc,pm-ops { + compatible = "sony,pn553-pm-ops"; + }; + pinctrl@400000 { disabled-pins = <22 23 28 29 30 31 32 33>; }; @@ -272,8 +276,6 @@ pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>; pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>; }; - - }; &camss_cpp_gdsc { @@ -286,6 +288,16 @@ status = "okay"; /delete-node/ nq@28; + nfc@28 { + compatible = "nxp,pn553"; + reg = <0x28>; + interrupt-parent = <&tlmm>; + interrupts = <85 0x1>; + nxp,irq_gpio = <&tlmm 85 0x00>; + nxp,dwld_en = <&tlmm 84 0x00>; + nxp,ven = <&tlmm 83 0x01>; + nxp,ese-pwr = <&tlmm 24 0x00>; + }; }; /* Disable trinket-audio-overlay unused nodes */ @@ -2353,6 +2365,5 @@ #include "trinket-seine-touch.dtsi" #include "charger-seine-common.dtsi" -#include "trinket-seine-nfc_pn557.dtsi" #include "trinket-seine-usb.dtsi" #include "trinket-seine-camera-common.dtsi" diff --git a/arch/arm64/boot/dts/qcom/trinket-seine-nfc_pn557.dtsi b/arch/arm64/boot/dts/qcom/trinket-seine-nfc_pn557.dtsi deleted file mode 100644 index ccd4f32ce949f..0000000000000 --- a/arch/arm64/boot/dts/qcom/trinket-seine-nfc_pn557.dtsi +++ /dev/null @@ -1,31 +0,0 @@ -/* arch/arm64/boot/dts/somc/trinket-seine-nfc_pn557.dtsi - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -&qupv3_se1_i2c { - /delete-node/ nq@28; - nfc@28 { - compatible = "nxp,pn553"; - reg = <0x28>; - interrupt-parent = <&tlmm>; - interrupts = <85 0x1>; - nxp,irq_gpio = <&tlmm 85 0x00>; - nxp,dwld_en = <&tlmm 84 0x00>; - nxp,ven = <&tlmm 83 0x01>; - nxp,ese-pwr = <&tlmm 24 0x00>; - }; -}; - -&soc { - nfc,pm-ops { - compatible = "sony,pn553-pm-ops"; - }; -}; diff --git a/arch/arm64/boot/dts/qcom/trinket-seine-nfc_pn81t.dtsi b/arch/arm64/boot/dts/qcom/trinket-seine-nfc_pn81t.dtsi deleted file mode 100644 index c8b9dffed8b99..0000000000000 --- a/arch/arm64/boot/dts/qcom/trinket-seine-nfc_pn81t.dtsi +++ /dev/null @@ -1,62 +0,0 @@ -/* arch/arm64/boot/dts/somc/trinket-seine-nfc_pn81t.dtsi - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -&qupv3_se1_i2c { - /delete-node/ nq@28; - nfc@28 { - compatible = "nxp,pn553"; - reg = <0x28>; - interrupt-parent = <&tlmm>; - interrupts = <85 0x1>; - nxp,irq_gpio = <&tlmm 85 0x00>; - nxp,dwld_en = <&tlmm 84 0x00>; - nxp,ven = <&tlmm 83 0x01>; - nxp,ese-pwr = <&tlmm 24 0x00>; - }; -}; - -&soc { - nfc,pm-ops { - compatible = "sony,pn553-pm-ops"; - }; - - /* SPI: QUP0 */ - spi@4a80000 { - compatible = "qcom,spi-geni-cloned"; - pinctrl-0 = <&sm_gpio_0 &sm_gpio_1 &sm_gpio_2>; - pinctrl-1 = <&sm_gpio_0_sleep &sm_gpio_1 &sm_gpio_2>; - nxp,ese-pwr = <&tlmm 24 0x00>; - nxp,ese-cs = <&tlmm 3 0x00>; - status = "okay"; - - dev@0 { - compatible = "nxp,p61"; - reg = <0>; - spi-max-frequency = <30000000>; - }; - }; -}; - -&tlmm { - sm_gpio_0_sleep: sm_gpio_0_sleep { - mux { - pins = "gpio0"; - function = "gpio"; - }; - - config { - pins = "gpio0"; - drive-strength = <2>; - output-low; - }; - }; -};