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

Commit 953a400a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "Qualcomm ARM Based Device Tree Updates for v4.6" from Andy Gross:

* Add documentation for Kryo
* Add RPMCC node for APQ8064
* Updates for MSM8974
* Add board clocks
* Add support for Nexus7 device
* Fixup pmic reg properties
* Various updates/cleanups for APQ8064 based boards

* tag 'qcom-dt-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (23 commits)
  ARM: dts: ifc6410: add correct aliases to the i2c and spi bus
  ARM: dts: apq8064: add i2c6 device node.
  ARM: dts: ifc6410: enable cam i2c device
  ARM: dts: apq8064: add gsbi4 with i2c node.
  ARM: dts: apq8064: add missing i2c2 pinctrl info
  ARM: dts: ifc6410: enable spi device on expansion
  ARM: dts: apq8064: add spi5 device node.
  ARM: dts: apq8064: add i2c sleep pinctrl states.
  ARM: dts: apq8064: add pci support in CM QS600
  ARM: dts: apq8064: move pinctrls to dedicated dtsi
  ARM: dts: qcom: fix i2c lables to be inline with others
  dts: msm8974: Add dma channels for blsp2_i2c1 node
  dts: msm8974: Add blsp2_bam dma node
  ARM: dts: qcom: Remove size elements from pmic reg properties
  devicetree: bindings: Document qcom board compatible format
  devicetree: Add DTS file to support the Nexus7 2013 (flo) device.
  devicetree: qcom-apq8064.dtsi: Add i2c3 address-cells and size-cells values
  arm: dts: qcom: Add more board clocks
  ARM: dts: qcom: msm8974: Add WCNSS SMP2P node
  ARM: dts: qcom: msm8974: Add smsm node
  ...
parents 53b28f1c 90bd6e8f

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -178,6 +178,7 @@ nodes to be present and contain the properties described below. 
			    "marvell,sheeva-v5"

			    "marvell,sheeva-v5"

			    "nvidia,tegra132-denver"

			    "nvidia,tegra132-denver"

			    "qcom,krait"

			    "qcom,krait"

			    "qcom,kryo"

			    "qcom,scorpion"

			    "qcom,scorpion"

	- enable-method

	- enable-method

		Value type: <stringlist>

		Value type: <stringlist>

Documentation/devicetree/bindings/arm/qcom.txt

0 → 100644
+51 −0
Original line number Original line Diff line number Diff line 
QCOM device tree bindings

-------------------------



Some qcom based bootloaders identify the dtb blob based on a set of

device properties like SoC and platform and revisions of those components.

To support this scheme, we encode this information into the board compatible

string.



Each board must specify a top-level board compatible string with the following

format:



	compatible = "qcom,<SoC>[-<soc_version>][-<foundry_id>]-<board>[/<subtype>][-<board_version>]"



The 'SoC' and 'board' elements are required. All other elements are optional.



The 'SoC' element must be one of the following strings:



	apq8016

	apq8074

	apq8084

	apq8096

	msm8916

	msm8974

	msm8996



The 'board' element must be one of the following strings:



	cdp

	liquid

	dragonboard

	mtp

	sbc



The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor>

where the minor number may be omitted when it's zero, i.e.  v1.0 is the same

as v1. If all versions of the 'board_version' elements match, then a

wildcard '*' should be used, e.g. 'v*'.



The 'foundry_id' and 'subtype' elements are one or more digits from 0 to 9.



Examples:



	"qcom,msm8916-v1-cdp-pm8916-v2.1"



A CDP board with an msm8916 SoC, version 1 paired with a pm8916 PMIC of version

2.1.



	"qcom,apq8074-v2.0-2-dragonboard/1-v0.1"



A dragonboard board v0.1 of subtype 1 with an apq8074 SoC version 2, made in

foundry 2.

