Unverified Commit 6db92533 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM32 DeviceTree updates for v6.5

NAND support on IPQ4019 boards is restored, after a faulty node rename.

On MSM8226 IMEM, PMU and RPM stats are introduced. The Huawei Watch
gains vibrator support.

On MSM8974, the LGE Nexus 5 gains vibrator support. The APQ8074
Dragonboard marks BLSP2 BAM controlled remotely, DSI panel, audio and
modem DSPs are enabled.

On SDX65 PCIe controller and PHY are introduced, to provide endpoint
functionality. This is enabled on the related MTP.

A range of DeviceTree cleanups are also included.

* tag 'qcom-dts-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (27 commits)
  ARM: dts: qcom: apq8074-dragonboard: enable DSI panel
  ARM: dts: qcom: apq8074-dragonboard: enable adsp and MSS
  ARM: dts: qcom: apq8074-dragonboard: Set DMA as remotely controlled
  ARM: dts: qcom: apq8026-huawei-sturgeon: Add vibrator
  ARM: dts: qcom: msm8226: Add IMEM node
  ARM: dts: qcom: msm8226: Add rpm-stats device node
  ARM: dts: qcom: msm8226: Add PMU node
  ARM: dts: qcom: sdx65-mtp: Enable PCIe EP
  ARM: dts: qcom: sdx65-mtp: Enable PCIe PHY
  ARM: dts: qcom: sdx65: Add support for PCIe EP
  ARM: dts: qcom: sdx65: Add support for PCIe PHY
  ARM: dts: qcom: msm8974: align WCNSS Bluetooth node name with bindings
  ARM: dts: qcom: apq8084: correct thermal sensor unit-address
  ARM: dts: qcom: msm8960-cdp: move regulator out of simple-bus
  ARM: dts: qcom: apq8060-dragonboard: move regulators out of simple-bus
  ARM: dts: qcom: ipq8064: align USB node names with bindings
  ARM: dts: qcom: ipq8064: correct LED node names
  ARM: dts: qcom: ipq8064: drop invalid GCC thermal-sensor unit-address
  ARM: dts: qcom: ipq8064: drop leading 0 from unit-address
  ARM: dts: qcom: msm8974: correct pronto unit-address
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 60c2f542 925bac3c

arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts

+28 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include "qcom-msm8226.dtsi"

#include "qcom-pm8226.dtsi"

#include <dt-bindings/input/ti-drv260x.h>



/delete-node/ &adsp_region;
@@ -68,6 +69,26 @@ 
	status = "okay";

};



&blsp1_i2c2 {

	clock-frequency = <384000>;



	status = "okay";



	vibrator@5a {

		compatible = "ti,drv2605";

		reg = <0x5a>;

		enable-gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;



		mode = <DRV260X_ERM_MODE>;

		library-sel = <DRV260X_ERM_LIB_D>;

		vib-rated-mv = <2765>;

		vib-overdrive-mv = <3525>;



		pinctrl-0 = <&vibrator_default_state>;

		pinctrl-names = "default";

	};

};



&blsp1_i2c5 {

	clock-frequency = <384000>;
@@ -347,6 +368,13 @@ 
		};

	};



	vibrator_default_state: vibrator-default-state {

		pins = "gpio59", "gpio60";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-down;

	};



	wlan_hostwake_default_state: wlan-hostwake-default-state {

		pins = "gpio66";

		function = "gpio";

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

+40 −44
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
		stdout-path = "serial0:115200n8";

	};



	regulators {

		compatible = "simple-bus";



	/* Main power of the board: 3.7V */

	vph: regulator-fixed {

		compatible = "regulator-fixed";
@@ -62,7 +59,6 @@ 
		vin-supply = <&pm8058_l14>;

		regulator-always-on;

	};

	};



	/*

	 * Capella CM3605 light and proximity sensor mounted directly
@@ -451,7 +447,7 @@ 
	 * PM8901 supplies "preliminary regulators" whatever

	 * that means

	 */

	pm8901-regulators {

	regulators-0 {

		vdd_l0-supply = <&pm8901_s4>;

		vdd_l1-supply = <&vph>;

		vdd_l2-supply = <&vph>;
@@ -537,7 +533,7 @@ 


	};



	pm8058-regulators {

	regulators-1 {

		vdd_l0_l1_lvs-supply = <&pm8058_s3>;

		vdd_l2_l11_l12-supply = <&vph>;

		vdd_l3_l4_l5-supply = <&vph>;

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

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

#include "qcom-pm8941.dtsi"



/delete-node/ &mpss_region;



/ {

	model = "Qualcomm APQ8074 Dragonboard";

	compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
@@ -17,12 +19,23 @@ 
	chosen {

		stdout-path = "serial0:115200n8";

	};



	reserved-memory {

		mpss_region: mpss@ac00000 {

			reg = <0x0ac00000 0x2500000>;

			no-map;

		};

	};

};



&blsp1_uart2 {

	status = "okay";

};



&blsp2_dma {

	qcom,controlled-remotely;

};



&blsp2_i2c5 {

	status = "okay";

	clock-frequency = <200000>;
@@ -35,6 +48,76 @@ 
	};

};



&dsi0 {

	vdda-supply = <&pm8941_l2>;

	vdd-supply = <&pm8941_l22>;

	vddio-supply = <&pm8941_l12>;



	status = "okay";



	panel: panel@0 {

		compatible = "sharp,ls043t1le01-qhd";

		reg = <0>;



		avdd-supply = <&pm8941_l22>;

		backlight = <&pm8941_wled>;

		reset-gpios = <&pm8941_gpios 19 GPIO_ACTIVE_HIGH>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&dsi0_out>;

			};

		};

	};

};



&dsi0_out {

	remote-endpoint = <&panel_in>;

	data-lanes = <0 1 2 3>;

};



&dsi0_phy {

	status = "okay";



	vddio-supply = <&pm8941_l12>;

};



&gpu {

	status = "okay";

};



&mdss {

	status = "okay";

};



&pm8941_wled {

	qcom,cs-out;

	qcom,switching-freq = <3200>;

	qcom,ovp = <32>;

	qcom,num-strings = <1>;



	status = "okay";

};



&remoteproc_adsp {

	cx-supply = <&pm8841_s2>;



	firmware-name = "qcom/apq8074/adsp.mbn";



	status = "okay";

};



&remoteproc_mss {

	cx-supply = <&pm8841_s2>;

	mss-supply = <&pm8841_s3>;

	mx-supply = <&pm8841_s1>;

	pll-supply = <&pm8941_l12>;



	firmware-name = "qcom/apq8074/mba.mbn", "qcom/apq8074/modem.mbn";



	status = "okay";

};



&rpm_requests {

	regulators-0 {

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

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

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

		};



		tsens: thermal-sensor@fc4a8000 {

		tsens: thermal-sensor@fc4a9000 {

			compatible = "qcom,msm8974-tsens", "qcom,tsens-v0_1";

			reg = <0xfc4a9000 0x1000>, /* TM */

			      <0xfc4a8000 0x1000>; /* SROT */

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

+4 −4
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
		dma-controller@7984000 {

			status = "okay";

		};



		qpic-nand@79b0000 {

			status = "okay";

	};

};



&nand {

	status = "okay";

};