Commit c03b7ba9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-for-5.17-1' of... 

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

Qualcomm ARM64 DeviceTree updates for v5.17

This introduces initial support for the brand new Snapdragon 8 Gen 1,
aka SM8450 platform, with SMP, CPUfreq, cluster idling, low speed buses,
TLMM pinctrl, SMMU, regulators, clocks, power-domains, UFS storage and
USB currently supported.

SDM845 adds new support for Sony Xperia XZ2, XZ2C and XZ3. The Lenovo
Yoga C630 gains a few audio related fixes. The PMIC's VADC channels are
described as thermal zones. OnePlus devices gains msm-id and board-id,
to facilitate a single firmware image for the multiple devices.

On SM8350 the Sony Xperia 1 III and 5 III, as well as initial
description of Microsoft's Surface Duo 2 are introduced.  On the
platform side, LLCC, QUP nodes, redistributor stride and all the
low-speed QUPs are added

MSM8996 gained various regulator fixes, and adsp firmware name to
faciliate pushing firmware to linux-firmware. Xiaomi Mi Note 2 gained
touchkey controller definition.

On SDM660 the Xiaomi Redmi Note 7 gained power and volume keys, RPM and
regulator definitions, USB, eMMC and SD-card and a simple-framebuffer
description.

MSM8916 has the mmc aliases corrected, to stop the storage devices to
move around and the RPM sleep stats memory is described. Support for the
Samsung J5 2015 smartphone is introduced.

SM6350 validation errors are fixed and and description of the audio,
compute and modem remoteprocs are added.

A couple new revisions of the SC7180 based Google devices are added.
The SC7280 platform gains venus and a few fixes. The CRD development
device is introduced, with the EC, touchscreen and touchpad.

On SM8250 CPU opp-tables, for scaling L3 cache and DDR frequency based
on CPU frequency, are added. As is TX, RX macros and SoundWire blocks
and used to enable audio on the SM8350 MTP.

* tag 'qcom-arm64-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux

: (92 commits)
  arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX
  arm64: dts: qcom: sm8450-qrd: Enable USB nodes
  arm64: dts: qcom: sm8450: Add usb nodes
  arm64: dts: qcom: sm8450: add i2c13 and i2c14 device nodes
  arm64: dts: qcom: sm8450: add cpufreq support
  arm64: dts: qcom: sm8450: Add rpmhpd node
  arm64: dts: qcom: sm8450-qrd: enable ufs nodes
  arm64: dts: qcom: sm8450: add ufs nodes
  arm64: dts: qcom: sm8450-qrd: Add rpmh regulator nodes
  arm64: dts: qcom: Add base SM8450 QRD DTS
  arm64: dts: qcom: sm8450: add smmu nodes
  arm64: dts: qcom: sm8450: Add reserved memory nodes
  arm64: dts: qcom: sm8450: Add tlmm nodes
  arm64: dts: qcom: Add base SM8450 DTSI
  arm64: dts: qcom: ipq6018: Fix gpio-ranges property
  arm64: dts: qcom: sdm845: add QFPROM chipset specific compatible
  arm64: dts: qcom: sdm845: mtp: Add vadc channels and thermal zones
  arm64: dts: qcom: pm8998: Add ADC Thermal Monitor node
  arm64: qcom: dts: drop legacy property #stream-id-cells
  Revert "arm64: dts: qcom: sm8350: Specify clock-frequency for arch timer"
  ...

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

Documentation/devicetree/bindings/arm/qcom.yaml

+2 −0
Original line number Diff line number Diff line
@@ -202,8 +202,10 @@ properties: 


      - items:

          - enum:

              - qcom,sc7280-crd

              - qcom,sc7280-idp

              - qcom,sc7280-idp2

              - google,hoglin

              - google,piglin

              - google,senor

          - const: qcom,sc7280

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

0 → 100644
+85 −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,gcc-sm8450.yaml#

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



title: Qualcomm Global Clock & Reset Controller Binding for SM8450



maintainers:

  - Vinod Koul <vkoul@kernel.org>



description: |

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

  power domains on SM8450



  See also:

  - dt-bindings/clock/qcom,gcc-sm8450.h



