Unverified Commit fc54e13d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

More Qualcomm ARM32 DTS updates for 6.3

This adds backlight, notification LED, vibrator, volume keys and hall
sensor to the OnePlus One, and provides a range of Devicetree validation
fixes across various platforms.

* tag 'qcom-dts-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (22 commits)
  ARM: dts: qcom: align OPP table names with DT schema
  ARM: dts: qcom: msm8974-oneplus-bacon: Add notification LED
  ARM: dts: qcom: msm8974-oneplus-bacon: Add backlight
  ARM: dts: qcom: msm8974-oneplus-bacon: Add volume keys and hall sensor
  ARM: dts: qcom: msm8974-oneplus-bacon: Add vibrator
  ARM: dts: qcom: pm8941: Add vibrator node
  ARM: dts: qcom: sdx55: correct TLMM gpio-ranges
  dt-bindings: arm: qcom: add the sa8775p-ride board
  ARM: dts: qcom: apq8064: add second DSI host and PHY
  ARM: dts: qcom: apq8060-dragonboard: align MPP pin node names with DT schema
  dt-bindings: arm: qcom: Add Xiaomi Mi Pad 5 Pro (xiaomi-elish)
  ARM: dts: qcom-sdx65: align RPMh regulator nodes with bindings
  ARM: dts: qcom-sdx55: align RPMh regulator nodes with bindings
  ARM: dts: qcom: use "okay" for status
  ARM: dts: qcom: sdx65: Add Qcom SMMU-500 as the fallback for IOMMU node
  ARM: dts: qcom: sdx55: Add Qcom SMMU-500 as the fallback for IOMMU node
  ARM: dts: qcom: apq8064: use hdmi_phy for the MMCC's hdmipll clock
  ARM: dts: qcom: apq8064: add #clock-cells to the HDMI PHY node
  ARM: dts: qcom: ipq8064: move reg-less nodes outside soc node
  dt-bindings: qcom: Document msm8916-thwc-uf896 and ufi001c
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 59b05cfa 68e8dd35

Documentation/devicetree/bindings/arm/qcom.yaml

+16 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ description: | 
        qru1000

        sa8155p

        sa8540p

        sa8775p

        sc7180

        sc7280

        sc8180x
@@ -89,6 +90,7 @@ description: | 
        liquid

        mtp

        qrd

        ride

        sbc

        x100
@@ -221,6 +223,8 @@ properties: 
              - samsung,j5

              - samsung,j5x

              - samsung,serranove

              - thwc,uf896

              - thwc,ufi001c

              - wingtech,wt88047

          - const: qcom,msm8916
@@ -652,6 +656,12 @@ properties: 
          - const: google,hoglin

          - const: qcom,sc7280



      - description: Qualcomm Technologies, Inc. sc7280 CRD Pro platform (newest rev)

        items:

          - const: google,zoglin-sku1536

          - const: google,hoglin-sku1536

          - const: qcom,sc7280



      - description: Qualcomm Technologies, Inc. sc7280 IDP SKU1 platform

        items:

          - const: qcom,sc7280-idp
@@ -805,6 +815,11 @@ properties: 
              - qcom,sa8540p-ride

          - const: qcom,sa8540p



      - items:

          - enum:

              - qcom,sa8775p-ride

          - const: qcom,sa8775p



      - items:

          - enum:

              - google,cheza
@@ -875,6 +890,7 @@ properties: 
              - qcom,sm8250-mtp

              - sony,pdx203-generic

              - sony,pdx206-generic

              - xiaomi,elish

          - const: qcom,sm8250



      - items:

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1333,6 +1333,8 @@ patternProperties: 
    description: thingy.jp

  "^thundercomm,.*":

    description: Thundercomm Technology Co., Ltd.

  "^thwc,.*":

    description: Shenzhen Tong Heng Wei Chuang Technology Co., Ltd.

  "^ti,.*":

    description: Texas Instruments

  "^tianma,.*":

arch/arm/boot/dts/qcom-apq8060-dragonboard.dts

+7 −9
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ 


&pm8058_mpps {

	dragon_cm3605_mpps: cm3605-mpps-state {

		mpp5 {

		pins = "mpp5";

		function = "analog";

		input-enable;
@@ -445,7 +444,6 @@ 
		power-source = <PM8058_GPIO_S3>;

	};

};

};



&rpm {

	/*

arch/arm/boot/dts/qcom-apq8064.dtsi

+78 −3
Original line number Diff line number Diff line
@@ -865,9 +865,9 @@ 
				 <&gcc PLL8_VOTE>,

				 <&dsi0_phy 1>,

				 <&dsi0_phy 0>,

				 <0>,

				 <0>,

				 <0>;

				 <&dsi1_phy 1>,

				 <&dsi1_phy 0>,

				 <&hdmi_phy>;

			clock-names = "pxo",

				      "pll3",

				      "pll8_vote",
@@ -1342,6 +1342,80 @@ 
			status = "disabled";

		};



		dsi1: dsi@5800000 {

			compatible = "qcom,mdss-dsi-ctrl";

			interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0x05800000 0x200>;

			reg-names = "dsi_ctrl";



			clocks = <&mmcc DSI2_M_AHB_CLK>,

				 <&mmcc DSI2_S_AHB_CLK>,

				 <&mmcc AMP_AHB_CLK>,

				 <&mmcc DSI2_CLK>,

				 <&mmcc DSI2_BYTE_CLK>,

				 <&mmcc DSI2_PIXEL_CLK>,

				 <&mmcc DSI2_ESC_CLK>;

			clock-names = "iface",

				      "bus",

				      "core_mmss",

				      "src",

				      "byte",

				      "pixel",

				      "core";



			assigned-clocks = <&mmcc DSI2_BYTE_SRC>,

					  <&mmcc DSI2_ESC_SRC>,

					  <&mmcc DSI2_SRC>,

					  <&mmcc DSI2_PIXEL_SRC>;

			assigned-clock-parents = <&dsi1_phy 0>,

						 <&dsi1_phy 0>,

						 <&dsi1_phy 1>,

						 <&dsi1_phy 1>;



			syscon-sfpb = <&mmss_sfpb>;

			phys = <&dsi1_phy>;



			#address-cells = <1>;

			#size-cells = <0>;



			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					dsi1_in: endpoint {

					};

				};



				port@1 {

					reg = <1>;

					dsi1_out: endpoint {

					};

				};

			};

		};





		dsi1_phy: dsi-phy@5800200 {

			compatible = "qcom,dsi-phy-28nm-8960";

			reg = <0x05800200 0x100>,

			      <0x05800300 0x200>,

			      <0x05800500 0x5c>;

			reg-names = "dsi_pll",

				    "dsi_phy",

				    "dsi_phy_regulator";

			clock-names = "iface",

				      "ref";

			clocks = <&mmcc DSI2_M_AHB_CLK>,

				 <&pxo_board>;

			#clock-cells = <1>;

			#phy-cells = <0>;



			status = "disabled";

		};



		mdp_port0: iommu@7500000 {

			compatible = "qcom,apq8064-iommu";
@@ -1489,6 +1563,7 @@ 
			clocks = <&mmcc HDMI_S_AHB_CLK>;

			clock-names = "slave_iface";

			#phy-cells = <0>;

			#clock-cells = <0>;



			status = "disabled";

		};

arch/arm/boot/dts/qcom-ipq4019.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
		};

	};



	cpu0_opp_table: opp_table0 {

	cpu0_opp_table: opp-table {

		compatible = "operating-points-v2";

		opp-shared;