arch/arm/boot/dts/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -533,6 +533,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-apq8064-cm-qs600.dtb \

	qcom-apq8064-cm-qs600.dtb \

	qcom-apq8064-ifc6410.dtb \

	qcom-apq8064-ifc6410.dtb \

	qcom-apq8064-sony-xperia-yuga.dtb \

	qcom-apq8064-sony-xperia-yuga.dtb \

	qcom-apq8064-asus-nexus7-flo.dtb \

	qcom-apq8074-dragonboard.dtb \

	qcom-apq8074-dragonboard.dtb \

	qcom-apq8084-ifc6540.dtb \

	qcom-apq8084-ifc6540.dtb \

	qcom-apq8084-mtp.dtb \

	qcom-apq8084-mtp.dtb \

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

0 → 100644
+276 −0
Original line number Original line Diff line number Diff line 
#include "qcom-apq8064-v2.0.dtsi"

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

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

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

/ {

	model = "Asus Nexus7(flo)";

	compatible = "asus,nexus7-flo", "qcom,apq8064";



	aliases {

		serial0 = &gsbi7_serial;

		serial1 = &gsbi6_serial;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	ext_3p3v: regulator-fixed@1 {

		compatible = "regulator-fixed";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-name = "ext_3p3v";

		regulator-type = "voltage";

		startup-delay-us = <0>;

		gpio = <&tlmm_pinmux 77 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		regulator-boot-on;

	};



	gpio-keys {

		compatible = "gpio-keys";

		power {

			label = "Power";

			gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			gpio-key,wakeup;

		};

		volume_up {

			label = "Volume Up";

			gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_VOLUMEUP>;

		};

		volume_down {

			label = "Volume Down";

			gpios = <&pm8921_gpio 38 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_VOLUMEDOWN>;

		};

	};



	soc {

		rpm@108000 {

			regulators {

				vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;

				vin_lvs1_3_6-supply = <&pm8921_s4>;

				vin_lvs4_5_7-supply = <&pm8921_s4>;





				vdd_l24-supply = <&pm8921_s1>;

				vdd_l25-supply = <&pm8921_s1>;

				vin_lvs2-supply = <&pm8921_s1>;



				vdd_l26-supply = <&pm8921_s7>;

				vdd_l27-supply = <&pm8921_s7>;

				vdd_l28-supply = <&pm8921_s7>;



				vdd_ncp-supply = <&pm8921_l6>;



				/* Buck SMPS */

				s1 {

					regulator-always-on;

					regulator-min-microvolt = <1225000>;

					regulator-max-microvolt = <1225000>;

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

					bias-pull-down;

				};



				/* msm otg HSUSB_VDDCX */

				s3 {

					regulator-min-microvolt = <500000>;

					regulator-max-microvolt = <1150000>;

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

				};



				/*

				 * msm_sdcc.1-sdc-vdd_io

				 * tabla2x-slim-CDC_VDDA_RX

				 * tabla2x-slim-CDC_VDDA_TX

				 * tabla2x-slim-CDC_VDD_CP

				 * tabla2x-slim-VDDIO_CDC

				 */

				s4 {

					regulator-min-microvolt	= <1800000>;

					regulator-max-microvolt	= <1800000>;

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

					regulator-always-on;

				};



				s7 {

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

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

				};



				/* mipi_dsi.1-dsi1_pll_vdda */

				l2 {

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				/* msm_otg-HSUSB_3p3 */

				l3 {

					regulator-min-microvolt = <3075000>;

					regulator-max-microvolt = <3075000>;

					bias-pull-down;

				};



				/* msm_otg-HSUSB_1p8 */

				l4 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					bias-pull-down;

				};



				/* msm_sdcc.1-sdc_vdd */

				l5 {

					regulator-min-microvolt = <2950000>;

					regulator-max-microvolt = <2950000>;

					regulator-always-on;

					bias-pull-down;

				};



				l6 {

					regulator-min-microvolt = <2950000>;

					regulator-max-microvolt = <2950000>;

				};



				/* mipi_dsi.1-dsi1_avdd */

				l11 {

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					bias-pull-down;

				};



				/* pwm_power for backlight */

				l17 {

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3600000>;

					bias-pull-down;

				};



				/* camera, qdsp6 */

				l23 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					bias-pull-down;

				};



				/*

				 * tabla2x-slim-CDC_VDDA_A_1P2V

				 * tabla2x-slim-VDDD_CDC_D

				 */

				l25 {

					regulator-min-microvolt = <1250000>;

					regulator-max-microvolt = <1250000>;

					bias-pull-down;

				};



				lvs1 {

					bias-pull-down;

				};



				lvs4 {

					bias-pull-down;

				};



				lvs5 {

					bias-pull-down;

				};



				lvs6 {

					bias-pull-down;

				};

				/*

				 * mipi_dsi.1-dsi1_vddio

				 * pil_riva-pll_vdd

				 */

				lvs7 {

					bias-pull-down;

				};

			};

		};



		gsbi@16200000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;

			i2c@16280000 {

				status = "okay";

				clock-frequency = <200000>;

				pinctrl-0 = <&i2c3_pins>;

				pinctrl-names = "default";



				trackpad@10 {

					compatible = "elan,ekth3500";

					reg = <0x10>;

					interrupt-parent = <&tlmm_pinmux>;

					interrupts = <6 IRQ_TYPE_EDGE_FALLING>;

				};

			};

		};





		gsbi@12440000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;



			i2c@12460000 {

				status = "okay";

				clock-frequency = <200000>;

				pinctrl-0 = <&i2c1_pins>;

				pinctrl-names = "default";



				eeprom@52 {

					compatible = "atmel,24c128";

					reg = <0x52>;

					pagesize = <32>;

				};

			};

		};



		gsbi@16500000 {

			status = "ok";

			qcom,mode = <GSBI_PROT_I2C_UART>;



			serial@16540000 {

				status = "ok";



				pinctrl-names = "default";

				pinctrl-0 = <&gsbi6_uart_4pins>;

			};

		};



		gsbi@16600000 {

			status = "ok";

			qcom,mode = <GSBI_PROT_I2C_UART>;

			serial@16640000 {

				status = "ok";

			};

		};



		/* OTG */

		phy@12500000 {

			status		= "okay";

			vddcx-supply	= <&pm8921_s3>;

			v3p3-supply	= <&pm8921_l3>;

			v1p8-supply	= <&pm8921_l4>;

		};



		gadget@12500000 {

			status = "okay";

		};



		/* OTG */

		usb@12500000 {

			status = "okay";

		};



		amba {

			/* eMMC */

			sdcc@12400000 {

				status = "okay";

				vmmc-supply = <&pm8921_l5>;

				vqmmc-supply = <&pm8921_s4>;

			};

		};

	};

};

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

