Unverified Commit 78559d6f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM DTS updates for 6.1

This adds extends the IPQ8064 support with the two variants IPQ8062 and
IPQ8065. MSM8974 and APQ8084 gained RPM stats support.

The Audio DSP remoteproc was added to MSM8226 and enabled for ASUS
ZenWatch 2 and LG G Watch R.

MSM8660 gained one I2C and one SPI bus and the APQ8060 Dragonboard got
the TMA340 Touchscreen described.

A wide range of improvements are done throughout the DTS files to align
with bindings, fix issues and improve structure on things.

* tag 'qcom-dts-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (35 commits)
  ARM: dts: qcom: apq8026-lg-lenok: Enable ADSP
  ARM: dts: qcom: apq8026-asus-sparrow: Enable ADSP
  ARM: dts: qcom: msm8226: Add ADSP node
  ARM: dts: qcom: ipq8064: pad addresses to 8 digit
  ARM: dts: qcom: ipq8064: reorganize node order and sort them
  ARM: dts: qcom: align SDHCI clocks with DT schema
  ARM: dts: qcom: align SDHCI reg-names with DT schema
  ARM: dts: qcom: msm8960: add clocks to the MMCC device node
  ARM: dts: qcom: apq8064: add clocks to the MMCC device node
  ARM: dts: qcom: msm8960: add clocks to the GCC device node
  ARM: dts: qcom: apq8064: add clocks to the GCC device node
  ARM: dts: qcom: msm8960: add clocks to the LCC device node
  ARM: dts: qcom: apq8064: add clocks to the LCC device node
  ARM: dts: qcom: msm8226: switch TCSR mutex to MMIO
  ARM: dts: qcom: apq8084: switch TCSR mutex to MMIO
  ARM: dts: qcom: msm8660: fix node names for fixed clocks
  ARM: dts: qcom: msm8660: add pxo/cxo clocks to the GCC node
  ARM: dts: qcom: apq8060-dragonboard: Add TMA340 to APQ8060 DragonBoard
  ARM: dts: qcom: msm8660: Add GSBI3 I2C bus
  ARM: dts: qcom: msm8660: Add GSBI1 SPI bus
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aa577af3 5cbd2016

arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include "qcom-msm8226.dtsi"

#include "qcom-pm8226.dtsi"



/delete-node/ &adsp_region;



/ {

	model = "ASUS ZenWatch 2";

	compatible = "asus,sparrow", "qcom,apq8026";
@@ -57,6 +59,10 @@ vreg_wlan: wlan-regulator { 
	};

};



&adsp {

	status = "okay";

};



&blsp1_uart1 {

	status = "okay";

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

+13 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include "qcom-msm8226.dtsi"

#include "qcom-pm8226.dtsi"



/delete-node/ &adsp_region;



/ {

	model = "LG G Watch R";

	compatible = "lg,lenok", "qcom,apq8026";
@@ -23,6 +25,13 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	reserved-memory {

		adsp_region: adsp@3300000 {

			reg = <0x03300000 0x1400000>;

			no-map;

		};

	};



	vreg_wlan: wlan-regulator {

		compatible = "regulator-fixed";
@@ -38,6 +47,10 @@ vreg_wlan: wlan-regulator { 
	};

};



&adsp {

	status = "okay";

};



&blsp1_i2c1 {

	status = "okay";

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

+70 −1
Original line number Diff line number Diff line
@@ -159,6 +159,19 @@ data { 
				};

			};



			dragon_gsbi3_i2c_pins: gsbi3_i2c {

				mux {

					pins = "gpio43", "gpio44";

					function = "gsbi3";

				};

				pinconf {

					pins = "gpio43", "gpio44";

					drive-strength = <8>;

					/* These have external pull-up 2.2kOhm to 1.8V */

					bias-disable;

				};

			};



			dragon_gsbi8_i2c_pins: gsbi8_i2c {

				mux {

					pins = "gpio64", "gpio65";
@@ -240,6 +253,22 @@ irq { 
					bias-pull-up;

				};

			};



			dragon_tma340_gpios: tma340 {

				reset {

					/* RESET line, TS_ATTN, WAKE_CTP */

					pins = "gpio58";

					function = "gpio";

					drive-strength = <6>;

					bias-disable;

				};

				irq {

					pins = "gpio61"; /* IRQ line */

					function = "gpio";

					drive-strength = <2>;

					bias-pull-up;

				};

			};

		};



		qcom,ssbi@500000 {
@@ -444,6 +473,45 @@ led@133 { 
			};

		};



		gsbi@16200000 {

			qcom,mode = <GSBI_PROT_I2C>;

			status = "okay";



			gsbi3_i2c: i2c@16280000 {

				pinctrl-names = "default";

				pinctrl-0 = <&dragon_gsbi3_i2c_pins>;

				status = "okay";



				touchscreen@24 {

					compatible = "cypress,cy8ctma340";

					reg = <0x24>;

					/* Certainly we can do at least 400 kHz */

					clock-frequency = <400000>;

					/* IRQ on GPIO61 called /CTP_INT */

					interrupt-parent = <&tlmm>;

					interrupts = <61 IRQ_TYPE_EDGE_FALLING>;

					/*

					 * The I2C bus is using a PCA9306 level translator from L16A

					 * to L2B so these two voltages are needed and L16A is

					 * kind of the IO voltage, however L16Aisn't really fed to

					 * the TMA340, which relies entirely on L2B (PM8901 L2).

					 */

					vcpin-supply = <&pm8058_l16>;

					vdd-supply = <&pm8901_l2>;

					/* GPIO58, called WAKE_CTP */

					reset-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;

					touchscreen-size-x = <480>;

					touchscreen-size-y = <800>;

					active-interval-ms = <0>;

					touch-timeout-ms = <255>;

					lowpower-interval-ms = <10>;

					bootloader-key = /bits/ 8 <0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07>;

					pinctrl-names = "default";

					pinctrl-0 = <&dragon_tma340_gpios>;

				};

			};

		};



		gsbi@19800000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;
@@ -634,7 +702,8 @@ l1 { 
					bias-pull-down;

				};

				l2 {

					regulator-min-microvolt = <2850000>;

					/* TMA340 requires strictly 3.3V */

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					bias-pull-down;

				};

arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ pci@1b500000 { 
			vdda_refclk-supply = <&v3p3_fixed>;

			pinctrl-0 = <&pcie_pins>;

			pinctrl-names = "default";

			perst-gpio = <&tlmm_pinmux 27 GPIO_ACTIVE_LOW>;

			perst-gpios = <&tlmm_pinmux 27 GPIO_ACTIVE_LOW>;

		};



		amba {

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

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ pci@1b500000 { 
			vdda_refclk-supply = <&ext_3p3v>;

			pinctrl-0 = <&pcie_pins>;

			pinctrl-names = "default";

			perst-gpio = <&tlmm_pinmux 27 GPIO_ACTIVE_LOW>;

			perst-gpios = <&tlmm_pinmux 27 GPIO_ACTIVE_LOW>;

		};



		qcom,ssbi@500000 {