Unverified Commit 9271fccb authored Oct 26, 2021 by Arnd Bergmann

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

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

Qualcomm DTS more changes for v5.16

The multi-purpose-pin (MPP) driver is finally migrated to use
hierarchical IRQ domains, so this bring the associated changes.

The remainder of the changes are correcting binding issues, primarily
found through DT validation.

* tag 'qcom-dts-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (26 commits)
  ARM: dts: qcom: fix typo in IPQ8064 thermal-sensor node
  ARM: dts: qcom: fix thermal zones naming
  ARM: dts: qcom: fix flash node naming for RB3011
  ARM: dts: qcom: correct mmc node naming
  ARM: dts: qcom: fix memory and mdio nodes naming for RB3011
  dt-bindings: arm: qcom: Fix Nexus 4 vendor prefix
  ARM: dts: ipq4019-ap.dk01.1-c1: add device compatible in the dts
  dt-bindings: arm: qcom-ipq4019: add missing device compatible
  ARM: dts: qcom: apq8026-lg-lenok: rename board vendor
  dt-bindings: arm: qcom: rename vendor of apq8026-lenok
  ARM: dts: qcom: sdx55: Drop '#clock-cells' from QMP PHY node
  ARM: dts: qcom: mdm9615: fix memory node for Sierra Wireless WP8548
  ARM: dts: qcom-pma8084: add interrupt controller properties
  ARM: dts: qcom-pm8941: add interrupt controller properties
  ARM: dts: qcom-pm8841: add interrupt controller properties
  ARM: dts: qcom-msm8660: add interrupt controller properties
  ARM: dts: qcom-mdm9615: add interrupt controller properties
  ARM: dts: qcom-apq8064: add interrupt controller properties
  ARM: dts: qcom-apq8060-dragonboard: fix mpps state names
  ARM: dts: qcom-mdm9615: add gpio-ranges to mpps node, fix its name
  ...

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


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents f253fb36 036e6c9f

Documentation/devicetree/bindings/arm/qcom.yaml

+3 −2

Original line number	Diff line number	Diff line
		@@ -96,13 +96,13 @@ properties:

		- items:
		- enum:
		- lge,lenok
		- lg,lenok
		- const: qcom,apq8026

		- items:
		- enum:
		- asus,nexus4-mako
		- asus,nexus7-flo
		- lg,nexus4-mako
		- sony,xperia-yuga
		- qcom,apq8064-cm-qs600
		- qcom,apq8064-ifc6410
		@@ -174,6 +174,7 @@ properties:

		- items:
		- enum:
		- qcom,ipq4019-ap-dk01.1-c1
		- qcom,ipq4019-ap-dk04.1-c3
		- qcom,ipq4019-ap-dk07.1-c1
		- qcom,ipq4019-ap-dk07.1-c2

arch/arm/boot/dts/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -954,7 +954,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-apq8026-lg-lenok.dtb \
		qcom-apq8060-dragonboard.dtb \
		qcom-apq8064-cm-qs600.dtb \
		qcom-apq8064-ifc6410.dtb \

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@

		/ {
		model = "LG G Watch R";
		compatible = "lge,lenok", "qcom,apq8026";
		compatible = "lg,lenok", "qcom,apq8026";
		qcom,board-id = <132 0x0a>;
		qcom,msm-id = <199 0x20000>;

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -357,8 +357,8 @@
		};

		mpps@50 {
		dragon_cm3605_mpps: cm3605-mpps {
		pinconf {
		dragon_cm3605_mpps: cm3605-mpps-state {
		mpp5 {
		pins = "mpp5";
		function = "analog";
		input-enable;
		@@ -899,7 +899,7 @@
		};
		amba {
		/* Internal 3.69 GiB eMMC */
		sdcc@12400000 {
		mmc@12400000 {
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&dragon_sdcc1_pins>;
		@@ -908,7 +908,7 @@
		};

		/* External micro SD card, directly connected, pulled up to 2.85 V */
		sdcc@12180000 {
		mmc@12180000 {
		status = "okay";
		/* Enable SSBI GPIO 22 as input, use for card detect */
		pinctrl-names = "default";
		@@ -922,7 +922,7 @@
		* Second external micro SD card, using two TXB104RGYR levelshifters
		* to lift from 1.8 V to 2.85 V
		*/
		sdcc@12200000 {
		mmc@12200000 {
		status = "okay";
		/* Enable SSBI GPIO 26 as input, use for card detect */
		pinctrl-names = "default";

arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@

		amba {
		/* eMMC */
		sdcc@12400000 {
		mmc@12400000 {
		status = "okay";
		vmmc-supply = <&pm8921_l5>;
		vqmmc-supply = <&pm8921_s4>;