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

Commit 81d1d392 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-2' of... 

Merge tag 'samsung-dt-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "Samsung 2nd DT updates for v3.16" from Kukjin Kim:

exynos4
 - add hsotg device, exynos_usbphy nodes
 - add PMU syscon and audio subsystem nodes
 - replace number by macro in clock binding

exynos4210-universal_c210
 - add external sd card node and multimedia nodes
 - enable USB functionality

exynos4412-trats2
 - enable usb nodes and usb gagdet functionality
 - add cm36651 light/proximity sensor node
 - fixed gpio key node

exynos5250 and exynos5420
 - add pmu syscon handle and sysreg system controller nodes
 - add support for usb2phy
 - replace number by macro in clock binding
 - add USB 2.0 support on exynos5420

exynos5420-peach-pit
 - move dp hpd gpio pin to pinctrl_0

* tag 'samsung-dt-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (21 commits)
  ARM: dts: enable usb nodes for exynos4412-trats2
  ARM: dts: add hsotg device node for exynos4
  ARM: dts: add exynos_usbphy node for exynos4
  ARM: dts: add PMU syscon node for exynos4
  ARM: dts: add pmu syscon handle to exynos5420 hdmi
  ARM: dts: add pmu syscon handle to exynos5250 hdmi
  ARM: dts: replace number by macro in clock binding for exynos5420
  ARM: dts: replace number by macro in clock binding for exynos5250
  ARM: dts: replace number by macro in clock binding for exynos4
  ARM: dts: add external sd card node for exynos4210-universal_c210
  ARM: dts: add multimedia nodes for exynos4210-universal_c210
  ARM: dts: enable USB functionality for exynos4210-universal_c210
  ARM: dts: Enable USB gadget functionality for exynos4210-trats
  ARM: dts: Add audio subsystem nodes to exynos4.dtsi
  ARM: dts: fixed gpio key node for exynos4412-trats2
  ARM: dts: add cm36651 light/proximity sensor node for exynos4412-trats2
  ARM: dts: Add USB 2.0 support on exynos5420
  ARM: dts: Add usb2phy support on exynos5420
  ARM: dts: Add usb2phy to exynos5250
  ARM: dts: Add sysreg sytem controller node to exynos5250 and exynos5420
  ...
parents 87427db9 3c8977f1

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ SAMSUNG Exynos SoC series PMU Registers 


Properties:

 - compatible : should contain two values. First value must be one from following list:

		   - "samsung,exynos4210-pmu" - for Exynos4210 SoC,

		   - "samsung,exynos4212-pmu" - for Exynos4212 SoC,

		   - "samsung,exynos4412-pmu" - for Exynos4412 SoC,

		   - "samsung,exynos5250-pmu" - for Exynos5250 SoC,

		   - "samsung,exynos5420-pmu" - for Exynos5420 SoC.

		second value must be always "syscon".

Documentation/devicetree/bindings/arm/samsung/sysreg.txt

+9 −2
Original line number Diff line number Diff line 
SAMSUNG S5P/Exynos SoC series System Registers (SYSREG)



Properties:

 - compatible : should contain "samsung,<chip name>-sysreg", "syscon";

   For Exynos4 SoC series it should be "samsung,exynos4-sysreg", "syscon";

 - compatible : should contain two values. First value must be one from following list:

		- "samsung,exynos4-sysreg" - for Exynos4 based SoCs,

		- "samsung,exynos5-sysreg" - for Exynos5 based SoCs.

		second value must be always "syscon".

 - reg : offset and length of the register set.



Example:
@@ -10,3 +12,8 @@ Example: 
		compatible = "samsung,exynos4-sysreg", "syscon";

		reg = <0x10010000 0x400>;

	};



	syscon@10050000 {

		compatible = "samsung,exynos5-sysreg", "syscon";

		reg = <0x10050000 0x5000>;

	};

arch/arm/boot/dts/exynos4.dtsi

+65 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */



#include <dt-bindings/clock/exynos4.h>

#include <dt-bindings/clock/exynos-audss-clk.h>

#include "skeleton.dtsi"



