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

Commit bf671ec6 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Qualcomm Device Tree Changes for v4.13

* Fix IPQ4019 i2c0 node
* Add GSBI7 on IPQ8064
* Add misc APQ8060 devices
* Fixup USB related devices on APQ8064 and MSM8974

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

:
  ARM: dts: add core I2C devices to the APQ8060 Dragonboard
  ARM: dts: add GSBI8 defines to the MSM8660 family
  ARM: dts: Qualcomm APQ8060 DragonBoard ALS sensor
  ARM: dts: add XOADC and IIO HWMON to MSM8660/APQ8060
  ARM: dts: qcom: ipq4019: fix i2c_0 node
  ARM: dts: qcom: add gsbi7 serial to ipq8064 SoC device tree
  ARM: dts: qcom-apq8064: Collapse usb support into one node
  ARM: dts: qcom-msm8974: Add HS usb node and OTG detection mechanisms
  ARM: dts: qcom: add charger otg regulator
  ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5088774b cff94887

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

+129 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <dt-bindings/input/input.h>

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

#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>

#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>

#include "qcom-msm8660.dtsi"



/ {
@@ -83,6 +84,25 @@ 
		};

	};



	/*

	 * Capella CM3605 light and proximity sensor mounted directly

	 * on the sensor board.

	 */

	cm3605 {

		compatible = "capella,cm3605";

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

		aset-gpios = <&pm8058_gpio 35 GPIO_ACTIVE_LOW>;

		capella,aset-resistance-ohms = <100000>;

		/* GPIO34 has interrupt 225 on the PM8058 */

		/* Trig on both edges - getting close or far away */

		interrupts-extended = <&pm8058 225 IRQ_TYPE_EDGE_BOTH>;

		/* MPP05 analog input to the XOADC */

		io-channels = <&xoadc 0x00 0x05>;

		io-channel-names = "aout";

		pinctrl-names = "default";

		pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>;

	};



	soc {

		pinctrl@800000 {

			/* eMMMC pins, all 8 data lines connected */
@@ -160,6 +180,19 @@ 
				};

			};



			dragon_gsbi8_i2c_pins: gsbi8_i2c {

				mux {

					pins = "gpio64", "gpio65";

					function = "gsbi8";

				};

				pinconf {

					pins = "gpio64", "gpio65";

					drive-strength = <16>;

					/* These have external pull-up 2.2kOhm to 1.8V */

					bias-disable;

				};

			};



			dragon_gsbi12_i2c_pins: gsbi12_i2c {

				mux {

					pins = "gpio115", "gpio116";
@@ -317,6 +350,24 @@ 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_cm3605_gpios: cm3605-gpios {

						/* Pin 34 connected to the proxy IRQ */

						pinconf_gpio34 {

							pins = "gpio34";

							function = "normal";

							input-enable;

							bias-disable;

							power-source = <PM8058_GPIO_S3>;

						};

						/* Pin 35 connected to ASET */

						pinconf_gpio35 {

							pins = "gpio35";

							function = "normal";

							output-high;

							bias-disable;

							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_veth_gpios: veth-gpios {

						pinconf {

							pins = "gpio40";
@@ -327,6 +378,47 @@ 
					};

				};



				mpps@50 {

					dragon_cm3605_mpps: cm3605-mpps {

						pinconf {

							pins = "mpp5";

							function = "analog";

							input-enable;

							bias-high-impedance;

							/* Let's use channel 5 */

							qcom,amux-route = <PMIC_MPP_AMUX_ROUTE_CH5>;

							power-source = <PM8058_GPIO_S3>;

						};

					};

				};



				xoadc@197 {

					/* Reference voltage 2.2 V */

					xoadc-ref-supply = <&pm8058_l18>;



					/* Board-specific channels */

					mpp5@05 {

						/* Connected to AOUT of ALS sensor */

						reg = <0x00 0x05>;

					};

					mpp6@06 {

						/* Connected to test point TP43 */

						reg = <0x00 0x06>;

					};

					mpp7@07 {

						/* Connected to battery thermistor */

						reg = <0x00 0x07>;

					};

					mpp8@08 {

						/* Connected to battery ID detector */

						reg = <0x00 0x08>;

					};

					mpp9@09 {

						/* Connected to XO thermistor */

						reg = <0x00 0x09>;

					};

				};



				led@48 {

					/*

					 * The keypad LED @0x48 is routed to
@@ -340,6 +432,7 @@ 
					reg = <0x48>;

					label = "pm8058:infrared:proximitysensor";

					default-state = "off";

					linux,default-trigger = "cm3605";

				};

				led@131 {

					compatible = "qcom,pm8058-led";
@@ -368,6 +461,42 @@ 
			};

		};



		gsbi@19800000 {

			status = "ok";

			qcom,mode = <GSBI_PROT_I2C>;



			i2c@19880000 {

				status = "ok";

				pinctrl-names = "default";

				pinctrl-0 = <&dragon_gsbi8_i2c_pins>;



				eeprom@52 {

					/* A 16KiB Platform ID EEPROM on the CPU carrier board */

					compatible = "atmel,24c128";

					reg = <0x52>;

					vcc-supply = <&pm8058_s3>;

					pagesize = <64>;

				};

				wm8903: wm8903@1a {

					/* This Woolfson Micro device has an unrouted interrupt line */

					compatible = "wlf,wm8903";

					reg = <0x1a>;



					AVDD-supply = <&pm8058_l16>;

					CPVDD-supply = <&pm8058_l16>;

					DBVDD-supply = <&pm8058_s3>;

					DCVDD-supply = <&pm8058_l0>;



					gpio-controller;

					#gpio-cells = <2>;



					micdet-cfg = <0>;

					micdet-delay = <100>;

					gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;

				};

			};

		};



		gsbi@19c00000 {

			status = "ok";

			qcom,mode = <GSBI_PROT_I2C_UART>;

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

+21 −27
Original line number Diff line number Diff line
@@ -320,43 +320,37 @@ 
		};



		/* OTG */

		phy@12500000 {

		usb@12500000 {

			status = "okay";

			dr_mode = "peripheral";

			vddcx-supply	= <&pm8921_s3>;

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l4>;

				};



		phy@12520000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l23>;

			};

		};



		phy@12530000 {

		usb@12520000 {

			status = "okay";

			vddcx-supply	= <&pm8921_s3>;

			dr_mode = "otg";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l23>;

				};



		gadget@12500000 {

			status = "okay";

			};



		/* OTG */

		usb@12500000 {

			status = "okay";

		};



		usb@12520000 {

			status = "okay";

		};



		usb@12530000 {

			status = "okay";

			dr_mode = "otg";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l23>;

				};

			};

		};



		amba {

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

+7 −13
Original line number Diff line number Diff line
@@ -321,21 +321,15 @@ 
		};



		/* OTG */

		phy@12500000 {

		usb@12500000 {

			status = "okay";

			vddcx-supply	= <&pm8921_s3>;

			dr_mode = "otg";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l4>;

			dr_mode		= "otg";

				};



		gadget@12500000 {

			status = "okay";

			};



		/* OTG */

		usb@12500000 {

			status = "okay";

		};



		amba {

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

+24 −29
Original line number Diff line number Diff line
@@ -150,42 +150,37 @@ 
		};



		/* OTG */

		usb1_phy: phy@12500000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

		usb@12500000 {

			status = "ok";

			dr_mode = "otg";

			ulpi {

				phy {

					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 {

		usb@12520000 {

			status = "okay";

			vddcx-supply	= <&pm8921_s3>;

			dr_mode = "host";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l23>;

				};



		gadget1: gadget@12500000 {

			status = "ok";

			};



		/* OTG */

		usb1: usb@12500000 {

			status = "ok";

		};



		usb3: usb@12520000 {

		usb@12530000 {

			status = "okay";

			dr_mode = "host";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l23>;

				};

			};



		usb4: usb@12530000 {

			status = "okay";

		};



		/* on board fixed 3.3v supply */

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

+24 −29
Original line number Diff line number Diff line
@@ -244,42 +244,37 @@ 
		};



		/* OTG */

		usb1_phy: phy@12500000 {

		usb@12500000 {

			status = "okay";

			vddcx-supply	= <&pm8921_s3>;

			dr_mode = "otg";

			ulpi {

				phy {

					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 {

		usb@12520000 {

			status = "okay";

			vddcx-supply	= <&pm8921_s3>;

			dr_mode = "host";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l23>;

				};



		gadget1: gadget@12500000 {

			status = "okay";

			};



		/* OTG */

		usb1: usb@12500000 {

			status = "okay";

		};



		usb3: usb@12520000 {

		usb@12530000 {

			status = "okay";

			dr_mode = "host";

			ulpi {

				phy {

					v3p3-supply = <&pm8921_l3>;

					v1p8-supply = <&pm8921_l23>;

				};

			};



		usb4: usb@12530000 {

			status = "okay";

		};



		pci@1b500000 {