Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0258b15d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-dt-for-4.2' of... 

Merge tag 'qcom-dt-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt

Merge "Qualcomm ARM Based Device Tree Updates for v4.2" from Kumar Gala:

* Added support for regulators, USB Host & OTG, SATA, and i2c
  controllers on APQ8064 based platforms
* Added PM8841/PM8941/PMA8084 device nodes
* Added PMU support on MSM8660

* tag 'qcom-dt-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: Add msm8660 PMU node
  ARM: dts: qcom: Add PMA8084 functions device nodes
  ARM: dts: qcom: Add PM8941 functions device nodes
  ARM: dts: qcom: Add PM8841 functions device nodes
  ARM: dts: qcom: apq8064 - add i2c3 node for panel.
  ARM: dts: qcom: apq8064 - Move i2c1 pinctrl to apq8064.dtsi
  ARM: dts: qcom: apq8064-ifc6410 - Add DT alias for serial port
  ARM: dts: qcom: apq8064 - Add USB OTG support for CM QS-600
  ARM: dts: qcom: apq8064 - Add usb host support to CM QS-600
  ARM: dts: qcom: apq8064-cm-qs600 - Add basic regulators
  ARM: dts: qcom: apq8064 - Add SATA controller support
  ARM: dts: qcom: apq8064 - Add USB OTG support
  ARM: dts: qcom: apq8064 - Add usb host support.
  ARM: dts: qcom: apq8064-ifc6410 - Add basic regulators
  ARM: dts: qcom: apq8064 - add RPM regulators support
parents 542459e7 b73b3157

arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

+100 −0
Original line number Diff line number Diff line
@@ -14,6 +14,67 @@ 
			};

		};



		rpm@108000 {

			regulators {

				vin_lvs1_3_6-supply = <&pm8921_s4>;

				vin_lvs2-supply = <&pm8921_s1>;

				vin_lvs4_5_7-supply = <&pm8921_s4>;



				vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;

				vdd_l24-supply = <&pm8921_s1>;

				vdd_l25-supply = <&pm8921_s1>;

				vdd_l26-supply = <&pm8921_s7>;

				vdd_l27-supply = <&pm8921_s7>;

				vdd_l28-supply = <&pm8921_s7>;





				/* Buck SMPS */

				pm8921_s1: s1 {

					regulator-always-on;

					regulator-min-microvolt = <1225000>;

					regulator-max-microvolt = <1225000>;

					qcom,switch-mode-frequency = <3200000>;

					bias-pull-down;

				};



				pm8921_s3: s3 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1400000>;

					qcom,switch-mode-frequency = <4800000>;

				};



				pm8921_s4: s4 {

					regulator-min-microvolt	= <1800000>;

					regulator-max-microvolt	= <1800000>;

					qcom,switch-mode-frequency = <3200000>;

				};



				pm8921_s7: s7 {

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

					qcom,switch-mode-frequency = <3200000>;

				};



				pm8921_l3: l3 {

					regulator-min-microvolt = <3050000>;

					regulator-max-microvolt = <3300000>;

					bias-pull-down;

				};



				pm8921_l4: l4 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1800000>;

					bias-pull-down;

				};



				pm8921_l23: l23 {

					regulator-min-microvolt = <1700000>;

					regulator-max-microvolt = <1900000>;

					bias-pull-down;

				};

			};

		};



		gsbi@12440000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;
