Unverified Commit 40c13296 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm dts updates for v5.18

The MSM8226 platform gains description of USB, SoC power-domains,
PMIC multi-purpose pins, SPMI regulators, the smbb battery charger and
the LG G Watch R, on this platform, gains description of Bluetooth,
WiFI, fuel gauge, SMBB battery charger and USB.

DeviceTree validation issues in APQ8060, APQ8064, MDM9615, MSM8960,
IPQ4019 and SDX55 are corrected.

* tag 'qcom-dts-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (27 commits)
  ARM: dts: qcom: msm8226: add power domains
  ARM: dts: qcom: apq8026-lg-lenok: Add Bluetooth
  ARM: dts: qcom: apq8026-lg-lenok: Add Wifi
  ARM: dts: qcom: msm8226: Add pinctrl for sdhci nodes
  ARM: dts: qcom: sdx55: Fix the address used for PCIe EP local addr space
  ARM: dts: qcom: apq8060-dragonboard: fix typo in eMMC
  ARM: dts: qcom: pm8226: Add node for the MPP
  ARM: dts: qcom: fill missing power-domain-cells for gcc controllers
  ARM: dts: qcom: msm8960: move vsdcc regulator out of simple-bus
  ARM: dts: qcom: add KPSS GCC compatible to clock nodes
  ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
  ARM: dts: qcom: rename eth node to ethernet
  ARM: dts: qcom: apq8060: correct mvs switch name
  ARM: dts: qcom: nexus7: remove vcss supply which never existed
  ARM: dts: qcom: apq8064: adjust dsi node name to match dt-schema
  ARM: dts: qcom: apq8064: make pci regs property dt-schema compliant
  ARM: dts: qcom: apq8064: correct ranges values
  ARM: dts: qcom: ipq4019: fix sleep clock
  ARM: dts: qcom: pm8226: Support SPMI regulators on PMIC sid 1
  ARM: dts: qcom: pm8226: Add vibration motor node
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d2717584 13455362

Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ PROPERTIES 
                following:



                        "qcom,usb-hs-phy-apq8064"

                        "qcom,usb-hs-phy-msm8226"

                        "qcom,usb-hs-phy-msm8916"

                        "qcom,usb-hs-phy-msm8974"

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

