Unverified Commit 3b6d013c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM32 DeviceTree updates for v6.6

GCC and LCC clock controller parent clocks are introduced on MDM9615.

The newly introduced RPM representation is introduced across multiple
platforms.

Voltage ADC channel names are corrected across multiple platforms.

APQ8064 gains a definition for GSBI4.

The XO clock for SDHCI is corrected, as is the USB node name, on
IPQ4019. USB node name is also corrected for SDX55.

The correct PMIC is included on SDX65 MTP.

The incorrect spi-max-frequency property is removed from controllers on
IPQ8064 and MSM8960.

OCMEM and the display subsystem are added to MSM8226.

Reset line is added to the PM8941 and the APQ8074 Dragonboard, while a
few properties of the Sony Xperia Z2 Tablet touchscreen are corrected.

* tag 'qcom-dts-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: apq8064: add support to gsbi4 uart
  ARM: dts: qcom: sdx65-mtp: Update the pmic used in sdx65
  ARM: dts: qcom: ipq4019: correct SDHCI XO clock
  ARM: dts: qcom: Use labels with generic node names for ADC channels
  ARM: dts: qcom-mdm9615: specify gcc clocks
  ARM: dts: qcom-mdm9615: specify clocks for the lcc device
  ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode
  ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names
  ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen
  ARM: dts: qcom: apq8064: Drop redundant /smd node
  ARM: dts: qcom: Add rpm-proc node for SMD platforms
  ARM: dts: qcom: apq8074-dragonboard: add resin
  ARM: dts: qcom-pm8941: add resin support
  ARM: dts: qcom: minor whitespace cleanup around '='
  ARM: dts: qcom: msm8960: drop spi-max-frequency from controller
  ARM: dts: qcom: ipq8064: drop spi-max-frequency from controller
  ARM: dts: qcom: sdx55: use generic node names for USB
  ARM: dts: qcom: ipq4019: use generic node names for USB
  ARM: dts: qcom: msm8226: Add ocmem
  ARM: dts: qcom: msm8226: Add mdss nodes

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 59486969 3cfa5569

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

+16 −0
Original line number Diff line number Diff line
@@ -233,6 +233,22 @@ 
		};

	};



	gsbi4_uart_pin_a: gsbi4-uart-pin-active-state {

		rx-pins {

			pins = "gpio11";

			function = "gsbi4";

			drive-strength = <2>;

			bias-disable;

		};



		tx-pins {

			pins = "gpio10";

			function = "gsbi4";

			drive-strength = <4>;

			bias-disable;

		};

	};



	gsbi6_uart_2pins: gsbi6_uart_2pins {

		mux {

			pins = "gpio14", "gpio15";

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

+12 −40
Original line number Diff line number Diff line
@@ -226,46 +226,6 @@ 
		hwlocks = <&sfpb_mutex 3>;

	};



	smd {

		compatible = "qcom,smd";



		modem-edge {

			interrupts = <0 37 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&l2cc 8 3>;

			qcom,smd-edge = <0>;



			status = "disabled";

		};



		q6-edge {

			interrupts = <0 90 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&l2cc 8 15>;

			qcom,smd-edge = <1>;



			status = "disabled";

		};



		dsps-edge {

			interrupts = <0 138 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&sps_sic_non_secure 0x4080 0>;

			qcom,smd-edge = <3>;



			status = "disabled";

		};



		riva-edge {

			interrupts = <0 198 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&l2cc 8 25>;

			qcom,smd-edge = <6>;



			status = "disabled";

		};

	};



	smsm {

		compatible = "qcom,smsm";
@@ -555,6 +515,18 @@ 
			#size-cells = <1>;

			ranges;



			gsbi4_serial: serial@16340000 {

				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";

				reg = <0x16340000 0x100>,

				      <0x16300000 0x3>;

				interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;

				pinctrl-0 = <&gsbi4_uart_pin_a>;

				pinctrl-names = "default";

				clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;

				clock-names = "core", "iface";

				status = "disabled";

			};



			gsbi4_i2c: i2c@16380000 {

				compatible = "qcom,i2c-qup-v1.1.1";

				pinctrl-0 = <&i2c4_pins>;

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

+5 −0
Original line number Diff line number Diff line
@@ -156,6 +156,11 @@ 
	};

};



&pm8941_resin {

	linux,code = <KEY_VOLUMEDOWN>;

	status = "okay";

};



&pm8941_wled {

	qcom,cs-out;

	qcom,switching-freq = <3200>;

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

+3 −3
Original line number Diff line number Diff line
@@ -784,10 +784,10 @@ 
		};

	};



	smd {

		compatible = "qcom,smd";

	rpm: remoteproc {

		compatible = "qcom,apq8084-rpm-proc", "qcom,rpm-proc";



		rpm {

		smd-edge {

			interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;

			qcom,ipc = <&apcs 8 0>;

			qcom,smd-edge = <15>;

arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -262,11 +262,12 @@ 
&usb3 {

	status = "okay";



	dwc3@8a00000 {

	};



&usb3_dwc {

	phys = <&usb3_hs_phy>;

	phy-names = "usb2-phy";

};

};



&usb2_hs_phy {

	status = "okay";