arm64: dts: qcom: msm8916: Move WCN compatible to boards

On MSM8916 the wireless connectivity functionality (WiFi/Bluetooth) is
split into the digital part inside the SoC and the analog RF part inside
a supplementary WCN36xx chip. For MSM8916, three different options
exist:

  - WCN3620  (WLAN 802.11 b/g/n 2.4 GHz + Bluetooth)
  - WCN3660B (WLAN 802.11 a/b/g/n 2.4/5 GHz + Bluetooth)
  - WCN3680B (WLAN 802.11ac 2.4/5 GHz + Bluetooth)

Choosing one of these is up to the board vendor. This means that the
compatible belongs into the board-specific DT part so people porting
new boards pay attention to set the correct compatible.

Right now msm8916.dtsi sets "qcom,wcn3620" as default compatible,
which does not work at all for boards that have WCN3660B or WCN3680B.

Remove the default compatible from msm8196.dtsi and move it to the board
DT as follows:

  - Boards with only &pronto { status = "okay"; } used the default
    "qcom,wcn3620" so far. They now set this explicitly for &wcnss_iris.
  - Boards with &pronto { ... iris { compatible = "qcom,wcn3660b"; }};
    already had an override that just moves to &wcnss_iris now.
  - For msm8916-samsung-a2015-common.dtsi the WCN compatible differs for
    boards making use of it (a3u: wcn3620, a5u: wcn3660b, e2015: wcn3620)
    so the definitions move to the board-specific DT part.

Since this requires touching all the board DTs, use this as a chance to
name the WCNSS-related labels consistently, so everything is grouped
properly when sorted alphabetically.

No functional change, just clean-up for more clarity & easier porting.
Aside from ordering the generated DTBs are identical.

Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230309091452.1011776-1-stephan.gerhold@kernkonzept.com

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index c52d79a55d80c10e766b47303b08d5a7cc44eca5..27ceaa94c8bdab0913a7b5a1e6da4ce64d2bac18 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -325,12 +325,6 @@
        linux,code = <KEY_VOLUMEDOWN>;
 };
 
-&pronto {
-       status = "okay";
-
-       firmware-name = "qcom/apq8016/wcnss.mbn";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -411,10 +405,19 @@
        qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
 };
 
+&wcnss {
+       status = "okay";
+       firmware-name = "qcom/apq8016/wcnss.mbn";
+};
+
 &wcnss_ctrl {
        firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin";
 };
 
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 /* Enable CoreSight */
 &cti0 { status = "okay"; };
 &cti1 { status = "okay"; };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index ed3fa7b3575b758812c3f11bd79b45449f18c5c2..13cd9ad167df745287680195a0519a11db81b856 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -118,10 +118,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
@@ -149,6 +145,14 @@
        extcon = <&usb_id>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 701a5585d77e45cbdb4d0396d0830d5b0ad47a65..fecb69944cfa38ca3dfa5586dfd4f031d04afc67 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -160,10 +160,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -191,6 +187,14 @@
        extcon = <&usb_id>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 3618704a53309dca9f5802d6aa3aabbef2ff8b6d..91284a1d0966f1f84453abbd8b7ff898101a2005 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -128,10 +128,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -159,6 +155,14 @@
        extcon = <&usb_id>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index a0e520edde029e68bf339b41328ca63d589bd113..525ec76efeeb78db7b8f336c1301064dc5f27d81 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -118,10 +118,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
        pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -149,6 +145,14 @@
        extcon = <&usb_id>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 8c07eca900d3f8edcf6b47a6d3e9f3a684cf312e..5b1bac8f51220e28cf2702359ba2de9b35fb41da 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -227,10 +227,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -312,6 +308,14 @@
        qcom,hphl-jack-type-normally-open;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index d1e8cf2f50c0d9e3d020a9c4326fa96640012416..f1dd625e1822782e7ca874f80891c12f1e361a4d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -231,10 +231,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -263,6 +259,14 @@
        extcon = <&pm8916_usbin>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 3899e11b9843b6ad1236180b23c2606d5775822d..b79e80913af9fb86b75e0263fea7104acc19f60b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -99,10 +99,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -130,6 +126,14 @@
        extcon = <&usb_id>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index 8cac23b5240c6cbadb20b7c1c27755a9b3ff12ad..6eb5e0a39510026b2321a1420a6cc45e9286a943 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -20,17 +20,6 @@
        pll-supply = <&pm8916_l7>;
 };
 
-&pronto {
-       vddpx-supply = <&pm8916_l7>;
-
-       iris {
-               vddxo-supply = <&pm8916_l7>;
-               vddrfa-supply = <&pm8916_s3>;
-               vddpa-supply = <&pm8916_l9>;
-               vdddig-supply = <&pm8916_l5>;
-       };
-};
-
 &sdhc_1 {
        vmmc-supply = <&pm8916_l8>;
        vqmmc-supply = <&pm8916_l5>;
@@ -46,6 +35,17 @@
        v3p3-supply = <&pm8916_l13>;
 };
 
