Commit 282e1cd1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

* Add Support for MSM8974 based Fairphone 2 phone
* Add support for MSM8974 based Sony Xperia Z2 Tablet
* Add MSM8660 GSBI6/7 nodes
* Disable GSBI6 at APQ8064 platform level
* Fix phy cells on APQ8064

* tag 'qcom-dts-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: dts: msm8974-FP2: Add USB node
  ARM: dts: msm8974-FP2: Add sdhci1 node
  ARM: dts: msm8974-FP2: Add regulator nodes for FP2
  ARM: dts: msm8974-FP2: Introduce gpio-keys nodes
  ARM: dts: qcom: Add initial DTS file for Fairphone 2 phone
  ARM: dts: qcom: add MSM8660 GSBI6 and GSBI7
  ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet
  ARM: dts: qcom-apq8064: disable gsbi6 i2c by default at soc dtsi
  ARM: dts: qcom-apq8064: Fix dsi and hdmi phy cells
parents 25075146 e8c4c6ee

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ everspin Everspin Technologies, Inc. 
exar	Exar Corporation

excito	Excito

ezchip	EZchip Semiconductor

fairphone	Fairphone B.V.

faraday	Faraday Technology Corporation

fcs	Fairchild Semiconductor

firefly	Firefly

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -701,7 +701,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-ipq8064-ap148.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb \

	qcom-msm8974-fairphone-fp2.dtb \

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

	qcom-msm8974-sony-xperia-castor.dtb \

	qcom-msm8974-sony-xperia-honami.dtb \

	qcom-mdm9615-wp8548-mangoh-green.dtb

dtb-$(CONFIG_ARCH_REALVIEW) += \

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

+4 −1
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ 
				clocks = <&gcc GSBI6_QUP_CLK>,

					 <&gcc GSBI6_H_CLK>;

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

				status = "disabled";

			};

		};
@@ -906,11 +907,11 @@ 
				usb_hs1_phy: phy {

					compatible = "qcom,usb-hs-phy-apq8064",

						     "qcom,usb-hs-phy";

					#phy-cells = <0>;

					clocks = <&sleep_clk>, <&cxo_board>;

					clock-names = "sleep", "ref";

					resets = <&usb1 0>;

					reset-names = "por";

					#phy-cells = <0>;

				};

			};

		};
