Unverified Commit 878e26d3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm DTS updates for v5.16

This extends the previous limited description of MSM8226 with SDHC,
UART, I2C, SCM, SMEM, RPM and basic PMIC definitions. Based on this,
initial support for the LG G Watch R smartwatch is introduced.

APQ8064 gets a couple of DT updates, one which will allow the GPU driver
to drop supporting legacy "opp tables" in the future.

DT bindings and DTS files are updated with additional compatibles, for
completeness.

* tag 'qcom-dts-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  dt-bindings: arm: qcom, add missing devices
  ARM: dts: qcom: msm8974: Add xo_board reference clock to DSI0 PHY
  ARM: dts: qcom: fill secondary compatible for multiple boards
  ARM: dts: qcom: apq8064: adjust memory node according to specs
  ARM: dts: qcom: apq8064: Convert adreno from legacy gpu-pwrlevels to opp-v2
  ARM: dts: qcom: Add support for LG G Watch R
  dt-bindings: arm: qcom: Document APQ8026 SoC binding
  ARM: dts: qcom: Add pm8226 PMIC
  ARM: dts: qcom: msm8226: Add more SoC bits
  dt-bindings: arm: qcom: Document SDX65 platform and boards

Link: https://lore.kernel.org/r/20211012174310.1017857-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ba232d39 9304af37

Documentation/devicetree/bindings/arm/qcom.yaml

+16 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ description: | 
  The 'SoC' element must be one of the following strings:



        apq8016

        apq8026

        apq8074

        apq8084

        apq8096
@@ -44,6 +45,7 @@ description: | 
        sdm660

        sdm845

        sdx55

        sdx65

        sm8150

        sm8250

        sm8350
@@ -94,6 +96,14 @@ properties: 


      - items:

          - enum:

              - lge,lenok

          - const: qcom,apq8026



      - items:

          - enum:

              - asus,nexus4-mako

              - asus,nexus7-flo

              - sony,xperia-yuga

              - qcom,apq8064-cm-qs600

              - qcom,apq8064-ifc6410

          - const: qcom,apq8064
@@ -129,6 +139,7 @@ properties: 
          - enum:

              - fairphone,fp2

              - lge,hammerhead

              - samsung,klte

              - sony,xperia-amami

              - sony,xperia-castor

              - sony,xperia-honami
@@ -206,6 +217,11 @@ properties: 
              - qcom,sdx55-t55

          - const: qcom,sdx55



      - items:

          - enum:

              - qcom,sdx65-mtp

          - const: qcom,sdx65



      - items:

          - enum:

              - qcom,ipq6018-cp01

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ dtb-$(CONFIG_ARCH_OXNAS) += \ 
	ox810se-wd-mbwe.dtb \

	ox820-cloudengines-pogoplug-series-3.dtb

dtb-$(CONFIG_ARCH_QCOM) += \

	qcom-apq8026-lge-lenok.dtb \

	qcom-apq8060-dragonboard.dtb \

	qcom-apq8064-cm-qs600.dtb \

	qcom-apq8064-ifc6410.dtb \

arch/arm/boot/dts/qcom-apq8026-lge-lenok.dts

0 → 100644
+237 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Copyright (c) 2021, Luca Weiss <luca@z3ntu.xyz>

 */



/dts-v1/;



#include "qcom-msm8226.dtsi"

#include "qcom-pm8226.dtsi"



