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

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

Merge tag 'qcom-dt-for-3.18-3' of... 

Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into fixes

Merge "qcom DT changes for v3.18-3" from Kumar Gala:

Qualcomm ARM Based Device Tree Updates for v3.18-3

* Added Board support for CM-QS600 and Sony Xperia Z1 phone
* Added SATA support on IPQ8064/AP148

* tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: add CM-QS600 board
  ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
  ARM: dts: qcom: Add SATA support on IPQ8064/AP148
parents e29c6486 7dac24bd

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,7 @@ sitronix Sitronix Technology Corporation 
smsc	Standard Microsystems Corporation

smsc	Standard Microsystems Corporation

snps 	Synopsys, Inc.

snps 	Synopsys, Inc.

solidrun	SolidRun

solidrun	SolidRun

sony	Sony Corporation

spansion	Spansion Inc.

spansion	Spansion Inc.

st	STMicroelectronics

st	STMicroelectronics

ste	ST-Ericsson

ste	ST-Ericsson

arch/arm/boot/dts/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -354,13 +354,15 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \ 
	orion5x-rd88f5182-nas.dtb

	orion5x-rd88f5182-nas.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_QCOM) += \

dtb-$(CONFIG_ARCH_QCOM) += \

	qcom-apq8064-cm-qs600.dtb \

	qcom-apq8064-ifc6410.dtb \

	qcom-apq8064-ifc6410.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 \

	qcom-ipq8064-ap148.dtb \

	qcom-ipq8064-ap148.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb

	qcom-msm8960-cdp.dtb \

	qcom-msm8974-sony-xperia-honami.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rk3066a-bqcurie2.dtb \

	rk3066a-bqcurie2.dtb \

	rk3188-radxarock.dtb \

	rk3188-radxarock.dtb \

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

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



/ {

	model = "CompuLab CM-QS600";

	compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064";



	soc {

		pinctrl@800000 {

			i2c1_pins: i2c1 {

				mux {

					pins = "gpio20", "gpio21";

					function = "gsbi1";

				};

			};

		};



		gsbi@12440000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_I2C>;



			i2c@12460000 {

				status = "okay";

				clock-frequency = <200000>;

				pinctrl-0 = <&i2c1_pins>;

				pinctrl-names = "default";



				eeprom: eeprom@50 {

					compatible = "24c02";

					reg = <0x50>;

					pagesize = <32>;

				};

			};

		};



		gsbi@16600000 {

			status = "ok";

			qcom,mode = <GSBI_PROT_I2C_UART>;

			serial@16640000 {

				status = "ok";

			};

		};



		amba {

			/* eMMC */

			sdcc1: sdcc@12400000 {

				status = "okay";

			};



			/* External micro SD card */

			sdcc3: sdcc@12180000 {

				status = "okay";

			};

			/* WLAN */

			sdcc4: sdcc@121c0000 {

				status = "okay";

			};

		};

	};

};

arch/arm/boot/dts/qcom-ipq8064-ap148.dts

+8 −0
Original line number Original line Diff line number Diff line
@@ -81,5 +81,13 @@ 
				};

				};

			};

			};

		};

		};



		sata-phy@1b400000 {

			status = "ok";

		};



		sata@29000000 {

			status = "ok";

		};

	};

	};

};
 
};

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

+33 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,39 @@ 
			};

			};

		};

		};





		sata_phy: sata-phy@1b400000 {

			compatible = "qcom,ipq806x-sata-phy";

			reg = <0x1b400000 0x200>;



			clocks = <&gcc SATA_PHY_CFG_CLK>;

			clock-names = "cfg";



			#phy-cells = <0>;

			status = "disabled";

		};



		sata@29000000 {

			compatible = "qcom,ipq806x-ahci", "generic-ahci";

			reg = <0x29000000 0x180>;



			interrupts = <0 209 0x0>;



			clocks = <&gcc SFAB_SATA_S_H_CLK>,

				 <&gcc SATA_H_CLK>,

				 <&gcc SATA_A_CLK>,

				 <&gcc SATA_RXOOB_CLK>,

				 <&gcc SATA_PMALIVE_CLK>;

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

					"rxoob", "pmalive";



			assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>;

			assigned-clock-rates = <100000000>, <100000000>;



			phys = <&sata_phy>;

			phy-names = "sata-phy";

			status = "disabled";

		};



		qcom,ssbi@500000 {

		qcom,ssbi@500000 {

			compatible = "qcom,ssbi";

			compatible = "qcom,ssbi";

			reg = <0x00500000 0x1000>;

			reg = <0x00500000 0x1000>;