+115 −17
Original line number Diff line number Diff line
@@ -16,11 +16,35 @@ / { 


	aliases {

		serial0 = &blsp1_uart3;

		serial1 = &blsp1_uart4;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	vreg_wlan: wlan-regulator {

		compatible = "regulator-fixed";



		regulator-name = "wl-reg";

		regulator-min-microvolt = <2950000>;

		regulator-max-microvolt = <2950000>;



		gpio = <&tlmm 46 GPIO_ACTIVE_HIGH>;

		enable-active-high;



		pinctrl-names = "default";

		pinctrl-0 = <&wlan_regulator_default_state>;

	};

};



&blsp1_i2c1 {

	status = "okay";



	fuel-gauge@55 {

		compatible = "ti,bq27421";

		reg = <0x55>;

	};

};



&blsp1_i2c5 {
@@ -57,14 +81,30 @@ &blsp1_uart3 { 
	status = "okay";

};



&blsp1_uart4 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&blsp1_uart4_default_state>;



	bluetooth {

		compatible = "brcm,bcm43430a0-bt";



		max-speed = <3000000>;



		pinctrl-names = "default";

		pinctrl-0 = <&bluetooth_default_state>;



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

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

		shutdown-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;

	};

};



&rpm_requests {

	pm8226-regulators {

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



		pm8226_s1: s1 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1275000>;

		};

		pm8226_s3: s3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1350000>;
@@ -195,24 +235,55 @@ &sdhc_1 { 


	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,bcm43430a0-fmac", "brcm,bcm4329-fmac";

		reg = <1>;



		interrupts-extended = <&tlmm 37 IRQ_TYPE_EDGE_FALLING>;

		interrupt-names = "host-wake";



		pinctrl-names = "default";

	pinctrl-0 = <&sdhc1_pin_a>;

		pinctrl-0 = <&wlan_hostwake_default_state>;

	};

};



&smbb {

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

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

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

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

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

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

};



&tlmm {

	sdhc1_pin_a: sdhc1-pin-active {

		clk {

			pins = "sdc1_clk";

			drive-strength = <10>;

	blsp1_uart4_default_state: blsp1-uart4-default-state {

		pins = "gpio12", "gpio13", "gpio14", "gpio15";

		function = "blsp_uart4";

		drive-strength = <8>;

		bias-disable;

	};



		cmd-data {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <10>;

			bias-pull-up;

		};

	bluetooth_default_state: bluetooth-default-state {

		pins = "gpio47", "gpio48";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

		input-enable;

	};



	touch_pins: touch {
@@ -234,4 +305,31 @@ reset { 
			output-high;

		};

	};



	wlan_hostwake_default_state: wlan-hostwake-default-state {

		pins = "gpio37";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

		input-enable;

	};



	wlan_regulator_default_state: wlan-regulator-default-state {

		pins = "gpio46";

		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-apq8060-dragonboard.dts

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ cm3605 { 


	soc {

		pinctrl@800000 {

			/* eMMMC pins, all 8 data lines connected */

			/* eMMC pins, all 8 data lines connected */

			dragon_sdcc1_pins: sdcc1 {

				mux {

					pins = "gpio159", "gpio160", "gpio161",
@@ -674,14 +674,14 @@ s4 { 
					bias-pull-down;

				};



				/* LVS0 thru 3 and mvs0 are just switches */

				/* LVS0 thru 3 and mvs are just switches */

				lvs0 {

					regulator-always-on;

				};

				lvs1 { };

				lvs2 { };

				lvs3 { };

				mvs0 {};

				mvs { };



			};

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

+1 −2
Original line number Diff line number Diff line
@@ -212,13 +212,12 @@ mdp_dsi1_out: endpoint { 
			};

		};



		dsi0: mdss_dsi@4700000 {

		dsi0: dsi@4700000 {

			status = "okay";

			vdda-supply = <&pm8921_l2>;/*VDD_MIPI1 to 4*/

			vdd-supply = <&pm8921_l8>;

			vddio-supply = <&pm8921_lvs7>;

			avdd-supply = <&pm8921_l11>;

			vcss-supply = <&ext_3p3v>;



			panel@0 {

				reg = <0>;

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

+11 −8
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ gcc: clock-controller@900000 { 
			nvmem-cells = <&tsens_calib>, <&tsens_backup>;

			nvmem-cell-names = "calib", "calib_backup";

			#clock-cells = <1>;

			#power-domain-cells = <1>;

			#reset-cells = <1>;

			#thermal-sensor-cells = <1>;

		};
@@ -830,11 +831,12 @@ mmcc: clock-controller@4000000 { 
			compatible = "qcom,mmcc-apq8064";

			reg = <0x4000000 0x1000>;

			#clock-cells = <1>;

			#power-domain-cells = <1>;

			#reset-cells = <1>;

		};



		l2cc: clock-controller@2011000 {

			compatible	= "syscon";

			compatible	= "qcom,kpss-gcc", "syscon";

			reg		= <0x2011000 0x1000>;

		};
@@ -1238,7 +1240,7 @@ mmss_sfpb: syscon@5700000 { 
			reg = <0x5700000 0x70>;

		};



		dsi0: mdss_dsi@4700000 {

		dsi0: dsi@4700000 {

			compatible = "qcom,mdss-dsi-ctrl";

			label = "MDSS DSI CTRL->0";

			#address-cells = <1>;
@@ -1268,6 +1270,7 @@ dsi0: mdss_dsi@4700000 { 
						<&dsi0_phy 1>;

			syscon-sfpb = <&mmss_sfpb>;

			phys = <&dsi0_phy>;

			phy-names = "dsi";

			ports {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1368,10 +1371,10 @@ gfx3d1: iommu@7d00000 { 


		pcie: pci@1b500000 {

			compatible = "qcom,pcie-apq8064", "snps,dw-pcie";

			reg = <0x1b500000 0x1000

			       0x1b502000 0x80

			       0x1b600000 0x100

			       0x0ff00000 0x100000>;

			reg = <0x1b500000 0x1000>,

			      <0x1b502000 0x80>,

			      <0x1b600000 0x100>,

			      <0x0ff00000 0x100000>;

			reg-names = "dbi", "elbi", "parf", "config";

			device_type = "pci";

			linux,pci-domain = <0>;
@@ -1379,8 +1382,8 @@ pcie: pci@1b500000 { 
			num-lanes = <1>;

			#address-cells = <3>;

			#size-cells = <2>;

			ranges = <0x81000000 0 0 0x0fe00000 0 0x00100000   /* I/O */

				  0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* memory */

			ranges = <0x81000000 0 0          0x0fe00000 0 0x00100000>, /* I/O */

				 <0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* mem */

			interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "msi";

			#interrupt-cells = <1>;