Unverified Commit 4c946669 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM DT updates for v5.19

This contains a long overdue overhaul of the MSM8974 DeviceTrees,
aligning the style, structure and naming with what we've learned since
the introduction of this platform.

On top of this the Sony Rhine platform gained I2C masters, NFC and
pstore support and the Fairphone 2 gained touchscreen support.

For the new SDX65 platform reserved-memory nodes, rpmpd, SPMI, CPU
clocks, SDHCI controller, SMMU and TCSR mutex was added. As was the
initial DeviceTree for the related PMX65 PMIC.

MSM8226 gained VADC and RTC support and support for the ASUS ZenWatch 2
was added.

* tag 'qcom-dts-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (62 commits)
  ARM: dts: qcom: msm8974-FP2: Add supplies for remoteprocs
  ARM: dts: qcom: msm8974-FP2: Configure charger
  ARM: dts: qcom: msm8974-FP2: Add support for touchscreen
  ARM: dts: qcom: sdx55: Remove ipa interconnect node
  ARM: dts: qcom: msm8974: Add missing license headers
  ARM: dts: qcom: msm8974-FP2: Add mmc* aliases
  ARM: dts: qcom: msm8974-FP2: We're msm8974pro
  ARM: dts: qcom-msm8974*: Remove unnecessary include
  ARM: dts: qcom-msm8974-rhine: Add pstore node
  ARM: dts: qcom-msm8974-rhine: Add NFC and enable I2C hosts
  ARM: dts: qcom-msm8974*: Clean up old GPIO declarations
  ARM: dts: qcom-msm8974*: Consolidate I2C/UART/SDHCI
  ARM: dts: qcom-msm8974*: Enable IMEM unconditionally
  ARM: dts: qcom-msm8974: Sort and clean up nodes
  ARM: dts: qcom-msm8974: Convert ADSP to a MMIO device
  ARM: dts: qcom-msm8974pro-*: Use the 8974pro name in DT filenames
  ARM: dts: qcom-msm8974pro: Use &labels
  ARM: dts: qcom-msm8974-castor: Use &labels
  ARM: dts: qcom-msm8974-{"hon","am"}ami: Commonize and modernize the DTs
  ARM: dts: qcom-msm8974-klte: Use &labels
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 41f0bbd6 fb5e339f

Documentation/devicetree/bindings/arm/qcom.yaml

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ properties: 


      - items:

          - enum:

              - asus,sparrow

              - lg,lenok

          - const: qcom,apq8026

arch/arm/boot/dts/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -981,11 +981,12 @@ dtb-$(CONFIG_ARCH_OXNAS) += \ 
	ox820-cloudengines-pogoplug-series-3.dtb

dtb-$(CONFIG_ARCH_QCOM) += \

	qcom-apq8016-sbc.dtb \

	qcom-apq8026-asus-sparrow.dtb \

	qcom-apq8026-lg-lenok.dtb \

	qcom-apq8060-dragonboard.dtb \

	qcom-apq8064-cm-qs600.dtb \

	qcom-apq8064-ifc6410.dtb \

	qcom-apq8064-sony-xperia-yuga.dtb \

	qcom-apq8064-sony-xperia-lagan-yuga.dtb \

	qcom-apq8064-asus-nexus7-flo.dtb \

	qcom-apq8074-dragonboard.dtb \

	qcom-apq8084-ifc6540.dtb \
@@ -1004,12 +1005,12 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-msm8660-surf.dtb \

	qcom-msm8916-samsung-serranove.dtb \

	qcom-msm8960-cdp.dtb \

	qcom-msm8974-fairphone-fp2.dtb \

	qcom-msm8974-lge-nexus5-hammerhead.dtb \

	qcom-msm8974-samsung-klte.dtb \

	qcom-msm8974-sony-xperia-amami.dtb \

	qcom-msm8974-sony-xperia-castor.dtb \

	qcom-msm8974-sony-xperia-honami.dtb \

	qcom-msm8974-sony-xperia-rhine-amami.dtb \

	qcom-msm8974-sony-xperia-rhine-honami.dtb \

	qcom-msm8974pro-fairphone-fp2.dtb \

	qcom-msm8974pro-samsung-klte.dtb \

	qcom-msm8974pro-sony-xperia-shinano-castor.dtb \

	qcom-mdm9615-wp8548-mangoh-green.dtb \

	qcom-sdx55-mtp.dtb \

	qcom-sdx55-t55.dtb \

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

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

/*

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

 */



/dts-v1/;



#include "qcom-msm8226.dtsi"

#include "qcom-pm8226.dtsi"



/ {

	model = "ASUS ZenWatch 2";

	compatible = "asus,sparrow", "qcom,apq8026";

	chassis-type = "watch";

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

	qcom,board-id = <8 3005>;



	reserved-memory {

		sbl_region: sbl@2f00000 {

			reg = <0x02f00000 0x100000>;

			no-map;

		};

		external_image_region: external-image@3100000 {

			reg = <0x3100000 0x200000>;

			no-map;

		};

		peripheral_region: peripheral@3300000 {

			reg = <0x3300000 0x600000>;

			no-map;

		};

		adsp_region: adsp@3900000 {

			reg = <0x3900000 0x1400000>;

			no-map;

		};

		modem_region: modem@4d00000 {

			reg = <0x4d00000 0x1b00000>;

			no-map;

		};

		modem_efs_region: modem-efs@7f00000 {

			reg = <0x7f00000 0x100000>;

			no-map;

		};

	};



	vreg_wlan: wlan-regulator {

		compatible = "regulator-fixed";



		regulator-name = "wl-reg";

		regulator-min-microvolt = <2950000>;

		regulator-max-microvolt = <2950000>;



		gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;

		enable-active-high;



		pinctrl-names = "default";

		pinctrl-0 = <&wlan_regulator_default_state>;

	};

};