+27 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,18 @@ 
					bias-disable;

					bias-disable;

				};

				};

			};

			};



			pcie_pins: pcie_pinmux {

				mux {

					pins = "gpio27";

					function = "gpio";

				};

				conf {

					pins = "gpio27";

					drive-strength = <12>;

					bias-disable;

				};

			};

		};

		};





		rpm@108000 {

		rpm@108000 {
@@ -103,6 +115,11 @@ 
					regulator-max-microvolt = <1900000>;

					regulator-max-microvolt = <1900000>;

					bias-pull-down;

					bias-pull-down;

				};

				};



				pm8921_lvs6: lvs6 {

					bias-pull-down;

				};



			};

			};

		};

		};
@@ -195,6 +212,16 @@ 
			};

			};

		};

		};





		pci@1b500000 {

			status = "ok";

			vdda-supply = <&pm8921_s3>;

			vdda_phy-supply = <&pm8921_lvs6>;

			vdda_refclk-supply = <&v3p3_fixed>;

			pinctrl-0 = <&pcie_pins>;

			pinctrl-names = "default";

			perst-gpio = <&tlmm_pinmux 27 GPIO_ACTIVE_LOW>;

		};



		amba {

		amba {

			/* eMMC */

			/* eMMC */

			sdcc1: sdcc@12400000 {

			sdcc1: sdcc@12400000 {