Unverified Commit 7dbdc16f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-for-6.3-2' of... 

Merge tag 'qcom-arm64-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

More Qualcomm ARM64 DT updates for 6.3

The new Qualcomm QDU1000 and QRU1000 platforms, and the IDP device on
these are introduced. New support for a couple of USB modem sticks from
THWC are introduced, so is support for Xiaomi Mi Pad 5 Pro and the Pro
SKU of the Herobrine device.

The Core Bus Fabric (CBF) is introduced on MSM8996. Interconnect paths
for UFS are also described.

A few fixes related to the power-grid of herobrine, on SC7280, are
introduced.

QFPROM is introduced on IPQ8074 and Interconnect providers are added for
SDM670.

On SDM845 the duplicated wcd9340 audio coded description is moved from
devices to a common file, audio devices are added to the OnePlus 6 and
6T.

On SM6115 debug UART, SMP2P, watchdog nodes are introduced, and the
platform is switched to use #address/size-cells of 2, in line with most
other platforms.

Camera control interface and clock controllers are added for SM6350, and
the CCI interface is enabled on the Fairphone FP4.

On SM8350 the interconnect reference of SDHCI controller is corrected,
DSI1 PHY clocks are properly described as sources for the Display clock
controller and DSI1 is wired up to the display controller.

The firmware paths are corrected for the Sony Xperia Nagara platform.

The GPR bus, audio servic3es and LPASS pinctrl nodes are added for the
SM8550 platform. Additionally a few small typos/errors are corrected.

gpio-ranges are corrected across MSM8953, SM6115 and SC8280XP and a
range of DT validation issues are corrected.

* tag 'qcom-arm64-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (81 commits)
  arm64: dts: qcom: sc7280: Power herobrine's 3.3 eDP/TS rail more properly
  arm64: dts: qcom: pmk8550: fix PON compatible
  arm64: dts: qcom: sm8550: fix DSI controller compatible
  arm64: dts: qcom: sc7280: Hook up the touchscreen IO rail on evoker
  arm64: dts: qcom: sc7280: Hook up the touchscreen IO rail on villager
  arm64: dts: qcom: sc7280: Add 3ms ramp to herobrine's pp3300_left_in_mlb
  arm64: dts: qcom: sc7280: On QCard, regulator L3C should be 1.8V
  arm64: dts: qcom: sc8280xp: correct LPASS GPIO gpio-ranges
  arm64: dts: qcom: msm8992-lg-bullhead: Enable regulators
  arm64: dts: qcom: sm6115: correct TLMM gpio-ranges
  arm64: dts: qcom: msm8953: correct TLMM gpio-ranges
  arm64: dts: qcom: msm8992-lg-bullhead: Correct memory overlaps with the SMEM and MPSS memory regions
  arm64: dts: qcom: sm8350-hdk: correct LT9611 pin function
  arm64: dts: qcom: sm8350-hdk: align pin config node names with bindings
  arm64: dts: qcom: sm6350: Use specific qmpphy compatible
  arm64: dts: qcom: sm6115: Add smp2p nodes
  arm64: dts: qcom: sm7225-fairphone-fp4: Enable CCI busses
  arm64: dts: qcom: sm6350: Add CCI nodes
  arm64: dts: qcom: sm6350: Add camera clock controller
  dt-bindings: clock: add QCOM SM6350 camera clock bindings
  ...

Link: https://lore.kernel.org/r/20230210192908.2039976-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fc54e13d f069ede8

Documentation/devicetree/bindings/clock/qcom,qdu1000-gcc.yaml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/qcom,qdu1000-gcc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm Global Clock & Reset Controller for QDU1000 and QRU1000



maintainers:

  - Melody Olvera <quic_molvera@quicinc.com>



description: |

  Qualcomm global clock control module which supports the clocks, resets and

  power domains on QDU1000 and QRU1000



  See also:: include/dt-bindings/clock/qcom,qdu1000-gcc.h



properties:

  compatible:

    const: qcom,qdu1000-gcc



  clocks:

    items:

      - description: Board XO source

      - description: Sleep clock source

      - description: PCIE 0 Pipe clock source

      - description: PCIE 0 Phy Auxiliary clock source

      - description: USB3 Phy wrapper pipe clock source



required:

  - compatible

  - clocks