&blsp1_uart1 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&blsp1_uart1_default_state>;



	bluetooth {

		compatible = "brcm,bcm43430a1-bt";

		max-speed = <3000000>;



		pinctrl-names = "default";

		pinctrl-0 = <&bluetooth_default_state>;



		host-wakeup-gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;

		device-wakeup-gpios = <&tlmm 61 GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;

	};

};



&pm8226_vib {

	status = "okay";

};



&rpm_requests {

	pm8226-regulators {

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



		pm8226_s3: s3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1300000>;

		};

		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 = <1900000>;

			regulator-max-microvolt = <1900000>;

		};

		pm8226_l8: l8 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		pm8226_l9: l9 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		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 = <3000000>;

			regulator-max-microvolt = <3000000>;

		};

		pm8226_l16: l16 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

		};

		pm8226_l17: l17 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;

		};

		pm8226_l18: l18 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;

		};

		pm8226_l19: l19 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2850000>;

		};

		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 = <2950000>;

		};

		pm8226_l23: l23 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};

		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 = <1800000>;

			regulator-max-microvolt = <2950000>;

		};



		pm8226_lvs1: lvs1 {};

	};

};



&sdhc_1 {

	status = "okay";



	vmmc-supply = <&pm8226_l17>;

	vqmmc-supply = <&pm8226_l6>;



	bus-width = <8>;

	non-removable;

};



&sdhc_3 {

	status = "okay";



	max-frequency = <100000000>;

	non-removable;



	vmmc-supply = <&vreg_wlan>;

	vqmmc-supply = <&pm8226_l6>;



	#address-cells = <1>;

	#size-cells = <0>;



	wifi@1 {

		compatible = "brcm,bcm43430a1-fmac", "brcm,bcm4329-fmac";

		reg = <1>;



		interrupts-extended = <&tlmm 46 IRQ_TYPE_EDGE_FALLING>;

		interrupt-names = "host-wake";



		pinctrl-names = "default";

		pinctrl-0 = <&wlan_hostwake_default_state>;

	};

};



&smbb {

	qcom,fast-charge-safe-current = <1500000>;

	qcom,fast-charge-current-limit = <350000>;

	qcom,fast-charge-safe-voltage = <4430000>;

	qcom,fast-charge-high-threshold-voltage = <4400000>;

	qcom,auto-recharge-threshold-voltage = <4300000>;

	qcom,minimum-input-voltage = <4400000>;

};



&tlmm {

	blsp1_uart1_default_state: blsp1-uart1-default-state {

		pins = "gpio0", "gpio1", "gpio2", "gpio3";

		function = "blsp_uart1";

		drive-strength = <8>;

		bias-disable;

	};



	bluetooth_default_state: bluetooth-default-state {

		pins = "gpio48", "gpio61";

		function = "gpio";

		drive-strength = <8>;

		bias-disable;

		input-enable;

	};



	wlan_hostwake_default_state: wlan-hostwake-default-state {

		pins = "gpio46";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

		input-enable;

	};



	wlan_regulator_default_state: wlan-regulator-default-state {

		pins = "gpio35";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-up;

	};

};



&usb {

	status = "okay";

	extcon = <&smbb>;

	dr_mode = "peripheral";

};



&usb_hs_phy {

	extcon = <&smbb>;

	v1p8-supply = <&pm8226_l10>;

	v3p3-supply = <&pm8226_l20>;

};

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

+8 −8
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ 
	smd {

		compatible = "qcom,smd";



		modem@0 {

		modem-edge {

			interrupts = <0 37 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&l2cc 8 3>;
@@ -236,7 +236,7 @@ 
			status = "disabled";

		};



		q6@1 {

		q6-edge {

			interrupts = <0 90 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&l2cc 8 15>;
@@ -245,7 +245,7 @@ 
			status = "disabled";

		};



		dsps@3 {

		dsps-edge {

			interrupts = <0 138 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&sps_sic_non_secure 0x4080 0>;
@@ -254,7 +254,7 @@ 
			status = "disabled";

		};



		riva@6 {

		riva-edge {

			interrupts = <0 198 IRQ_TYPE_EDGE_RISING>;



			qcom,ipc = <&l2cc 8 25>;
@@ -1040,7 +1040,7 @@ 
		};



		/* Temporary fixed regulator */

		sdcc1bam:dma@12402000{

		sdcc1bam: dma-controller@12402000{

			compatible = "qcom,bam-v1.3.0";

			reg = <0x12402000 0x8000>;

			interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1050,7 +1050,7 @@ 
			qcom,ee = <0>;

		};



		sdcc3bam:dma@12182000{

		sdcc3bam: dma-controller@12182000{

			compatible = "qcom,bam-v1.3.0";

			reg = <0x12182000 0x8000>;

			interrupts = <0 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -1060,7 +1060,7 @@ 
			qcom,ee = <0>;

		};



		sdcc4bam:dma@121c2000{

		sdcc4bam: dma-controller@121c2000{

			compatible = "qcom,bam-v1.3.0";

			reg = <0x121c2000 0x8000>;

			interrupts = <0 95 IRQ_TYPE_LEVEL_HIGH>;
@@ -1548,7 +1548,7 @@ 


					qcom,mmio = <&riva>;



					bt {

					bluetooth {

						compatible = "qcom,wcnss-bt";

					};