+&wcnss {
+       vddpx-supply = <&pm8916_l7>;
+};
+
+&wcnss_iris {
+       vddxo-supply = <&pm8916_l7>;
+       vddrfa-supply = <&pm8916_s3>;
+       vddpa-supply = <&pm8916_l9>;
+       vdddig-supply = <&pm8916_l5>;
+};
+
 &rpm_requests {
        smd_rpm_regulators: regulators {
                compatible = "qcom,rpm-pm8916-regulators";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index a2ed7bdbf528f8e44fec2b4888894d2b894c3236..16d67749960e0471a236d030526bdcb9e4f62da0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -252,10 +252,6 @@
        linux,code = <KEY_VOLUMEDOWN>;
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index c691cca2eb4594a227035f4402e0a8fc2740a7e2..a1ca4d88342013003ab5f054a02c5acb33cf5472 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -112,6 +112,14 @@
        status = "okay";
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &msmgpio {
        panel_vdd3_default: panel-vdd3-default-state {
                pins = "gpio9";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 3dd819458785d1a9d5fdaea5eb9864c64b219e35..4e10b8a5e9f9c0d60124a2eacfa9e039051f3851 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -54,12 +54,6 @@
        status = "okay";
 };
 
-&pronto {
-       iris {
-               compatible = "qcom,wcn3660b";
-       };
-};
-
 &touchkey {
        vcc-supply = <&reg_touch_key>;
        vdd-supply = <&reg_touch_key>;
@@ -69,6 +63,14 @@
        status = "okay";
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3660b";
+};
+
 &msmgpio {
        tkey_en_default: tkey-en-default-state {
                pins = "gpio97";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index c95f0b4bc61f34df2f0ce90e2be6904cda10b8c1..f6c4a011fdfd2506a3ce0ae7b73207d5a68fcf78 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -58,6 +58,14 @@
        vdd-supply = <&reg_touch_key>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &msmgpio {
        tkey_en_default: tkey-en-default-state {
                pins = "gpio97";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index d920b7247d823c4e6f3fd95a0a6977ab796232ba..74ffd04db8d84c5f22b465182e66be1324736247 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -125,14 +125,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-
-       iris {
-               compatible = "qcom,wcn3660b";
-       };
-};
-
 &sdhc_1 {
        pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
        pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -162,6 +154,14 @@
        extcon = <&pm8916_usbin>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3660b";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index f3b81b6f0a2f143f20fdf120eff6dcbfcb07ce98..adeee0830e7680df17f1ec5bb66390c456b6ebe6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -93,10 +93,6 @@
        linux,code = <KEY_VOLUMEDOWN>;
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -124,6 +120,14 @@
        extcon = <&muic>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index d4984b3af8023a0288574162f51112deafeee373..1a41a4db874daeac500314e5579c239c34a03232 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -272,14 +272,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-
-       iris {
-               compatible = "qcom,wcn3660b";
-       };
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -320,6 +312,14 @@
        extcon = <&muic>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3660b";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index cdf34b74fa8faa132c0bad1cfd7b6efac40bd380..50bae6f214f1fbabd7a405252579b7a6001955e7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -99,10 +99,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
        pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -122,6 +118,14 @@
        extcon = <&pm8916_usbin>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index a87be1d95b14bcf6d975fa5ed1f2042fb6a92e9c..ac56c7595f78a5b40ec1bd9622d72669f0bbf9b6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -153,10 +153,6 @@
        status = "okay";
 };
 
-&pronto {
-       status = "okay";
-};
-
 &sdhc_1 {
        status = "okay";
 
@@ -184,6 +180,14 @@
        extcon = <&usb_id>;
 };
 
+&wcnss {
+       status = "okay";
+};
+
+&wcnss_iris {
+       compatible = "qcom,wcn3620";
+};
+
 &smd_rpm_regulators {
        vdd_l1_l2_l3-supply = <&pm8916_s3>;
        vdd_l4_l5_l6-supply = <&pm8916_s4>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 639b158b4fbe05618af16f325624f36692ecaf98..7e0fa37a3adf8d6c30d97d1915a2c8782352a8b0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1870,7 +1870,7 @@
                        };
                };
 
-               pronto: remoteproc@a21b000 {
+               wcnss: remoteproc@a21b000 {
                        compatible = "qcom,pronto-v2-pil", "qcom,pronto";
                        reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
                        reg-names = "ccu", "dxe", "pmu";
@@ -1896,9 +1896,8 @@
 
                        status = "disabled";
 
-                       iris {
-                               compatible = "qcom,wcn3620";
-
+                       wcnss_iris: iris {
+                               /* Separate chip, compatible is board-specific */
                                clocks = <&rpmcc RPM_SMD_RF_CLK2>;
                                clock-names = "xo";
                        };
@@ -1916,13 +1915,13 @@
                                        compatible = "qcom,wcnss";
                                        qcom,smd-channels = "WCNSS_CTRL";
 
-                                       qcom,mmio = <&pronto>;
+                                       qcom,mmio = <&wcnss>;
 
-                                       bluetooth {
+                                       wcnss_bt: bluetooth {
                                                compatible = "qcom,wcnss-bt";
                                        };
 
-                                       wifi {
+                                       wcnss_wifi: wifi {
                                                compatible = "qcom,wcnss-wlan";
 
                                                interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,