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

Commit 9992f213 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Qualcomm Device Tree Changes for v4.9" from Andy Gross:

* Rework dr_mode on APQ8064 and Nexus7
* Add MSM8974 BLSP1 UART1 port
* Add AP148 SATA mapping
* Add support for LG Nexus 5 (Hammerhead)
* Fixup MSM8660/MSM8064 SPMI/MPP IRQs
* Add Nexus7 IMEM/reboot reason
* Add Honami touchscreen support
* Add TSENS support on MSM8974, APQ8064, and APQ8084
* Add APQ8060 Dragonboard PM8058 LEDs
* Rework VPH PWR REG for MSM8974

* tag 'qcom-dts-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: dts: msm8974: Move vreg_boost node from the honami to msm8974
  ARM: dts: qcom: msm8974: Add fixed regulator node for vph-pwr-reg
  ARM: dts: add PM8058 LEDs to the APQ8060 Dragonboard
  arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes
  arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
  arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes
  ARM: dts: msm8974: honami: Add touchscreen
  device-tree: nexus7: Add IMEM syscon and reboot reason support
  ARM: dts: MSM8660 remove flags from SPMI/MPP IRQs
  ARM: dts: MSM8064 remove flags from SPMI/MPP IRQs
  ARM: dts: msm8974-hammerhead: Introduce gpio-keys nodes
  ARM: dts: msm8974-hammerhead: Add regulator nodes for hammerhead
  ARM: dts: qcom: Add initial DTS for LG Nexus 5 Phone
  ipq8064: dts: force AP148 SATA port mapping
  ARM: dts: msm8974: Add nodes for blsp1_uart1 serial port
  device-tree: aqp8064.dtsi: Remove usb phy dr_mode = "host"
  device-tree: nexus7: Set phy mode to otg instead of host
parents 9c0da3cc 73bae19c

Documentation/devicetree/bindings/clock/qcom,gcc.txt

+16 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ Required properties : 


Optional properties :

- #power-domain-cells : shall contain 1

- Qualcomm TSENS (thermal sensor device) on some devices can

be part of GCC and hence the TSENS properties can also be

part of the GCC/clock-controller node.

For more details on the TSENS properties please refer

Documentation/devicetree/bindings/thermal/qcom-tsens.txt



Example:

	clock-controller@900000 {
@@ -31,3 +36,14 @@ Example: 
		#reset-cells = <1>;

		#power-domain-cells = <1>;

	};



Example of GCC with TSENS properties:

	clock-controller@900000 {

		compatible = "qcom,gcc-apq8064";

		reg = <0x00900000 0x4000>;

		nvmem-cells = <&tsens_calib>, <&tsens_backup>;

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

		#clock-cells = <1>;

		#reset-cells = <1>;

		#thermal-sensor-cells = <1>;

	};

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-ipq8064-ap148.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb \

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

	qcom-msm8974-sony-xperia-honami.dtb

dtb-$(CONFIG_ARCH_REALVIEW) += \

	arm-realview-pb1176.dtb \

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

+39 −0
Original line number Diff line number Diff line
@@ -239,6 +239,45 @@ 
						};

					};

				};



				led@48 {

					/*

					 * The keypad LED @0x48 is routed to

					 * the sensor board where it is

					 * connected to an infrared LED

					 * SFH4650 (60mW, @850nm) next to the

					 * ambient light and proximity sensor

					 * Capella Microsystems CM3605.

					 */

					compatible = "qcom,pm8058-keypad-led";

					reg = <0x48>;

					label = "pm8058:infrared:proximitysensor";

					default-state = "off";

				};

				led@131 {

					compatible = "qcom,pm8058-led";

					reg = <0x131>;

					label = "pm8058:red";

					default-state = "off";

				};

				led@132 {

					/*

					 * This is actually green too on my

					 * board, but documented as yellow.

					 */

					compatible = "qcom,pm8058-led";

					reg = <0x132>;

					label = "pm8058:yellow";

					default-state = "off";

					linux,default-trigger = "mmc0";

				};

				led@133 {

					compatible = "qcom,pm8058-led";

					reg = <0x133>;

					label = "pm8058:green";

					default-state = "on";

					linux,default-trigger = "heartbeat";

				};

			};

		};

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

+15 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ 
			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l4>;

			dr_mode		= "otg";

		};



		gadget@12500000 {
@@ -272,5 +273,19 @@ 
				vqmmc-supply = <&pm8921_s4>;

			};

		};



		imem@2a03f000 {

			compatible = "syscon", "simple-mfd";

			reg = <0x2a03f000 0x1000>;



			reboot-mode {

				compatible = "syscon-reboot-mode";

				offset = <0x65c>;



				mode-normal	= <0x77665501>;

				mode-bootloader	= <0x77665500>;

				mode-recovery	= <0x77665502>;

			};

		};

	};

};

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

+160 −20
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#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/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