allOf:

  - $ref: qcom,gcc.yaml#



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/qcom,rpmh.h>

    clock-controller@100000 {

      compatible = "qcom,qdu1000-gcc";

      reg = <0x00100000 0x001f4200>;

      clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,

               <&pcie_0_pipe_clk>, <&pcie_0_phy_aux_clk>,

               <&usb3_phy_wrapper_pipe_clk>;

      #clock-cells = <1>;

      #reset-cells = <1>;

      #power-domain-cells = <1>;

    };

Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/qcom,sm6350-camcc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm Camera Clock & Reset Controller on SM6350



maintainers:

  - Konrad Dybcio <konrad.dybcio@linaro.org>



description: |

  Qualcomm camera clock control module provides the clocks, resets and  power

  domains on SM6350.



  See also:: include/dt-bindings/clock/qcom,sm6350-camcc.h



properties:

  compatible:

    const: qcom,sm6350-camcc



  clocks:

    items:

      - description: Board XO source



  reg:

    maxItems: 1



required:

  - compatible

  - clocks



allOf:

  - $ref: qcom,gcc.yaml#



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/qcom,rpmh.h>

    clock-controller@ad00000 {

      compatible = "qcom,sm6350-camcc";

      reg = <0x0ad00000 0x16000>;

      clocks = <&rpmhcc RPMH_CXO_CLK>;

      #clock-cells = <1>;

      #reset-cells = <1>;

      #power-domain-cells = <1>;

    };

...

Documentation/devicetree/bindings/interconnect/qcom,qdu1000-rpmh.yaml

0 → 100644
+70 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/interconnect/qcom,qdu1000-rpmh.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm RPMh Network-On-Chip Interconnect on QDU1000



maintainers:

  - Georgi Djakov <djakov@kernel.org>

  - Odelu Kukatla <quic_okukatla@quicinc.com>



description: |

   RPMh interconnect providers support system bandwidth requirements through

   RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is

   able to communicate with the BCM through the Resource State Coordinator (RSC)

   associated with each execution environment. Provider nodes must point to at

   least one RPMh device child node pertaining to their RSC and each provider

   can map to multiple RPMh resources.



properties:

  compatible:

    enum:

      - qcom,qdu1000-clk-virt

      - qcom,qdu1000-gem-noc

      - qcom,qdu1000-mc-virt

      - qcom,qdu1000-system-noc



  '#interconnect-cells': true



  reg:

    maxItems: 1



allOf:

  - $ref: qcom,rpmh-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,qdu1000-clk-virt

              - qcom,qdu1000-mc-virt

    then:

      properties:

        reg: false

    else:

      required:

        - reg



required:

  - compatible



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interconnect/qcom,qdu1000-rpmh.h>



    system_noc: interconnect@1640000 {

        compatible = "qcom,qdu1000-system-noc";

        reg = <0x1640000 0x45080>;

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };



    clk_virt: interconnect-0 {

        compatible = "qcom,qdu1000-clk-virt";

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };

arch/arm64/boot/dts/qcom/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt58.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-j5.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-j5x.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-serranove.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-thwc-uf896.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-thwc-ufi001c.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-wingtech-wt88047.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8953-motorola-potter.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8953-xiaomi-daisy.dtb
@@ -66,8 +68,10 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-xiaomi-sagit.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-1000.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-4000.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qdu1000-idp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qrb5165-rb5.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qrb5165-rb5-vision-mezzanine.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qru1000-idp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sa8155p-adp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sa8295p-adp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sa8540p-ride.dtb
@@ -123,6 +127,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-crd.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-crd-pro.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-evoker.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-evoker-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-herobrine-r1.dtb
@@ -184,6 +189,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-sony-xperia-edo-pdx203.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-sony-xperia-edo-pdx206.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-xiaomi-elish.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8350-hdk.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8350-microsoft-surface-duo2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8350-mtp.dtb

arch/arm64/boot/dts/qcom/ipq8074.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -266,6 +266,13 @@ 
			status = "disabled";

		};



		qfprom: efuse@a4000 {

			compatible = "qcom,ipq8074-qfprom", "qcom,qfprom";

			reg = <0x000a4000 0x2000>;

			#address-cells = <1>;

			#size-cells = <1>;

		};



		prng: rng@e3000 {

			compatible = "qcom,prng-ee";

			reg = <0x000e3000 0x1000>;