/ {
@@ -45,6 +46,23 @@ 
		fimc3 = &fimc_3;

	};



	clock_audss: clock-controller@03810000 {

		compatible = "samsung,exynos4210-audss-clock";

		reg = <0x03810000 0x0C>;

		#clock-cells = <1>;

	};



	i2s0: i2s@03830000 {

		compatible = "samsung,s5pv210-i2s";

		reg = <0x03830000 0x100>;

		clocks = <&clock_audss EXYNOS_I2S_BUS>;

		clock-names = "iis";

		dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;

		dma-names = "tx", "rx", "tx-sec";

		samsung,idma-addr = <0x03000000>;

		status = "disabled";

	};



	chipid@10000000 {

		compatible = "samsung,exynos4210-chipid";

		reg = <0x10000000 0x100>;
@@ -110,6 +128,11 @@ 
		reg = <0x10010000 0x400>;

	};



	pmu_system_controller: system-controller@10020000 {

		compatible = "samsung,exynos4210-pmu", "syscon";

		reg = <0x10020000 0x4000>;

	};



	dsi_0: dsi@11C80000 {

		compatible = "samsung,exynos4210-mipi-dsi";

		reg = <0x11C80000 0x10000>;
@@ -117,7 +140,7 @@ 
		samsung,power-domain = <&pd_lcd0>;

		phys = <&mipi_phy 1>;

		phy-names = "dsim";

		clocks = <&clock 286>, <&clock 143>;

		clocks = <&clock CLK_DSIM0>, <&clock CLK_SCLK_MIPI0>;

		clock-names = "bus_clk", "pll_clk";

		status = "disabled";

		#address-cells = <1>;
@@ -271,6 +294,27 @@ 
		status = "disabled";

	};



	exynos_usbphy: exynos-usbphy@125B0000 {

		compatible = "samsung,exynos4210-usb2-phy";

		reg = <0x125B0000 0x100>;

		samsung,pmureg-phandle = <&pmu_system_controller>;

		clocks = <&clock CLK_USB_DEVICE>, <&clock CLK_XUSBXTI>;

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

		#phy-cells = <1>;

		status = "disabled";

	};



	hsotg@12480000 {

		compatible = "samsung,s3c6400-hsotg";

		reg = <0x12480000 0x20000>;

		interrupts = <0 71 0>;

		clocks = <&clock CLK_USB_DEVICE>;

		clock-names = "otg";

		phys = <&exynos_usbphy 0>;

		phy-names = "usb2-phy";

		status = "disabled";

	};



	ehci@12580000 {

		compatible = "samsung,exynos4210-ehci";

		reg = <0x12580000 0x100>;
@@ -289,6 +333,26 @@ 
		status = "disabled";

	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";

		dmas = <&pdma1 12>, <&pdma1 11>;

		dma-names = "tx", "rx";

		status = "disabled";

	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";

		dmas = <&pdma0 14>, <&pdma0 13>;

		dma-names = "tx", "rx";

		status = "disabled";

	};



	mfc: codec@13400000 {

		compatible = "samsung,mfc-v5";

		reg = <0x13400000 0x10000>;

arch/arm/boot/dts/exynos4210-trats.dts

+10 −0
Original line number Diff line number Diff line
@@ -88,6 +88,12 @@ 
		};

	};



	hsotg@12480000 {

		vusb_d-supply = <&vusb_reg>;

		vusb_a-supply = <&vusbdac_reg>;

		status = "okay";

	};



	sdhci_emmc: sdhci@12510000 {

		bus-width = <8>;

		non-removable;
@@ -97,6 +103,10 @@ 
		status = "okay";

	};



	exynos-usbphy@125B0000 {

		status = "okay";

	};



	serial@13800000 {

		status = "okay";

	};

arch/arm/boot/dts/exynos4210-universal_c210.dts

+59 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ 
		enable-active-high;

	};



	hsotg@12480000 {

		vusb_d-supply = <&ldo3_reg>;

		vusb_a-supply = <&ldo8_reg>;

		status = "okay";

	};



	sdhci_emmc: sdhci@12510000 {

		bus-width = <8>;

		non-removable;
@@ -77,6 +83,34 @@ 
		status = "okay";

	};



	sdhci_sd: sdhci@12530000 {

		bus-width = <4>;

		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;

		pinctrl-names = "default";

		vmmc-supply = <&ldo5_reg>;

		cd-gpios = <&gpx3 4 0>;

		cd-inverted;

		status = "okay";

	};



	ehci@12580000 {

		status = "okay";

		port@0 {

			status = "okay";

		};

	};



	ohci@12590000 {

		status = "okay";

		port@0 {

			status = "okay";

		};

	};



	exynos-usbphy@125B0000 {

		status = "okay";

	};



	serial@13800000 {

		status = "okay";

	};
@@ -216,6 +250,7 @@ 
					regulator-name = "VUSB+MIPI_1.1V";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				ldo4_reg: LDO4 {
@@ -246,6 +281,7 @@ 
					regulator-name = "VUSB+VDAC_3.3V";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				ldo9_reg: LDO9 {
@@ -428,6 +464,29 @@ 
		compatible = "samsung,s5p6440-pwm";

		status = "okay";

	};



	camera {

		status = "okay";



		pinctrl-names = "default";

		pinctrl-0 = <>;



		fimc_0: fimc@11800000 {

			status = "okay";

		};



		fimc_1: fimc@11810000 {

			status = "okay";

		};



		fimc_2: fimc@11820000 {

			status = "okay";

		};



		fimc_3: fimc@11830000 {

			status = "okay";

		};

	};

};



&mdma1 {