Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Stephan Gerhold and committed by
Bjorn Andersson
32444424 15544135

+146 -90
+9 -6
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
··· 325 325 linux,code = <KEY_VOLUMEDOWN>; 326 326 }; 327 327 328 - &pronto { 329 - status = "okay"; 330 - 331 - firmware-name = "qcom/apq8016/wcnss.mbn"; 332 - }; 333 - 334 328 &sdhc_1 { 335 329 status = "okay"; 336 330 ··· 405 411 qcom,mbhc-vthreshold-high = <75 150 237 450 500>; 406 412 }; 407 413 414 + &wcnss { 415 + status = "okay"; 416 + firmware-name = "qcom/apq8016/wcnss.mbn"; 417 + }; 418 + 408 419 &wcnss_ctrl { 409 420 firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; 421 + }; 422 + 423 + &wcnss_iris { 424 + compatible = "qcom,wcn3620"; 410 425 }; 411 426 412 427 /* Enable CoreSight */
+8 -4
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
··· 118 118 status = "okay"; 119 119 }; 120 120 121 - &pronto { 122 - status = "okay"; 123 - }; 124 - 125 121 &sdhc_1 { 126 122 pinctrl-names = "default", "sleep"; 127 123 pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; ··· 143 147 144 148 &usb_hs_phy { 145 149 extcon = <&usb_id>; 150 + }; 151 + 152 + &wcnss { 153 + status = "okay"; 154 + }; 155 + 156 + &wcnss_iris { 157 + compatible = "qcom,wcn3620"; 146 158 }; 147 159 148 160 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
··· 160 160 status = "okay"; 161 161 }; 162 162 163 - &pronto { 164 - status = "okay"; 165 - }; 166 - 167 163 &sdhc_1 { 168 164 status = "okay"; 169 165 ··· 185 189 186 190 &usb_hs_phy { 187 191 extcon = <&usb_id>; 192 + }; 193 + 194 + &wcnss { 195 + status = "okay"; 196 + }; 197 + 198 + &wcnss_iris { 199 + compatible = "qcom,wcn3620"; 188 200 }; 189 201 190 202 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
··· 128 128 status = "okay"; 129 129 }; 130 130 131 - &pronto { 132 - status = "okay"; 133 - }; 134 - 135 131 &sdhc_1 { 136 132 status = "okay"; 137 133 ··· 153 157 154 158 &usb_hs_phy { 155 159 extcon = <&usb_id>; 160 + }; 161 + 162 + &wcnss { 163 + status = "okay"; 164 + }; 165 + 166 + &wcnss_iris { 167 + compatible = "qcom,wcn3620"; 156 168 }; 157 169 158 170 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
··· 118 118 status = "okay"; 119 119 }; 120 120 121 - &pronto { 122 - status = "okay"; 123 - }; 124 - 125 121 &sdhc_1 { 126 122 pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; 127 123 pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; ··· 143 147 144 148 &usb_hs_phy { 145 149 extcon = <&usb_id>; 150 + }; 151 + 152 + &wcnss { 153 + status = "okay"; 154 + }; 155 + 156 + &wcnss_iris { 157 + compatible = "qcom,wcn3620"; 146 158 }; 147 159 148 160 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
··· 227 227 status = "okay"; 228 228 }; 229 229 230 - &pronto { 231 - status = "okay"; 232 - }; 233 - 234 230 &sdhc_1 { 235 231 status = "okay"; 236 232 ··· 306 310 qcom,mbhc-vthreshold-low = <75 150 237 450 500>; 307 311 qcom,mbhc-vthreshold-high = <75 150 237 450 500>; 308 312 qcom,hphl-jack-type-normally-open; 313 + }; 314 + 315 + &wcnss { 316 + status = "okay"; 317 + }; 318 + 319 + &wcnss_iris { 320 + compatible = "qcom,wcn3620"; 309 321 }; 310 322 311 323 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
··· 231 231 status = "okay"; 232 232 }; 233 233 234 - &pronto { 235 - status = "okay"; 236 - }; 237 - 238 234 &sdhc_1 { 239 235 status = "okay"; 240 236 ··· 257 261 258 262 &usb_hs_phy { 259 263 extcon = <&pm8916_usbin>; 264 + }; 265 + 266 + &wcnss { 267 + status = "okay"; 268 + }; 269 + 270 + &wcnss_iris { 271 + compatible = "qcom,wcn3620"; 260 272 }; 261 273 262 274 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
··· 99 99 status = "okay"; 100 100 }; 101 101 102 - &pronto { 103 - status = "okay"; 104 - }; 105 - 106 102 &sdhc_1 { 107 103 status = "okay"; 108 104 ··· 124 128 125 129 &usb_hs_phy { 126 130 extcon = <&usb_id>; 131 + }; 132 + 133 + &wcnss { 134 + status = "okay"; 135 + }; 136 + 137 + &wcnss_iris { 138 + compatible = "qcom,wcn3620"; 127 139 }; 128 140 129 141 &smd_rpm_regulators {
+11 -11
arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
··· 20 20 pll-supply = <&pm8916_l7>; 21 21 }; 22 22 23 - &pronto { 24 - vddpx-supply = <&pm8916_l7>; 25 - 26 - iris { 27 - vddxo-supply = <&pm8916_l7>; 28 - vddrfa-supply = <&pm8916_s3>; 29 - vddpa-supply = <&pm8916_l9>; 30 - vdddig-supply = <&pm8916_l5>; 31 - }; 32 - }; 33 - 34 23 &sdhc_1 { 35 24 vmmc-supply = <&pm8916_l8>; 36 25 vqmmc-supply = <&pm8916_l5>; ··· 33 44 &usb_hs_phy { 34 45 v1p8-supply = <&pm8916_l7>; 35 46 v3p3-supply = <&pm8916_l13>; 47 + }; 48 + 49 + &wcnss { 50 + vddpx-supply = <&pm8916_l7>; 51 + }; 52 + 53 + &wcnss_iris { 54 + vddxo-supply = <&pm8916_l7>; 55 + vddrfa-supply = <&pm8916_s3>; 56 + vddpa-supply = <&pm8916_l9>; 57 + vdddig-supply = <&pm8916_l5>; 36 58 }; 37 59 38 60 &rpm_requests {
-4
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
··· 252 252 linux,code = <KEY_VOLUMEDOWN>; 253 253 }; 254 254 255 - &pronto { 256 - status = "okay"; 257 - }; 258 - 259 255 &sdhc_1 { 260 256 status = "okay"; 261 257
+8
arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
··· 112 112 status = "okay"; 113 113 }; 114 114 115 + &wcnss { 116 + status = "okay"; 117 + }; 118 + 119 + &wcnss_iris { 120 + compatible = "qcom,wcn3620"; 121 + }; 122 + 115 123 &msmgpio { 116 124 panel_vdd3_default: panel-vdd3-default-state { 117 125 pins = "gpio9";
+8 -6
arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
··· 54 54 status = "okay"; 55 55 }; 56 56 57 - &pronto { 58 - iris { 59 - compatible = "qcom,wcn3660b"; 60 - }; 61 - }; 62 - 63 57 &touchkey { 64 58 vcc-supply = <&reg_touch_key>; 65 59 vdd-supply = <&reg_touch_key>; ··· 61 67 62 68 &vibrator { 63 69 status = "okay"; 70 + }; 71 + 72 + &wcnss { 73 + status = "okay"; 74 + }; 75 + 76 + &wcnss_iris { 77 + compatible = "qcom,wcn3660b"; 64 78 }; 65 79 66 80 &msmgpio {
+8
arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
··· 58 58 vdd-supply = <&reg_touch_key>; 59 59 }; 60 60 61 + &wcnss { 62 + status = "okay"; 63 + }; 64 + 65 + &wcnss_iris { 66 + compatible = "qcom,wcn3620"; 67 + }; 68 + 61 69 &msmgpio { 62 70 tkey_en_default: tkey-en-default-state { 63 71 pins = "gpio97";
+8 -8
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
··· 125 125 status = "okay"; 126 126 }; 127 127 128 - &pronto { 129 - status = "okay"; 130 - 131 - iris { 132 - compatible = "qcom,wcn3660b"; 133 - }; 134 - }; 135 - 136 128 &sdhc_1 { 137 129 pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; 138 130 pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; ··· 152 160 153 161 &usb_hs_phy { 154 162 extcon = <&pm8916_usbin>; 163 + }; 164 + 165 + &wcnss { 166 + status = "okay"; 167 + }; 168 + 169 + &wcnss_iris { 170 + compatible = "qcom,wcn3660b"; 155 171 }; 156 172 157 173 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
··· 93 93 linux,code = <KEY_VOLUMEDOWN>; 94 94 }; 95 95 96 - &pronto { 97 - status = "okay"; 98 - }; 99 - 100 96 &sdhc_1 { 101 97 status = "okay"; 102 98 ··· 118 122 119 123 &usb_hs_phy { 120 124 extcon = <&muic>; 125 + }; 126 + 127 + &wcnss { 128 + status = "okay"; 129 + }; 130 + 131 + &wcnss_iris { 132 + compatible = "qcom,wcn3620"; 121 133 }; 122 134 123 135 &smd_rpm_regulators {
+8 -8
arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
··· 272 272 status = "okay"; 273 273 }; 274 274 275 - &pronto { 276 - status = "okay"; 277 - 278 - iris { 279 - compatible = "qcom,wcn3660b"; 280 - }; 281 - }; 282 - 283 275 &sdhc_1 { 284 276 status = "okay"; 285 277 ··· 310 318 311 319 &usb_hs_phy { 312 320 extcon = <&muic>; 321 + }; 322 + 323 + &wcnss { 324 + status = "okay"; 325 + }; 326 + 327 + &wcnss_iris { 328 + compatible = "qcom,wcn3660b"; 313 329 }; 314 330 315 331 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
··· 99 99 status = "okay"; 100 100 }; 101 101 102 - &pronto { 103 - status = "okay"; 104 - }; 105 - 106 102 &sdhc_1 { 107 103 pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; 108 104 pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; ··· 116 120 117 121 &usb_hs_phy { 118 122 extcon = <&pm8916_usbin>; 123 + }; 124 + 125 + &wcnss { 126 + status = "okay"; 127 + }; 128 + 129 + &wcnss_iris { 130 + compatible = "qcom,wcn3620"; 119 131 }; 120 132 121 133 &smd_rpm_regulators {
+8 -4
arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
··· 153 153 status = "okay"; 154 154 }; 155 155 156 - &pronto { 157 - status = "okay"; 158 - }; 159 - 160 156 &sdhc_1 { 161 157 status = "okay"; 162 158 ··· 178 182 179 183 &usb_hs_phy { 180 184 extcon = <&usb_id>; 185 + }; 186 + 187 + &wcnss { 188 + status = "okay"; 189 + }; 190 + 191 + &wcnss_iris { 192 + compatible = "qcom,wcn3620"; 181 193 }; 182 194 183 195 &smd_rpm_regulators {
+6 -7
arch/arm64/boot/dts/qcom/msm8916.dtsi
··· 1870 1870 }; 1871 1871 }; 1872 1872 1873 - pronto: remoteproc@a21b000 { 1873 + wcnss: remoteproc@a21b000 { 1874 1874 compatible = "qcom,pronto-v2-pil", "qcom,pronto"; 1875 1875 reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; 1876 1876 reg-names = "ccu", "dxe", "pmu"; ··· 1896 1896 1897 1897 status = "disabled"; 1898 1898 1899 - iris { 1900 - compatible = "qcom,wcn3620"; 1901 - 1899 + wcnss_iris: iris { 1900 + /* Separate chip, compatible is board-specific */ 1902 1901 clocks = <&rpmcc RPM_SMD_RF_CLK2>; 1903 1902 clock-names = "xo"; 1904 1903 }; ··· 1915 1916 compatible = "qcom,wcnss"; 1916 1917 qcom,smd-channels = "WCNSS_CTRL"; 1917 1918 1918 - qcom,mmio = <&pronto>; 1919 + qcom,mmio = <&wcnss>; 1919 1920 1920 - bluetooth { 1921 + wcnss_bt: bluetooth { 1921 1922 compatible = "qcom,wcnss-bt"; 1922 1923 }; 1923 1924 1924 - wifi { 1925 + wcnss_wifi: wifi { 1925 1926 compatible = "qcom,wcnss-wlan"; 1926 1927 1927 1928 interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,