/ {

	model = "Qualcomm APQ8064";
@@ -86,6 +87,92 @@ 
		};

	};



	thermal-zones {

		cpu-thermal0 {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&gcc 7>;

			coefficients = <1199 0>;



			trips {

				cpu_alert0: trip0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit0: trip1 {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		cpu-thermal1 {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&gcc 8>;

			coefficients = <1132 0>;



			trips {

				cpu_alert1: trip0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit1: trip1 {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		cpu-thermal2 {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&gcc 9>;

			coefficients = <1199 0>;



			trips {

				cpu_alert2: trip0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit2: trip1 {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		cpu-thermal3 {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&gcc 10>;

			coefficients = <1132 0>;



			trips {

				cpu_alert3: trip0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cpu_crit3: trip1 {

					temperature = <110000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};

	};



	cpu-pmu {

		compatible = "qcom,krait-pmu";

		interrupts = <1 10 0x304>;
@@ -559,22 +646,50 @@ 
					compatible = "qcom,pm8921-gpio",

						     "qcom,ssbi-gpio";

					reg = <0x150>;

					interrupts = <192 1>, <193 1>, <194 1>,

						     <195 1>, <196 1>, <197 1>,

						     <198 1>, <199 1>, <200 1>,

						     <201 1>, <202 1>, <203 1>,

						     <204 1>, <205 1>, <206 1>,

						     <207 1>, <208 1>, <209 1>,

						     <210 1>, <211 1>, <212 1>,

						     <213 1>, <214 1>, <215 1>,

						     <216 1>, <217 1>, <218 1>,

						     <219 1>, <220 1>, <221 1>,

						     <222 1>, <223 1>, <224 1>,

						     <225 1>, <226 1>, <227 1>,

						     <228 1>, <229 1>, <230 1>,

						     <231 1>, <232 1>, <233 1>,

						     <234 1>, <235 1>;



					interrupts = <192 IRQ_TYPE_NONE>,

						     <193 IRQ_TYPE_NONE>,

						     <194 IRQ_TYPE_NONE>,

						     <195 IRQ_TYPE_NONE>,

						     <196 IRQ_TYPE_NONE>,

						     <197 IRQ_TYPE_NONE>,

						     <198 IRQ_TYPE_NONE>,

						     <199 IRQ_TYPE_NONE>,

						     <200 IRQ_TYPE_NONE>,

						     <201 IRQ_TYPE_NONE>,

						     <202 IRQ_TYPE_NONE>,

						     <203 IRQ_TYPE_NONE>,

						     <204 IRQ_TYPE_NONE>,

						     <205 IRQ_TYPE_NONE>,

						     <206 IRQ_TYPE_NONE>,

						     <207 IRQ_TYPE_NONE>,

						     <208 IRQ_TYPE_NONE>,

						     <209 IRQ_TYPE_NONE>,

						     <210 IRQ_TYPE_NONE>,

						     <211 IRQ_TYPE_NONE>,

						     <212 IRQ_TYPE_NONE>,

						     <213 IRQ_TYPE_NONE>,

						     <214 IRQ_TYPE_NONE>,

						     <215 IRQ_TYPE_NONE>,

						     <216 IRQ_TYPE_NONE>,

						     <217 IRQ_TYPE_NONE>,

						     <218 IRQ_TYPE_NONE>,

						     <219 IRQ_TYPE_NONE>,

						     <220 IRQ_TYPE_NONE>,

						     <221 IRQ_TYPE_NONE>,

						     <222 IRQ_TYPE_NONE>,

						     <223 IRQ_TYPE_NONE>,

						     <224 IRQ_TYPE_NONE>,

						     <225 IRQ_TYPE_NONE>,

						     <226 IRQ_TYPE_NONE>,

						     <227 IRQ_TYPE_NONE>,

						     <228 IRQ_TYPE_NONE>,

						     <229 IRQ_TYPE_NONE>,

						     <230 IRQ_TYPE_NONE>,

						     <231 IRQ_TYPE_NONE>,

						     <232 IRQ_TYPE_NONE>,

						     <233 IRQ_TYPE_NONE>,

						     <234 IRQ_TYPE_NONE>,

						     <235 IRQ_TYPE_NONE>;

					gpio-controller;

					#gpio-cells = <2>;
@@ -587,9 +702,18 @@ 
					gpio-controller;

					#gpio-cells = <2>;

					interrupts =

					<128 1>, <129 1>, <130 1>, <131 1>,

					<132 1>, <133 1>, <134 1>, <135 1>,

					<136 1>, <137 1>, <138 1>, <139 1>;

					<128 IRQ_TYPE_NONE>,

					<129 IRQ_TYPE_NONE>,

					<130 IRQ_TYPE_NONE>,

					<131 IRQ_TYPE_NONE>,

					<132 IRQ_TYPE_NONE>,

					<133 IRQ_TYPE_NONE>,

					<134 IRQ_TYPE_NONE>,

					<135 IRQ_TYPE_NONE>,

					<136 IRQ_TYPE_NONE>,

					<137 IRQ_TYPE_NONE>,

					<138 IRQ_TYPE_NONE>,

					<139 IRQ_TYPE_NONE>;

				};



				rtc@11d {
@@ -611,11 +735,28 @@ 
			};

		};



		qfprom: qfprom@700000 {

			compatible	= "qcom,qfprom";

			reg		= <0x00700000 0x1000>;

			#address-cells	= <1>;

			#size-cells	= <1>;

			ranges;

			tsens_calib: calib {

				reg = <0x404 0x10>;

			};

			tsens_backup: backup_calib {

				reg = <0x414 0x10>;

			};

		};



		gcc: clock-controller@900000 {

			compatible = "qcom,gcc-apq8064";

			reg = <0x00900000 0x4000>;

			nvmem-cells = <&tsens_calib>, <&tsens_backup>;

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

			#clock-cells = <1>;

			#reset-cells = <1>;

			#thermal-sensor-cells = <1>;

		};



		lcc: clock-controller@28000000 {
@@ -712,7 +853,6 @@ 
			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>;