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

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

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

Qualcomm ARM DT updates for v6.3

This introduces support for Acer Iconia Talk S A1-724

The Samsung Galaxy Tab 4 10.1 gains ADSP and backlight support.

The Xperia Z2 Tablet gets charging enabled and the touchscreen is given
a little bit more time to start up.

APQ8064 and MSM8974 gains improvements in clock hierarchy. APQ8064
thermal sensor (tsens) driver gains per-censor calibration data.

Lastly a set of patches that improves DT binding compliance.

* tag 'qcom-dts-for-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (50 commits)
  ARM: dts: qcom: msm8226: add RPMCC node
  ARM: dts: qcom: apq8084: add clocks and clock-names to gcc device
  ARM: dts: qcom: align OPP table node name with DT schema
  ARM: dts: qcom: rename mdp nodes to display-controller
  ARM: dts: qcom-msm8974: rename mdss node to display-subsystem
  ARM: dts: qcom-msm8974: add SoC specific compat string to mdp5 node
  dt-bindings: qcom: Document samsung,gt58 and gt510
  dt-bindings: qcom: Document bindings for msm8916-samsung-j5x
  ARM: dts: qcom: use qcom,gsi-loader for IPA
  ARM: dts: qcom-apq8084: specify per-sensor calibration cells
  ARM: dts: qcom-msm8974: specify per-sensor calibration cells
  dt-bindings: arm: qcom: Document MSM8939 SoC binding
  ARM: dts: qcom: msm8974: add xo clock to rpm clock controller
  dt-bindings: qcom: Document msm8916-gplus-fl8005a
  dt-bindings: vendor-prefixes: Add GPLUS
  ARM: dts: qcom: apq8026-samsung-matisse-wifi: Add display backlight
  dt-bindings: arm: qcom: Add SM6115(P) and Lenovo Tab P11
  ARM: dts: qcom: add missing space before {
  dt-bindings: arm: qcom: add board-id/msm-id for MSM8956, SDM636 and SM4250
  dt-bindings: arm: qcom: Add zombie with NVMe
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42bea43c 34d50b12

Documentation/devicetree/bindings/arm/qcom.yaml

+63 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ description: | 
        mdm9615

        msm8226

        msm8916

        msm8939

        msm8953

        msm8956

        msm8974

        msm8976
@@ -52,6 +54,7 @@ description: | 
        sc8180x

        sc8280xp

        sda660

        sdm450

        sdm630

        sdm632

        sdm636
@@ -62,6 +65,7 @@ description: | 
        sdx65

        sm4250

        sm6115

        sm6115p

        sm6125

        sm6350

        sm6375
@@ -70,6 +74,7 @@ description: | 
        sm8250

        sm8350

        sm8450

        sm8550



  The 'board' element must be one of the following strings:
@@ -160,6 +165,12 @@ properties: 
              - samsung,s3ve3g

          - const: qcom,msm8226



      - items:

          - enum:

              - sony,kanuti-tulip

              - square,apq8039-t2

          - const: qcom,msm8939



      - items:

          - enum:

              - sony,kugo-row
@@ -194,8 +205,10 @@ properties: 


      - items:

          - enum:

              - acer,a1-724

              - alcatel,idol347

              - asus,z00l

              - gplus,fl8005a

              - huawei,g7

              - longcheer,l8910

              - samsung,a3u-eur
@@ -203,7 +216,10 @@ properties: 
              - samsung,e5

              - samsung,e7

              - samsung,grandmax

              - samsung,gt510

              - samsung,gt58

              - samsung,j5

              - samsung,j5x

              - samsung,serranove

              - wingtech,wt88047

          - const: qcom,msm8916
@@ -213,6 +229,15 @@ properties: 
          - const: qcom,msm8916-v1-qrd/9-v1

          - const: qcom,msm8916



      - items:

          - enum:

              - motorola,potter

              - xiaomi,daisy

              - xiaomi,mido

              - xiaomi,tissot

              - xiaomi,vince

          - const: qcom,msm8953



      - items:

          - enum:

              - lg,bullhead
@@ -679,6 +704,18 @@ properties: 
          - const: google,zombie-sku512

          - const: qcom,sc7280



      - description: Google Zombie with NVMe (newest rev)

        items:

          - const: google,zombie-sku2

          - const: google,zombie-sku3

          - const: google,zombie-sku515

          - const: qcom,sc7280



      - description: Google Zombie with LTE and NVMe (newest rev)

        items:

          - const: google,zombie-sku514

          - const: qcom,sc7280



      - items:

          - enum:

              - lenovo,flex-5g
@@ -693,6 +730,11 @@ properties: 
              - qcom,sc8280xp-qrd

          - const: qcom,sc8280xp



      - items:

          - enum:

              - motorola,ali

          - const: qcom,sdm450



      - items:

          - enum:

              - sony,discovery-row
@@ -709,6 +751,7 @@ properties: 
      - items:

          - enum:

              - fairphone,fp3

              - motorola,ocean

          - const: qcom,sdm632



      - items:
@@ -790,6 +833,12 @@ properties: 
              - oneplus,billie2

          - const: qcom,sm4250



      - items:

          - enum:

              - lenovo,j606f

          - const: qcom,sm6115p

          - const: qcom,sm6115



      - items:

          - enum:

              - sony,pdx201
@@ -845,6 +894,11 @@ properties: 
              - sony,pdx224

          - const: qcom,sm8450



      - items:

          - enum:

              - qcom,sm8550-mtp

          - const: qcom,sm8550



  # Board compatibles go above



  qcom,msm-id:
@@ -922,15 +976,22 @@ allOf: 
              - qcom,apq8026

              - qcom,apq8094

              - qcom,apq8096

              - qcom,msm8939

              - qcom,msm8953

              - qcom,msm8956

              - qcom,msm8992

              - qcom,msm8994

              - qcom,msm8996

              - qcom,msm8998

              - qcom,sdm450

              - qcom,sdm630

              - qcom,sdm632

              - qcom,sdm636

              - qcom,sdm845

              - qcom,sdx55

              - qcom,sdx65

              - qcom,sm4250

              - qcom,sm6115

              - qcom,sm6125

              - qcom,sm6350

              - qcom,sm7225
@@ -954,6 +1015,8 @@ allOf: 
              - oneplus,dumpling

              - oneplus,enchilada

              - oneplus,fajita

              - oneplus,oneplus3

              - oneplus,oneplus3t

    then:

      properties:

        qcom,board-id:

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -512,6 +512,8 @@ patternProperties: 
    description: Shenzhen Huiding Technology Co., Ltd.

  "^google,.*":

    description: Google, Inc.

  "^gplus,.*":

    description: GPLUS

  "^grinn,.*":

    description: Grinn

  "^grmn,.*":

arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts

+69 −2
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
#include "qcom-msm8226.dtsi"

#include "qcom-pm8226.dtsi"



/delete-node/ &adsp_region;

/delete-node/ &smem_region;



/ {

	model = "Samsung Galaxy Tab 4 10.1";

	compatible = "samsung,matisse-wifi", "qcom,apq8026";
@@ -77,6 +80,55 @@ key-volume-up { 
		};

	};



	i2c-backlight {

		compatible = "i2c-gpio";

		sda-gpios = <&tlmm 20 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

		scl-gpios = <&tlmm 21 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;



		pinctrl-0 = <&backlight_i2c_default_state>;

		pinctrl-names = "default";



		i2c-gpio,delay-us = <4>;



		#address-cells = <1>;

		#size-cells = <0>;



		backlight@2c {

			compatible = "ti,lp8556";

			reg = <0x2c>;



			dev-ctrl = /bits/ 8 <0x80>;

			init-brt = /bits/ 8 <0x3f>;

			pwm-period = <100000>;



			pwms = <&backlight_pwm 0 100000>;

			pwm-names = "lp8556";



			rom-a0h {

				rom-addr = /bits/ 8 <0xa0>;

				rom-val = /bits/ 8 <0x44>;

			};



			rom-a1h {

				rom-addr = /bits/ 8 <0xa1>;

				rom-val = /bits/ 8 <0x6c>;

			};



			rom-a5h {

				rom-addr = /bits/ 8 <0xa5>;

				rom-val = /bits/ 8 <0x24>;

			};

		};

	};



	backlight_pwm: pwm {

		compatible = "clk-pwm";

		#pwm-cells = <2>;

		clocks = <&mmcc CAMSS_GP0_CLK>;

		pinctrl-0 = <&backlight_pwm_default_state>;

		pinctrl-names = "default";

	};



	reg_tsp_1p8v: regulator-tsp-1p8v {

		compatible = "regulator-fixed";

		regulator-name = "tsp_1p8v";
@@ -133,7 +185,7 @@ wcnss@d200000 { 
			no-map;

		};



		adsp@d900000 {

		adsp_region: adsp@d900000 {

			reg = <0x0d900000 0x1800000>;

			no-map;

		};
@@ -143,7 +195,6 @@ venus@f100000 { 
			no-map;

		};



		/delete-node/ smem@3000000;

		smem_region: smem@fa00000 {

			reg = <0x0fa00000 0x100000>;

			no-map;
@@ -169,6 +220,10 @@ rmtfs@fd80000 { 
	};

};



&adsp {

	status = "okay";

};



&blsp1_i2c2 {

	status = "okay";
@@ -412,6 +467,18 @@ accel_int_default_state: accel-int-default-state { 
		bias-disable;

	};



	backlight_i2c_default_state: backlight-i2c-default-state {

		pins = "gpio20", "gpio21";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

	};



	backlight_pwm_default_state: backlight-pwm-default-state {

		pins = "gpio33";

		function = "gp0_clk";

	};



	muic_int_default_state: muic-int-default-state {

		pins = "gpio67";

		function = "gpio";

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

+9 −9
Original line number Diff line number Diff line
@@ -375,14 +375,13 @@ intc: interrupt-controller@2000000 { 
		};



		timer@200a000 {

			compatible = "qcom,kpss-timer",

				     "qcom,kpss-wdt-apq8064", "qcom,msm-timer";

			compatible = "qcom,kpss-wdt-apq8064", "qcom,kpss-timer",

				     "qcom,msm-timer";

			interrupts = <1 1 0x301>,

				     <1 2 0x301>,

				     <1 3 0x301>;

			reg = <0x0200a000 0x100>;

			clock-frequency = <27000000>,

					  <32768>;

			clock-frequency = <27000000>;

			cpu-offset = <0x80000>;

		};
@@ -1277,7 +1276,8 @@ mmss_sfpb: syscon@5700000 { 
		};



		dsi0: dsi@4700000 {

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

			compatible = "qcom,apq8064-dsi-ctrl",

				     "qcom,mdss-dsi-ctrl";

			label = "MDSS DSI CTRL->0";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -1493,7 +1493,7 @@ hdmi_phy: phy@4a00400 { 
			status = "disabled";

		};



		mdp: mdp@5100000 {

		mdp: display-controller@5100000 {

			compatible = "qcom,mdp4";

			reg = <0x05100000 0xf0000>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/qcom-apq8084-ifc6540.dts

+10 −10
Original line number Diff line number Diff line
@@ -19,16 +19,16 @@ soc { 
		serial@f995e000 {

			status = "okay";

		};

	};

};



		sdhci@f9824900 {

&sdhc_1 {

	bus-width = <8>;

	non-removable;

	status = "okay";

};



		sdhci@f98a4900 {

&sdhc_2 {

	cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

};
 
	};

};