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

Commit 43d08e21 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'qcom-dts-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm Device Tree Changes for v4.11

* Add Coresight components for APQ8064
* Fixup PM8058 nodes
* Add APQ8060 gyro and accel support
* Enable SD600 HDMI support
* Add RIVA supprort for Sony Yuga and SD600
* Add PM8821 support
* Add MSM8974 ADSP, USB gadget, SMD, and SMP2P support
* Fix IPQ8064 clock frequencies

* tag 'qcom-dts-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  ARM: dts: qcom: Add apq8064 CoreSight components
  ARM: dts: Add gyro and accel to APQ8060 Dragonboard
  ARM: dts: reference PM8058 as IRQ parent
  ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058
  ARM: dts: sd-600eval: enable 1.8v regulator on LS expansion
  ARM: dts: sd-600eval: add hdmi support
  ARM: dts: move hdmi pinctrl out of board file.
  ARM: dts: qcom: sd600eval: Enable riva-pil
  ARM: dts: qcom: sd600-eval: pm8921_s2 regulator properties
  ARM: dts: qcom: apq8064-sony-yuga: Enable riva-pil
  ARM: dts: qcom: apq8064: Add riva-pil node
  ARM: dts: apq8064: add support to pm8821
  arm: dts: qcom: Fix ipq board clock rates
  ARM: dts: msm8974: Remove "unused" reserved region
  ARM: dts: msm8974: Add ADSP PIL node
  ARM: dts: msm8974: Add ADSP smp2p and smd nodes
  ARM: dts: qcom: msm8974: Add USB gadget nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d12556ea 7a5c275f

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

+57 −5
Original line number Diff line number Diff line
@@ -220,6 +220,14 @@ 
					function = "ebi2";

				};

			};



			/* Interrupt line for the KXSD9 accelerometer */

			dragon_kxsd9_gpios: kxsd9 {

				irq {

					pins = "gpio57"; /* IRQ line */

					bias-pull-up;

				};

			};

		};



		qcom,ssbi@500000 {
@@ -272,6 +280,15 @@ 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_mpu3050_gpios: mpu3050-gpios {

						pinconf {

							pins = "gpio17";

							function = "normal";

							input-enable;

							bias-disable;

							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_sdcc3_gpios: sdcc3-gpios {

						pinconf {

							pins = "gpio22";
@@ -369,8 +386,8 @@ 
				ak8975@0c {

					compatible = "asahi-kasei,ak8975";

					reg = <0x0c>;

					/* GPIO33 has interrupt 224 on the PM8058 */

					interrupt-parent = <&pm8058_gpio>;

					/* FIXME: GPIO33 has interrupt 224 on the PM8058 */

					interrupt-parent = <&pm8058>;

					interrupts = <224 IRQ_TYPE_EDGE_RISING>;

					pinctrl-names = "default";

					pinctrl-0 = <&dragon_ak8975_gpios>;
@@ -380,8 +397,8 @@ 
				bmp085@77 {

					compatible = "bosch,bmp085";

					reg = <0x77>;

					/* GPIO16 has interrupt 207 on the PM8058 */

					interrupt-parent = <&pm8058_gpio>;

					/* FIXME: GPIO16 has interrupt 207 on the PM8058 */

					interrupt-parent = <&pm8058>;

					interrupts = <207 IRQ_TYPE_EDGE_RISING>;

					reset-gpios = <&tlmm 86 GPIO_ACTIVE_LOW>;

					pinctrl-names = "default";
@@ -389,6 +406,41 @@ 
					vddd-supply = <&pm8058_lvs0>; // 1.8V

					vdda-supply = <&pm8058_l14>; // 2.85V

				};

				mpu3050@68 {

					compatible = "invensense,mpu3050";

					reg = <0x68>;

					/*

					 * GPIO17 has interrupt 208 on the

					 * PM8058, it is pulled high by a 10k

					 * resistor to VLOGIC so needs to be

					 * active low/falling edge.

					 */

					interrupts-extended = <&pm8058 208 IRQ_TYPE_EDGE_FALLING>;

					pinctrl-names = "default";

					pinctrl-0 = <&dragon_mpu3050_gpios>;

					vlogic-supply = <&pm8058_lvs0>; // 1.8V

					vdd-supply = <&pm8058_l14>; // 2.85V



					/*

					 * The MPU-3050 acts as a hub for the

					 * accelerometer.

					 */

					i2c-gate {

						#address-cells = <1>;

						#size-cells = <0>;



						kxsd9@18 {

							compatible = "kionix,kxsd9";

							reg = <0x18>;

							interrupt-parent = <&tlmm>;

							interrupts = <57 IRQ_TYPE_EDGE_FALLING>;

							pinctrl-names = "default";

							pinctrl-0 = <&dragon_kxsd9_gpios>;

							iovdd-supply = <&pm8058_lvs0>; // 1.8V

							vdd-supply = <&pm8058_l14>; // 2.85V

						};

					};

				};

			};

		};
@@ -412,7 +464,7 @@ 
				 * The second interrupt is the PME interrupt

				 * for network wakeup, connected to the TLMM.

				 */

				interrupts-extended = <&pmicintc 198 IRQ_TYPE_EDGE_FALLING>,

				interrupts-extended = <&pm8058 198 IRQ_TYPE_EDGE_FALLING>,

						    <&tlmm 29 IRQ_TYPE_EDGE_RISING>;

				reset-gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;

				vdd33a-supply = <&dragon_veth>;

arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts

+69 −0
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ 


	};



	hdmi-out {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con: endpoint {

				remote-endpoint = <&hdmi_out>;

			};

		};

	};



	soc {

		rpm@108000 {

			regulators {
@@ -74,6 +85,14 @@ 
					bias-pull-down;

				};



				s2 {

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

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

					bias-pull-down;

					regulator-always-on;

				};



				s3 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1400000>;
@@ -121,6 +140,16 @@ 
					bias-pull-down;

				};



				/**

				 * 1.8v required on LS expansion

				 * for mezzanine boards

				 */

				l15 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				l23 {

					regulator-min-microvolt = <1700000>;

					regulator-max-microvolt = <1900000>;
@@ -347,5 +376,45 @@ 
				cd-gpios	= <&tlmm_pinmux 26 GPIO_ACTIVE_HIGH>;

			};

		};



		riva-pil@3204000 {

			status = "okay";



			pinctrl-names = "default";

			pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;

		};



		hdmi-tx@4a00000 {

			status = "okay";

			core-vdda-supply = <&pm8921_hdmi_switch>;

			hdmi-mux-supply = <&vcc3v3>;



			hpd-gpio = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;



			ports {

				port@1 {

					endpoint {

						remote-endpoint = <&hdmi_con>;

					};

				};

			};

		};



		hdmi-phy@4a00400 {

			status = "okay";

			core-vdda-supply = <&pm8921_hdmi_switch>;

		};



		mdp@5100000 {

			status = "okay";



			ports {

				port@3 {

					endpoint {

						remote-endpoint = <&hdmi_in>;

					};

				};

			};

		};

	};

};

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