@@ -40,6 +101,45 @@ 
			};

		};



		/* OTG */

		usb1_phy: phy@12500000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l4>;

		};



		usb3_phy: phy@12520000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l23>;

		};



		usb4_phy: phy@12530000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l23>;

		};



		gadget1: gadget@12500000 {

			status = "ok";

		};



		/* OTG */

		usb1: usb@12500000 {

			status = "ok";

		};



		usb3: usb@12520000 {

			status = "okay";

		};



		usb4: usb@12530000 {

			status = "okay";

		};



		amba {

			/* eMMC */

			sdcc1: sdcc@12400000 {

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

+129 −7
Original line number Diff line number Diff line
@@ -5,15 +5,12 @@ 
	model = "Qualcomm APQ8064/IFC6410";

	compatible = "qcom,apq8064-ifc6410", "qcom,apq8064";



	soc {

		pinctrl@800000 {

			i2c1_pins: i2c1 {

				mux {

					pins = "gpio20", "gpio21";

					function = "gsbi1";

				};

	aliases {

		serial0 = &gsbi7_serial;

	};



	soc {

		pinctrl@800000 {

			card_detect: card_detect {

				mux {

					pins = "gpio26";
@@ -23,6 +20,83 @@ 
			};

		};



		rpm@108000 {

			regulators {

				vin_lvs1_3_6-supply = <&pm8921_s4>;

				vin_lvs2-supply = <&pm8921_s1>;

				vin_lvs4_5_7-supply = <&pm8921_s4>;



				vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;

				vdd_l24-supply = <&pm8921_s1>;

				vdd_l25-supply = <&pm8921_s1>;

				vdd_l26-supply = <&pm8921_s7>;

				vdd_l27-supply = <&pm8921_s7>;

				vdd_l28-supply = <&pm8921_s7>;





				/* Buck SMPS */

				pm8921_s1: s1 {

					regulator-always-on;

					regulator-min-microvolt = <1225000>;

					regulator-max-microvolt = <1225000>;

					qcom,switch-mode-frequency = <3200000>;

					bias-pull-down;

				};



				pm8921_s3: s3 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1400000>;

					qcom,switch-mode-frequency = <4800000>;

				};



				pm8921_s4: s4 {

					regulator-min-microvolt	= <1800000>;

					regulator-max-microvolt	= <1800000>;

					qcom,switch-mode-frequency = <3200000>;

				};



				pm8921_s7: s7 {

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

					qcom,switch-mode-frequency = <3200000>;

				};



				pm8921_l3: l3 {

					regulator-min-microvolt = <3050000>;

					regulator-max-microvolt = <3300000>;

					bias-pull-down;

				};



				pm8921_l4: l4 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1800000>;

					bias-pull-down;

				};



				pm8921_l6: l6 {

					regulator-min-microvolt = <2950000>;

					regulator-max-microvolt = <2950000>;

					bias-pull-down;

				};



				pm8921_l23: l23 {

					regulator-min-microvolt = <1700000>;

					regulator-max-microvolt = <1900000>;

					bias-pull-down;

				};

			};

		};



		gsbi3: gsbi@16200000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;

			i2c3: i2c@16280000 {

				status = "okay";

				pinctrl-0 = <&i2c3_pins>;

				pinctrl-names = "default";

			};

		};



		gsbi@12440000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;
@@ -49,6 +123,54 @@ 
			};

		};



		sata_phy0: phy@1b400000 {

			status = "okay";

		};



		sata0: sata@29000000 {

			status		= "okay";

			target-supply	= <&pm8921_s4>;

		};



		/* OTG */

		usb1_phy: phy@12500000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l4>;

		};



		usb3_phy: phy@12520000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l23>;

		};



		usb4_phy: phy@12530000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l23>;

		};



		gadget1: gadget@12500000 {

			status = "okay";

		};



		/* OTG */

		usb1: usb@12500000 {

			status = "okay";

		};



		usb3: usb@12520000 {

			status = "okay";

		};



		usb4: usb@12530000 {

			status = "okay";

		};



		amba {

			/* eMMC */

			sdcc1: sdcc@12400000 {

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

+173 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


#include "skeleton.dtsi"

#include <dt-bindings/clock/qcom,gcc-msm8960.h>

#include <dt-bindings/reset/qcom,gcc-msm8960.h>

#include <dt-bindings/clock/qcom,mmcc-msm8960.h>

#include <dt-bindings/soc/qcom,gsbi.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -112,6 +113,20 @@ 
					function = "ps_hold";

				};

			};



			i2c1_pins: i2c1 {

				mux {

					pins = "gpio20", "gpio21";

					function = "gsbi1";

				};

			};



			i2c3_pins: i2c3 {

				mux {

					pins = "gpio8", "gpio9";

					function = "gsbi3";

				};

			};

		};



		intc: interrupt-controller@2000000 {
@@ -225,6 +240,26 @@ 
			};

		};



		gsbi3: gsbi@16200000 {

			status = "disabled";

			compatible = "qcom,gsbi-v1.0.0";

			reg = <0x16200000 0x100>;

			clocks = <&gcc GSBI3_H_CLK>;

			clock-names = "iface";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			i2c3: i2c@16280000 {

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

				reg = <0x16280000 0x1000>;

				interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;

				clocks = <&gcc GSBI3_QUP_CLK>,

					 <&gcc GSBI3_H_CLK>;

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

			};

		};



		gsbi7: gsbi@16600000 {

			status = "disabled";

			compatible = "qcom,gsbi-v1.0.0";
@@ -235,10 +270,9 @@ 
			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			syscon-tcsr = <&tcsr>;



			serial@16640000 {

			gsbi7_serial: serial@16640000 {

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

				reg = <0x16640000 0x1000>,

				      <0x16600000 0x1000>;
@@ -276,6 +310,143 @@ 
			#reset-cells = <1>;

		};



		l2cc: clock-controller@2011000 {

			compatible	= "syscon";

			reg		= <0x2011000 0x1000>;

		};



		rpm@108000 {

			compatible	= "qcom,rpm-apq8064";

			reg		= <0x108000 0x1000>;

			qcom,ipc	= <&l2cc 0x8 2>;



			interrupts	= <GIC_SPI 19 IRQ_TYPE_EDGE_RISING>,

					  <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,

					  <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;

			interrupt-names	= "ack", "err", "wakeup";



			regulators {

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



				pm8921_hdmi_switch: hdmi-switch {

					bias-pull-down;

				};

			};

		};



		usb1_phy: phy@12500000 {

			compatible	= "qcom,usb-otg-ci";

			reg		= <0x12500000 0x400>;

			interrupts	= <GIC_SPI 100 IRQ_TYPE_NONE>;

			status		= "disabled";

			dr_mode		= "host";



			clocks		= <&gcc USB_HS1_XCVR_CLK>,

					  <&gcc USB_HS1_H_CLK>;

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



			resets		= <&gcc USB_HS1_RESET>;

			reset-names	= "link";

		};



		usb3_phy: phy@12520000 {

			compatible	= "qcom,usb-otg-ci";

			reg		= <0x12520000 0x400>;

			interrupts	= <GIC_SPI 188 IRQ_TYPE_NONE>;

			status		= "disabled";

			dr_mode		= "host";



			clocks		= <&gcc USB_HS3_XCVR_CLK>,

					  <&gcc USB_HS3_H_CLK>;

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



			resets		= <&gcc USB_HS3_RESET>;

			reset-names	= "link";

		};



		usb4_phy: phy@12530000 {

			compatible	= "qcom,usb-otg-ci";

			reg		= <0x12530000 0x400>;

			interrupts	= <GIC_SPI 215 IRQ_TYPE_NONE>;

			status		= "disabled";

			dr_mode		= "host";



			clocks		= <&gcc USB_HS4_XCVR_CLK>,

					  <&gcc USB_HS4_H_CLK>;

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



			resets		= <&gcc USB_HS4_RESET>;

			reset-names	= "link";

		};



		gadget1: gadget@12500000 {

			compatible	= "qcom,ci-hdrc";

			reg		= <0x12500000 0x400>;

			status		= "disabled";

			dr_mode		= "peripheral";

			interrupts	= <GIC_SPI 100 IRQ_TYPE_NONE>;

			usb-phy		= <&usb1_phy>;

		};



		usb1: usb@12500000 {

			compatible	= "qcom,ehci-host";

			reg		= <0x12500000 0x400>;

			interrupts	= <GIC_SPI 100 IRQ_TYPE_NONE>;

			status		= "disabled";

			usb-phy		= <&usb1_phy>;

		};



		usb3: usb@12520000 {

			compatible	= "qcom,ehci-host";

			reg		= <0x12520000 0x400>;

			interrupts	= <GIC_SPI 188 IRQ_TYPE_NONE>;

			status		= "disabled";

			usb-phy		= <&usb3_phy>;

		};



		usb4: usb@12530000 {

			compatible	= "qcom,ehci-host";

			reg		= <0x12530000 0x400>;

			interrupts	= <GIC_SPI 215 IRQ_TYPE_NONE>;

			status		= "disabled";

			usb-phy		= <&usb4_phy>;

		};



		sata_phy0: phy@1b400000 {

			compatible	= "qcom,apq8064-sata-phy";

			status		= "disabled";

			reg		= <0x1b400000 0x200>;

			reg-names	= "phy_mem";

			clocks		= <&gcc SATA_PHY_CFG_CLK>;

			clock-names	= "cfg";

			#phy-cells	= <0>;

		};



		sata0: sata@29000000 {

			compatible		= "generic-ahci";

			status			= "disabled";

			reg			= <0x29000000 0x180>;

			interrupts		= <GIC_SPI 209 IRQ_TYPE_NONE>;



			clocks			= <&gcc SFAB_SATA_S_H_CLK>,

						<&gcc SATA_H_CLK>,

						<&gcc SATA_A_CLK>,

						<&gcc SATA_RXOOB_CLK>,

						<&gcc SATA_PMALIVE_CLK>;

			clock-names		= "slave_iface",

						"iface",

						"bus",

						"rxoob",

						"core_pmalive";



			assigned-clocks		= <&gcc SATA_RXOOB_CLK>,

						<&gcc SATA_PMALIVE_CLK>;

			assigned-clock-rates	= <100000000>, <100000000>;



			phys			= <&sata_phy0>;

			phy-names		= "sata-phy";

		};



		/* Temporary fixed regulator */

		vsdcc_fixed: vsdcc-regulator {

			compatible = "regulator-fixed";

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

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

	};



	cpu-pmu {

		compatible = "qcom,scorpion-mp-pmu";

		interrupts = <1 9 0x304>;

	};



	soc: soc {

		#address-cells = <1>;

		#size-cells = <1>;

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

+18 −0
Original line number Diff line number Diff line 
#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>



&spmi_bus {
@@ -7,6 +8,23 @@ 
		reg = <0x4 SPMI_USID>;

		#address-cells = <1>;

		#size-cells = <0>;



		pm8841_mpps: mpps@a000 {

			compatible = "qcom,pm8841-mpp";

			reg = <0xa000 0x400>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupts = <4 0xa0 0 IRQ_TYPE_NONE>,

				     <4 0xa1 0 IRQ_TYPE_NONE>,

				     <4 0xa2 0 IRQ_TYPE_NONE>,

				     <4 0xa3 0 IRQ_TYPE_NONE>;

		};



		temp-alarm@2400 {

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>;

		};

	};



	usid5: pm8841@5 {