/ {

	model = "LG G Watch R";

	compatible = "lge,lenok", "qcom,apq8026";

	qcom,board-id = <132 0x0a>;

	qcom,msm-id = <199 0x20000>;



	aliases {

		serial0 = &blsp1_uart3;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&blsp1_i2c5 {

	status = "okay";

	clock-frequency = <384000>;



	touchscreen@20 {

		compatible = "syna,rmi4-i2c";

		reg = <0x20>;



		interrupts-extended = <&tlmm 17 IRQ_TYPE_EDGE_FALLING>;

		vdd-supply = <&pm8226_l15>;

		vio-supply = <&pm8226_l22>;



		pinctrl-names = "default";

		pinctrl-0 = <&touch_pins>;



		#address-cells = <1>;

		#size-cells = <0>;



		rmi4-f01@1 {

			reg = <0x1>;

			syna,nosleep-mode = <1>;

		};



		rmi4-f12@12 {

			reg = <0x12>;

			syna,sensor-type = <1>;

		};

	};

};



&blsp1_uart3 {

	status = "okay";

};



&rpm_requests {

	pm8226-regulators {

		compatible = "qcom,rpm-pm8226-regulators";



		pm8226_s1: s1 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1275000>;

		};

		pm8226_s3: s3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1350000>;

		};

		pm8226_s4: s4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2200000>;

		};

		pm8226_s5: s5 {

			regulator-min-microvolt = <1150000>;

			regulator-max-microvolt = <1150000>;

		};



		pm8226_l1: l1 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

		};

		pm8226_l2: l2 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};

		pm8226_l3: l3 {

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1337500>;

		};

		pm8226_l4: l4 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};

		pm8226_l5: l5 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};

		pm8226_l6: l6 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		pm8226_l7: l7 {

			regulator-min-microvolt = <1850000>;

			regulator-max-microvolt = <1850000>;

		};

		pm8226_l8: l8 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		pm8226_l9: l9 {

			regulator-min-microvolt = <2050000>;

			regulator-max-microvolt = <2050000>;

		};

		pm8226_l10: l10 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		pm8226_l12: l12 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		pm8226_l14: l14 {

			regulator-min-microvolt = <2750000>;

			regulator-max-microvolt = <2750000>;

		};

		pm8226_l15: l15 {

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

		};

		pm8226_l16: l16 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3350000>;

		};

		pm8226_l17: l17 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;

		};

		pm8226_l18: l18 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3300000>;

		};

		pm8226_l19: l19 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

		};

		pm8226_l20: l20 {

			regulator-min-microvolt = <3075000>;

			regulator-max-microvolt = <3075000>;

		};

		pm8226_l21: l21 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

		};

		pm8226_l22: l22 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		pm8226_l23: l23 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

		};

		pm8226_l24: l24 {

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1350000>;

		};

		pm8226_l25: l25 {

			regulator-min-microvolt = <1775000>;

			regulator-max-microvolt = <2125000>;

		};

		pm8226_l26: l26 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

		};

		pm8226_l27: l27 {

			regulator-min-microvolt = <2050000>;

			regulator-max-microvolt = <2050000>;

		};

		pm8226_l28: l28 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <3000000>;

		};



		pm8226_lvs1: lvs1 {};

	};

};



&sdhc_1 {

	status = "okay";



	vmmc-supply = <&pm8226_l17>;

	vqmmc-supply = <&pm8226_l6>;



	bus-width = <8>;

	non-removable;



	pinctrl-names = "default";

	pinctrl-0 = <&sdhc1_pin_a>;

};



&tlmm {

	sdhc1_pin_a: sdhc1-pin-active {

		clk {

			pins = "sdc1_clk";

			drive-strength = <10>;

			bias-disable;

		};



		cmd-data {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <10>;

			bias-pull-up;

		};

	};



	touch_pins: touch {

		irq {

			pins = "gpio17";

			function = "gpio";



			drive-strength = <8>;

			bias-pull-down;

			input-enable;

		};



		reset {

			pins = "gpio16";

			function = "gpio";



			drive-strength = <8>;

			bias-disable;

			output-high;

		};

	};

};

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

+11 −7
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ CPU_SPC: spc { 
		};

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0>;

	};
@@ -1230,13 +1230,17 @@ &gfx3d1 29 
				  &gfx3d1 30

				  &gfx3d1 31>;



			qcom,gpu-pwrlevels {

				compatible = "qcom,gpu-pwrlevels";

				qcom,gpu-pwrlevel@0 {

					qcom,gpu-freq = <450000000>;

			operating-points-v2 = <&gpu_opp_table>;



			gpu_opp_table: opp-table {

				compatible = "operating-points-v2";



				opp-320000000 {

					opp-hz = /bits/ 64 <450000000>;

				};

				qcom,gpu-pwrlevel@1 {

					qcom,gpu-freq = <27000000>;



				opp-27000000 {

					opp-hz = /bits/ 64 <27000000>;

				};

			};

		};

arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


/ {

	model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1-C1";

	compatible = "qcom,ipq4019-dk04.1-c1";

	compatible = "qcom,ipq4019-dk04.1-c1", "qcom,ipq4019";



	soc {

		dma@7984000 {