@@ -1263,6 +1264,7 @@ 
		dsi0_phy: dsi-phy@4700200 {

			compatible = "qcom,dsi-phy-28nm-8960";

			#clock-cells = <1>;

			#phy-cells = <0>;



			reg = <0x04700200 0x100>,

				<0x04700300 0x200>,
@@ -1417,6 +1419,7 @@ 


			clocks = <&mmcc HDMI_S_AHB_CLK>;

			clock-names = "slave_iface_clk";

			#phy-cells = <0>;

		};



		mdp: mdp@5100000 {

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

+67 −0
Original line number Diff line number Diff line
@@ -123,6 +123,73 @@ 
			reg = <0x900000 0x4000>;

		};



		gsbi6: gsbi@16500000 {

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

			cell-index = <12>;

			reg = <0x16500000 0x100>;

			clocks = <&gcc GSBI6_H_CLK>;

			clock-names = "iface";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			syscon-tcsr = <&tcsr>;



			gsbi6_serial: serial@16540000 {

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

				reg = <0x16540000 0x1000>,

				      <0x16500000 0x1000>;

				interrupts = <GIC_SPI 156 IRQ_TYPE_NONE>;

				clocks = <&gcc GSBI6_UART_CLK>, <&gcc GSBI6_H_CLK>;

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

				status = "disabled";

			};



			gsbi6_i2c: i2c@16580000 {

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

				reg = <0x16580000 0x1000>;

				interrupts = <GIC_SPI 157 IRQ_TYPE_NONE>;

				clocks = <&gcc GSBI6_QUP_CLK>, <&gcc GSBI6_H_CLK>;

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

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};

		};



		gsbi7: gsbi@16600000 {

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

			cell-index = <12>;

			reg = <0x16600000 0x100>;

			clocks = <&gcc GSBI7_H_CLK>;

			clock-names = "iface";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			syscon-tcsr = <&tcsr>;



			gsbi7_serial: serial@16640000 {

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

				reg = <0x16640000 0x1000>,

				      <0x16600000 0x1000>;

				interrupts = <GIC_SPI 158 IRQ_TYPE_NONE>;

				clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>;

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

				status = "disabled";

			};



			gsbi7_i2c: i2c@16680000 {

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

				reg = <0x16680000 0x1000>;

				interrupts = <GIC_SPI 159 IRQ_TYPE_NONE>;

				clocks = <&gcc GSBI7_QUP_CLK>, <&gcc GSBI7_H_CLK>;

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

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

			};

		};



		gsbi8: gsbi@19800000 {

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

arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts

0 → 100644
+321 −0
Original line number Diff line number Diff line 
#include "qcom-msm8974.dtsi"

#include "qcom-pm8841.dtsi"

#include "qcom-pm8941.dtsi"

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

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

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





/ {

	model = "Fairphone 2";

	compatible = "fairphone,fp2", "qcom,msm8974";



	aliases {

		serial0 = &blsp1_uart2;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	gpio-keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys_pin_a>;



		camera-snapshot {

			label = "camera_snapshot";

			gpios = <&pm8941_gpios 1 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_CAMERA>;

			wakeup-source;

			debounce-interval = <15>;

		};



		volume-down {

			label = "volume_down";

			gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

			wakeup-source;

			debounce-interval = <15>;

		};



		volume-up {

			label = "volume_up";

			gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			wakeup-source;

			debounce-interval = <15>;

		};

	};



	smd {

		rpm {

			rpm_requests {

				pm8841-regulators {

					s1 {

						regulator-min-microvolt = <675000>;

						regulator-max-microvolt = <1050000>;

					};



					s2 {

						regulator-min-microvolt = <500000>;

						regulator-max-microvolt = <1050000>;

					};



					s3 {

						regulator-min-microvolt = <1050000>;

						regulator-max-microvolt = <1050000>;

					};

				};



				pm8941-regulators {

					vdd_l1_l3-supply = <&pm8941_s1>;

					vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;

					vdd_l4_l11-supply = <&pm8941_s1>;

					vdd_l5_l7-supply = <&pm8941_s2>;

					vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;

					vdd_l9_l10_l17_l22-supply = <&vreg_boost>;

					vdd_l13_l20_l23_l24-supply = <&vreg_boost>;

					vdd_l21-supply = <&vreg_boost>;



					s1 {

						regulator-min-microvolt = <1300000>;

						regulator-max-microvolt = <1300000>;



						regulator-always-on;

						regulator-boot-on;

					};



					s2 {

						regulator-min-microvolt = <2150000>;

						regulator-max-microvolt = <2150000>;



						regulator-boot-on;

					};



					s3 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;



						regulator-always-on;

						regulator-boot-on;

					};



					l1 {

						regulator-min-microvolt = <1225000>;

						regulator-max-microvolt = <1225000>;



						regulator-always-on;

						regulator-boot-on;

					};



					l2 {

						regulator-min-microvolt = <1200000>;

						regulator-max-microvolt = <1200000>;

					};



					l3 {

						regulator-min-microvolt = <1225000>;

						regulator-max-microvolt = <1225000>;

					};



					l4 {

						regulator-min-microvolt = <1225000>;

						regulator-max-microvolt = <1225000>;

					};



					l5 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					l6 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;



						regulator-boot-on;

					};



					l7 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;



						regulator-boot-on;

					};



					l8 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					l9 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2950000>;

					};



					l10 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2950000>;

					};



					l11 {

						regulator-min-microvolt = <1225000>;

						regulator-max-microvolt = <1350000>;

					};



					l12 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;



						regulator-always-on;

						regulator-boot-on;

					};



					l13 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <2950000>;



						regulator-boot-on;

					};



					l14 {

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

					};



					l15 {

						regulator-min-microvolt = <2050000>;

						regulator-max-microvolt = <2050000>;

					};



					l16 {

						regulator-min-microvolt = <2700000>;

						regulator-max-microvolt = <2700000>;

					};



					l17 {

						regulator-min-microvolt = <2850000>;

						regulator-max-microvolt = <2850000>;

					};



					l18 {

						regulator-min-microvolt = <2850000>;

						regulator-max-microvolt = <2850000>;

					};



					l19 {

						regulator-min-microvolt = <2900000>;

						regulator-max-microvolt = <3350000>;

					};



					l20 {

						regulator-min-microvolt = <2950000>;

						regulator-max-microvolt = <2950000>;



						regulator-boot-on;

					};



					l21 {

						regulator-min-microvolt = <2950000>;

						regulator-max-microvolt = <2950000>;



						regulator-boot-on;

					};



					l22 {

						regulator-min-microvolt = <3000000>;

						regulator-max-microvolt = <3300000>;

					};



					l23 {

						regulator-min-microvolt = <3000000>;

						regulator-max-microvolt = <3000000>;

					};



					l24 {

						regulator-min-microvolt = <3075000>;

						regulator-max-microvolt = <3075000>;



						regulator-boot-on;

					};

				};

			};

		};

	};

};



&soc {

	serial@f991e000 {

		status = "ok";

	};



	pinctrl@fd510000 {

		sdhc1_pin_a: sdhc1-pin-active {

			clk {

				pins = "sdc1_clk";

				drive-strength = <16>;

				bias-disable;

			};



			cmd-data {

				pins = "sdc1_cmd", "sdc1_data";

				drive-strength = <10>;

				bias-pull-up;

			};

		};

	};



	sdhci@f9824900 {

		status = "ok";



		vmmc-supply = <&pm8941_l20>;

		vqmmc-supply = <&pm8941_s3>;



		bus-width = <8>;

		non-removable;



		pinctrl-names = "default";

		pinctrl-0 = <&sdhc1_pin_a>;

	};



	usb@f9a55000 {

		status = "ok";



		phys = <&usb_hs1_phy>;

		phy-select = <&tcsr 0xb000 0>;

		extcon = <&smbb>, <&usb_id>;

		vbus-supply = <&chg_otg>;



		hnp-disable;

		srp-disable;

		adp-disable;



		ulpi {

			phy@a {

				status = "ok";



				v1p8-supply = <&pm8941_l6>;

				v3p3-supply = <&pm8941_l24>;



				extcon = <&smbb>;

				qcom,init-seq = /bits/ 8 <0x1 0x64>;

			};

		};

	};

};



&spmi_bus {

	pm8941@0 {

		gpios@c000 {

			gpio_keys_pin_a: gpio-keys-active {

				pins = "gpio1", "gpio2", "gpio5";

				function = "normal";



				bias-pull-up;

				power-source = <PM8941_GPIO_S3>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE