tjh.dev / kernel
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.

Merge tag 'qcom-dts-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

A few more Qualcomm ARM32 DeviceTree updates for v6.4

This adds IPA definition to the sdx65 platform, and brings a few
stylistic changes to sdx55 and sdx65.

Compatibles for the two new Qualcomm Robotics Platform boards, RB1 and
RB2, are defined, as is Xiaomi Mi A3 and the MI01.6 development baord on
IPQ5332. These are all ARM64 boards, despite being introduced through
the ARM32 pull request...

* tag 'qcom-dts-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
dt-bindings: arm: qcom: Document the Qualcomm qrb4210-rb2 board
ARM: dts: qcom: sdx55-fn980: Move "status" property to the end of node
ARM: dts: qcom: sdx55: Move reset and wake gpios to board dts
dt-bindings: arm: qcom: document MI01.6 board based on IPQ5332 family
dt-bindings: arm: qcom: Document xiaomi,laurel-sprout board
dt-bindings: arm: qcom: Add QRB2210/QCM2290 and RB1 board
ARM: dts: qcom: sdx65: move status properties to end of nodes
ARM: dts: qcom: sdx65: add IPA information

Link: https://lore.kernel.org/r/20230414023723.2411793-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 8158597f 0a25e385

+84 -15
+20
Documentation/devicetree/bindings/arm/qcom.yaml
··· 47 47 msm8996 48 48 msm8998 49 49 qcs404 50 + qcm2290 50 51 qdu1000 52 + qrb2210 53 + qrb4210 51 54 qru1000 52 55 sa8155p 53 56 sa8540p ··· 87 84 adp 88 85 ap-al02-c7 89 86 ap-mi01.2 87 + ap-mi01.6 90 88 cdp 91 89 cp01-c1 92 90 dragonboard ··· 98 94 liquid 99 95 mtp 100 96 qrd 97 + rb2 101 98 ride 102 99 sbc 103 100 x100 ··· 333 328 - items: 334 329 - enum: 335 330 - qcom,ipq5332-ap-mi01.2 331 + - qcom,ipq5332-ap-mi01.6 336 332 - const: qcom,ipq5332 337 333 338 334 - items: ··· 359 353 - const: swir,mangoh-green-wp8548 360 354 - const: swir,wp8548 361 355 - const: qcom,mdm9615 356 + 357 + - description: Qualcomm Technologies, Inc. Robotics RB1 358 + items: 359 + - enum: 360 + - qcom,qrb2210-rb1 361 + - const: qcom,qrb2210 362 + - const: qcom,qcm2290 362 363 363 364 - description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform 364 365 items: ··· 878 865 879 866 - items: 880 867 - enum: 868 + - qcom,qrb4210-rb2 869 + - const: qcom,qrb4210 870 + - const: qcom,sm4250 871 + 872 + - items: 873 + - enum: 881 874 - lenovo,j606f 882 875 - const: qcom,sm6115p 883 876 - const: qcom,sm6115 ··· 891 872 - items: 892 873 - enum: 893 874 - sony,pdx201 875 + - xiaomi,laurel-sprout 894 876 - const: qcom,sm6125 895 877 896 878 - items:
+12 -7
arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
··· 243 243 }; 244 244 245 245 &pcie_phy { 246 - status = "okay"; 247 - 248 246 vdda-phy-supply = <&vreg_l1e_bb_1p2>; 249 247 vdda-pll-supply = <&vreg_l4e_bb_0p875>; 248 + 249 + status = "okay"; 250 250 }; 251 251 252 252 &pcie_ep { 253 - status = "okay"; 254 - 255 253 pinctrl-names = "default"; 256 254 pinctrl-0 = <&pcie_ep_clkreq_default &pcie_ep_perst_default 257 255 &pcie_ep_wake_default>; 256 + 257 + reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>; 258 + wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>; 259 + 260 + status = "okay"; 258 261 }; 259 262 260 263 &qpic_bam { ··· 280 277 }; 281 278 282 279 &remoteproc_mpss { 283 - status = "okay"; 284 280 memory-region = <&mpss_adsp_mem>; 281 + status = "okay"; 285 282 }; 286 283 287 284 &tlmm { ··· 308 305 }; 309 306 310 307 &usb_hsphy { 311 - status = "okay"; 312 308 vdda-pll-supply = <&vreg_l4e_bb_0p875>; 313 309 vdda33-supply = <&vreg_l10e_3p1>; 314 310 vdda18-supply = <&vreg_l5e_bb_1p7>; 311 + 312 + status = "okay"; 315 313 }; 316 314 317 315 &usb_qmpphy { 318 - status = "okay"; 319 316 vdda-phy-supply = <&vreg_l4e_bb_0p875>; 320 317 vdda-pll-supply = <&vreg_l1e_bb_1p2>; 318 + 319 + status = "okay"; 321 320 }; 322 321 323 322 &usb {
-2
arch/arm/boot/dts/qcom-sdx55.dtsi
··· 421 421 <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>; 422 422 interrupt-names = "global", 423 423 "doorbell"; 424 - reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>; 425 - wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>; 426 424 resets = <&gcc GCC_PCIE_BCR>; 427 425 reset-names = "core"; 428 426 power-domains = <&gcc PCIE_GDSC>;
+8 -3
arch/arm/boot/dts/qcom-sdx65-mtp.dts
··· 245 245 status = "okay"; 246 246 }; 247 247 248 + &ipa { 249 + qcom,gsi-loader = "skip"; 250 + status = "okay"; 251 + }; 252 + 248 253 &qpic_bam { 249 254 status = "okay"; 250 255 }; ··· 270 265 }; 271 266 272 267 &remoteproc_mpss { 273 - status = "okay"; 274 268 memory-region = <&mpss_adsp_mem>; 269 + status = "okay"; 275 270 }; 276 271 277 272 &usb { ··· 283 278 }; 284 279 285 280 &usb_hsphy { 286 - status = "okay"; 287 281 vdda-pll-supply = <&vreg_l4b_0p88>; 288 282 vdda33-supply = <&vreg_l10b_3p08>; 289 283 vdda18-supply = <&vreg_l5b_1p8>; 284 + status = "okay"; 290 285 }; 291 286 292 287 &usb_qmpphy { 293 - status = "okay"; 294 288 vdda-phy-supply = <&vreg_l4b_0p88>; 295 289 vdda-pll-supply = <&vreg_l1b_1p2>; 290 + status = "okay"; 296 291 };
+44 -3
arch/arm/boot/dts/qcom-sdx65.dtsi
··· 11 11 #include <dt-bindings/interrupt-controller/arm-gic.h> 12 12 #include <dt-bindings/power/qcom-rpmpd.h> 13 13 #include <dt-bindings/soc/qcom,rpmh-rsc.h> 14 + #include <dt-bindings/interconnect/qcom,sdx65.h> 14 15 15 16 / { 16 17 #address-cells = <1>; ··· 224 223 "qcom,usb-snps-hs-7nm-phy"; 225 224 reg = <0xff4000 0x120>; 226 225 #phy-cells = <0>; 227 - status = "disabled"; 228 226 clocks = <&rpmhcc RPMH_CXO_CLK>; 229 227 clock-names = "ref"; 230 228 resets = <&gcc GCC_QUSB2PHY_BCR>; 229 + status = "disabled"; 231 230 }; 232 231 233 232 usb_qmpphy: phy@ff6000 { 234 233 compatible = "qcom,sdx65-qmp-usb3-uni-phy"; 235 234 reg = <0x00ff6000 0x1c8>; 236 - status = "disabled"; 237 235 #address-cells = <1>; 238 236 #size-cells = <1>; 239 237 ranges; ··· 245 245 resets = <&gcc GCC_USB3PHY_PHY_BCR>, 246 246 <&gcc GCC_USB3_PHY_BCR>; 247 247 reset-names = "phy", "common"; 248 + 249 + status = "disabled"; 248 250 249 251 usb_ssphy: phy@ff6200 { 250 252 reg = <0x00ff6e00 0x160>, ··· 299 297 compatible = "qcom,tcsr-mutex"; 300 298 reg = <0x01f40000 0x40000>; 301 299 #hwlock-cells = <1>; 300 + }; 301 + 302 + ipa: ipa@3f40000 { 303 + compatible = "qcom,sdx65-ipa"; 304 + 305 + reg = <0x03f40000 0x10000>, 306 + <0x03f50000 0x5000>, 307 + <0x03e04000 0xfc000>; 308 + reg-names = "ipa-reg", 309 + "ipa-shared", 310 + "gsi"; 311 + 312 + interrupts-extended = <&intc GIC_SPI 241 IRQ_TYPE_EDGE_RISING>, 313 + <&intc GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>, 314 + <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, 315 + <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; 316 + interrupt-names = "ipa", 317 + "gsi", 318 + "ipa-clock-query", 319 + "ipa-setup-ready"; 320 + 321 + iommus = <&apps_smmu 0x5e0 0x0>, 322 + <&apps_smmu 0x5e2 0x0>; 323 + 324 + clocks = <&rpmhcc RPMH_IPA_CLK>; 325 + clock-names = "core"; 326 + 327 + interconnects = <&system_noc MASTER_IPA &mc_virt SLAVE_EBI1>, 328 + <&mem_noc MASTER_APPSS_PROC &system_noc SLAVE_IPA_CFG>; 329 + interconnect-names = "memory", 330 + "config"; 331 + 332 + qcom,smem-states = <&ipa_smp2p_out 0>, 333 + <&ipa_smp2p_out 1>; 334 + qcom,smem-state-names = "ipa-clock-enabled-valid", 335 + "ipa-clock-enabled"; 336 + 337 + status = "disabled"; 302 338 }; 303 339 304 340 remoteproc_mpss: remoteproc@4080000 { ··· 395 355 usb: usb@a6f8800 { 396 356 compatible = "qcom,sdx65-dwc3", "qcom,dwc3"; 397 357 reg = <0x0a6f8800 0x400>; 398 - status = "disabled"; 399 358 #address-cells = <1>; 400 359 #size-cells = <1>; 401 360 ranges; ··· 423 384 power-domains = <&gcc USB30_GDSC>; 424 385 425 386 resets = <&gcc GCC_USB30_BCR>; 387 + 388 + status = "disabled"; 426 389 427 390 usb_dwc3: usb@a600000 { 428 391 compatible = "snps,dwc3";