+0 −22
Original line number Diff line number Diff line
@@ -75,25 +75,6 @@ 
					bias-disable;

				};

			};



			hdmi_pinctrl: hdmi-pinctrl {

				mux {

					pins = "gpio70", "gpio71", "gpio72";

					function = "hdmi";

				};



				pinconf_ddc {

					pins = "gpio70", "gpio71";

					bias-pull-up;

					drive-strength = <2>;

				};



				pinconf_hpd {

					pins = "gpio72";

					bias-pull-down;

					drive-strength = <16>;

				};

			};

		};



		rpm@108000 {
@@ -368,9 +349,6 @@ 


			hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;



			pinctrl-names = "default";

			pinctrl-0 = <&hdmi_pinctrl>;



			ports {

				port@0 {

					endpoint {

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

+37 −0
Original line number Diff line number Diff line
@@ -284,4 +284,41 @@ 
			bias-disable = <0>;

		};

	};



	riva_fm_pin_a: riva-fm-active {

		pins = "gpio14", "gpio15";

		function = "riva_fm";

	};



	riva_bt_pin_a: riva-bt-active {

		pins = "gpio16", "gpio17";

		function = "riva_bt";

	};



	riva_wlan_pin_a: riva-wlan-active {

		pins = "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";

		function = "riva_wlan";



		drive-strength = <6>;

		bias-pull-down;

	};



	hdmi_pinctrl: hdmi-pinctrl {

		mux {

			pins = "gpio70", "gpio71", "gpio72";

			function = "hdmi";

		};



		pinconf_ddc {

			pins = "gpio70", "gpio71";

			bias-pull-up;

			drive-strength = <2>;

		};



		pinconf_hpd {

			pins = "gpio72";

			bias-pull-down;

			drive-strength = <16>;

		};

	};

};

arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts

+7 −0
Original line number Diff line number Diff line
@@ -390,5 +390,12 @@ 
				pinctrl-0 = <&sdcc3_pins>, <&sdcc3_cd_pin_a>;

			};

		};



		riva-pil@3204000 {

			status = "okay";



			pinctrl-names = "default";

			pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;

		};

	};

};