properties:

  compatible:

    const: qcom,gcc-sm8450



  clocks:

    items:

      - description: Board XO source

      - description: Sleep clock source

      - description: PCIE 0 Pipe clock source (Optional clock)

      - description: PCIE 1 Pipe clock source (Optional clock)

      - description: PCIE 1 Phy Auxillary clock source (Optional clock)

      - description: UFS Phy Rx symbol 0 clock source (Optional clock)

      - description: UFS Phy Rx symbol 1 clock source (Optional clock)

      - description: UFS Phy Tx symbol 0 clock source (Optional clock)

      - description: USB3 Phy wrapper pipe clock source (Optional clock)

    minItems: 2



  clock-names:

    items:

      - const: bi_tcxo

      - const: sleep_clk

      - const: pcie_0_pipe_clk # Optional clock

      - const: pcie_1_pipe_clk # Optional clock

      - const: pcie_1_phy_aux_clk # Optional clock

      - const: ufs_phy_rx_symbol_0_clk # Optional clock

      - const: ufs_phy_rx_symbol_1_clk # Optional clock

      - const: ufs_phy_tx_symbol_0_clk # Optional clock

      - const: usb3_phy_wrapper_gcc_usb30_pipe_clk # Optional clock

    minItems: 2



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



  '#power-domain-cells':

    const: 1



  reg:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - '#clock-cells'

  - '#reset-cells'

  - '#power-domain-cells'



additionalProperties: false



examples:

  - |

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

    clock-controller@100000 {

      compatible = "qcom,gcc-sm8450";

      reg = <0x00100000 0x001f4200>;

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

      clock-names = "bi_tcxo", "sleep_clk";

      #clock-cells = <1>;

      #reset-cells = <1>;

      #power-domain-cells = <1>;

    };



...

arch/arm64/boot/dts/qcom/Makefile

+17 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-a3u-eur.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-a5u-eur.dtb

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

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb
@@ -57,6 +58,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r3-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-homestar-r2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-homestar-r3.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-homestar-r4.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r0.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1-kb.dtb
@@ -64,9 +66,14 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3-kb.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r9.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r9-kb.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-r4.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-r9.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r4.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r5.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r9.dtb

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-pompom-r2.dtb
@@ -78,6 +85,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-idp2.dtb

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

dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-ganges-kirin.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-nile-discovery.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm630-sony-xperia-nile-pioneer.dtb
@@ -91,6 +99,9 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-oneplus-enchilada.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-oneplus-fajita.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-akari.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-akatsuki.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-sony-xperia-tama-apollo.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-xiaomi-beryllium.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm850-lenovo-yoga-c630.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm6125-sony-xperia-seine-pdx201.dtb
@@ -106,4 +117,8 @@ 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)	+= sm8350-hdk.dtb

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= sm8350-sony-xperia-sagami-pdx214.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8350-sony-xperia-sagami-pdx215.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sm8450-qrd.dtb

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

+9 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ bluetooth { 


&adsp_pil {

	status = "okay";

	firmware-name = "qcom/apq8096/adsp.mbn";

};



&blsp2_i2c1 {
@@ -232,6 +233,7 @@ &hdmi_phy { 
&hsusb_phy1 {

	status = "okay";



	vdd-supply = <&vreg_l28a_0p925>;

	vdda-pll-supply = <&vreg_l12a_1p8>;

	vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;

};
@@ -239,6 +241,7 @@ &hsusb_phy1 { 
&hsusb_phy2 {

	status = "okay";



	vdd-supply = <&vreg_l28a_0p925>;

	vdda-pll-supply = <&vreg_l12a_1p8>;

	vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;

};
@@ -632,6 +635,8 @@ &pm8994_mpps { 


&pm8994_spmi_regulators {

	qcom,saw-reg = <&saw3>;

	vdd_s11-supply = <&vph_pwr>;



	s9 {

		qcom,saw-slave;

	};
@@ -640,6 +645,7 @@ s10 { 
	};

	s11 {

		qcom,saw-leader;

		regulator-name = "VDD_APCC";

		regulator-always-on;

		regulator-min-microvolt = <980000>;

		regulator-max-microvolt = <980000>;
@@ -672,6 +678,8 @@ pinconf { 
};



&pmi8994_spmi_regulators {

	vdd_s2-supply = <&vph_pwr>;



	vdd_gfx: s2@1700 {

		reg = <0x1700 0x100>;

		regulator-name = "VDD_GFX";
@@ -709,7 +717,7 @@ pm8994-regulators { 
		vdd_l17_l29-supply = <&vph_pwr_bbyp>;

		vdd_l20_l21-supply = <&vph_pwr_bbyp>;

		vdd_l25-supply = <&vreg_s3a_1p3>;

		vdd_lvs1_lvs2-supply = <&vreg_s4a_1p8>;

		vdd_lvs1_2-supply = <&vreg_s4a_1p8>;



		vreg_s3a_1p3: s3 {

			regulator-name = "vreg_s3a_1p3";

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

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ tlmm: pinctrl@1000000 { 
			interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&tlmm 0 80>;

			gpio-ranges = <&tlmm 0 0 80>;

			interrupt-controller;

			#interrupt-cells = <2>;