From 9094f07bd21e8cd1fe8f454468a7bb5f5ff65cc5 Mon Sep 17 00:00:00 2001 From: Alin Jerpelea Date: Thu, 22 Nov 2018 23:43:54 +0100 Subject: [PATCH] dts: tama: fix nfc configuration we can use our nfc driver for tama if the configuration is adapted and the compatible is set Test: [ 1.841497] fpc1145 soc:fpc1145: found pin control fpc1145_reset_reset [ 1.841602] fpc1145 soc:fpc1145: found pin control fpc1145_reset_active [ 1.841796] fpc1145 soc:fpc1145: found pin control fpc1145_irq_active [ 1.842191] fpc1145_init OK [ 1.845977] pn547_probe : pinctrl is defined [ 1.846177] pn547_parse_dt: irq : 63, ven : 12, firm : 62, pvdd_en : -2 [ 1.846293] pn547_probe : IRQ num 319 [ 1.846509] pn547_probe : requesting IRQ 319 [ 1.858019] pn547_probe : i2c addr=0x28 [ 1.858130] pn547_probe : success Signed-off-by: Alin Jerpelea Change-Id: I4ea42c8a307f6abab284c38e0bd340bf7661ad0e Signed-off-by: Sorayukii --- .../dts/somc/sdm845-tama-akari_generic.dtsi | 2 -- .../somc/sdm845-tama-akatsuki_generic.dtsi | 2 -- .../dts/somc/sdm845-tama-apollo_generic.dtsi | 2 -- .../dts/somc/sdm845-tama-aurora_generic.dtsi | 2 -- .../boot/dts/somc/sdm845-tama-common.dtsi | 20 +++++++++++ .../dts/somc/somc-tama-nfc_pn553-xtal.dtsi | 29 ---------------- .../boot/dts/somc/somc-tama-nfc_pn553.dtsi | 33 ------------------- 7 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 arch/arm64/boot/dts/somc/somc-tama-nfc_pn553-xtal.dtsi delete mode 100644 arch/arm64/boot/dts/somc/somc-tama-nfc_pn553.dtsi diff --git a/arch/arm64/boot/dts/somc/sdm845-tama-akari_generic.dtsi b/arch/arm64/boot/dts/somc/sdm845-tama-akari_generic.dtsi index 414d9d9c7916..68a696e3573b 100644 --- a/arch/arm64/boot/dts/somc/sdm845-tama-akari_generic.dtsi +++ b/arch/arm64/boot/dts/somc/sdm845-tama-akari_generic.dtsi @@ -14,5 +14,3 @@ &soc { }; - -#include "somc-tama-nfc_pn553.dtsi" diff --git a/arch/arm64/boot/dts/somc/sdm845-tama-akatsuki_generic.dtsi b/arch/arm64/boot/dts/somc/sdm845-tama-akatsuki_generic.dtsi index 34a1977a7e97..93b3c9d9219d 100644 --- a/arch/arm64/boot/dts/somc/sdm845-tama-akatsuki_generic.dtsi +++ b/arch/arm64/boot/dts/somc/sdm845-tama-akatsuki_generic.dtsi @@ -14,5 +14,3 @@ &soc { }; - -#include "somc-tama-nfc_pn553.dtsi" diff --git a/arch/arm64/boot/dts/somc/sdm845-tama-apollo_generic.dtsi b/arch/arm64/boot/dts/somc/sdm845-tama-apollo_generic.dtsi index 978da125318f..d7a64bf0c542 100644 --- a/arch/arm64/boot/dts/somc/sdm845-tama-apollo_generic.dtsi +++ b/arch/arm64/boot/dts/somc/sdm845-tama-apollo_generic.dtsi @@ -14,5 +14,3 @@ &soc { }; - -#include "somc-tama-nfc_pn553.dtsi" diff --git a/arch/arm64/boot/dts/somc/sdm845-tama-aurora_generic.dtsi b/arch/arm64/boot/dts/somc/sdm845-tama-aurora_generic.dtsi index 9a9955bcbefc..1c6914613c21 100644 --- a/arch/arm64/boot/dts/somc/sdm845-tama-aurora_generic.dtsi +++ b/arch/arm64/boot/dts/somc/sdm845-tama-aurora_generic.dtsi @@ -14,5 +14,3 @@ &soc { }; - -#include "somc-tama-nfc_pn553-xtal.dtsi" diff --git a/arch/arm64/boot/dts/somc/sdm845-tama-common.dtsi b/arch/arm64/boot/dts/somc/sdm845-tama-common.dtsi index 1f92305edd6e..f19368a5b7db 100644 --- a/arch/arm64/boot/dts/somc/sdm845-tama-common.dtsi +++ b/arch/arm64/boot/dts/somc/sdm845-tama-common.dtsi @@ -564,6 +564,26 @@ status = "disabled"; }; +&qupv3_se10_i2c { + nfc@28 { + compatible = "nxp,pn547"; + reg = <0x28>; + interrupt-parent = <&tlmm>; + interrupts = <63 0x1>; + nxp,irq_gpio = <&tlmm 63 0x00>; + nxp,dwld_en = <&tlmm 62 0x00>; + nxp,ven = <&tlmm 12 0x01>; + qcom,clk-src = "BBCLK3"; + qcom,clk-gpio = <&pm8998_gpios 21 0x00>; + clock-names = "nfc_clk"; + clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; + pinctrl-names = "pn547-active", "pn547-inactive"; + pinctrl-0 = <&nfc_int_active &nfc_enable_active>; + pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>; + }; +}; + + &spmi_bus { qcom,pm8998@0 { /* Reset Configuration */ diff --git a/arch/arm64/boot/dts/somc/somc-tama-nfc_pn553-xtal.dtsi b/arch/arm64/boot/dts/somc/somc-tama-nfc_pn553-xtal.dtsi deleted file mode 100644 index e887a6fb4171..000000000000 --- a/arch/arm64/boot/dts/somc/somc-tama-nfc_pn553-xtal.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/* arch/arm64/boot/dts/somc/somc-tama-nfc_pn553-xtal.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_se10_i2c { - nfc@28 { - compatible = "nxp,pn553"; - reg = <0x28>; - interrupt-parent = <&tlmm>; - interrupts = <63 0x1>; - nxp,irq_gpio = <&tlmm 63 0x00>; - nxp,dwld_en = <&tlmm 62 0x00>; - nxp,ven = <&tlmm 12 0x01>; - }; -}; - -&soc { - nfc,pm-ops { - compatible = "sony,pn553-pm-ops"; - }; -}; diff --git a/arch/arm64/boot/dts/somc/somc-tama-nfc_pn553.dtsi b/arch/arm64/boot/dts/somc/somc-tama-nfc_pn553.dtsi deleted file mode 100644 index e99b8810a82e..000000000000 --- a/arch/arm64/boot/dts/somc/somc-tama-nfc_pn553.dtsi +++ /dev/null @@ -1,33 +0,0 @@ -/* arch/arm64/boot/dts/somc/somc-tama-nfc_pn553.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_se10_i2c { - nfc@28 { - compatible = "nxp,pn553"; - reg = <0x28>; - interrupt-parent = <&tlmm>; - interrupts = <63 0x1>; - nxp,irq_gpio = <&tlmm 63 0x00>; - nxp,dwld_en = <&tlmm 62 0x00>; - nxp,ven = <&tlmm 12 0x01>; - qcom,clk-src = "BBCLK3"; - qcom,clk-gpio = <&pm8998_gpios 21 0x00>; - clock-names = "nfc_clk"; - clocks = <&clock_rpmh RPMH_LN_BB_CLK3>; - }; -}; - -&soc { - nfc,pm-ops { - compatible = "sony,pn553-pm-ops"; - }; -};