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

Commit 99b6eb55 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Samsung 2nd DT updates for v4.4

- use exynos5420-dw-mshc instead of exynos5250 for exynos3250
- add DISP1 clocks and the DISP1 power domain of two closk
  on exynos5250 (clock commit got Stephen's ack)
- add vbus regulators on exynos3250, exynos4210 and exynos4412 boards
- fix typo in regulator enable GPIO property on s5pv20-aquila and goni
- document: correct the example of exynos power domain clocks
- document: consolidate exynos SoC dt-bindings and non-Samsung
  boards related compatibles (FriendlyARM, Google, Hardkernel
  and Insignal)
- update MAINTAINER entries accordingly (documentation)

* tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  MAINTAINERS: Add documentation and dt-bindings for exynos stuff
  dt-bindings: EXYNOS: Document compatibles from other vendors
  dt-bindings: Consolidate Exynos SoC bindings
  ARM: dts: Add clocks to DISP1 domain in exynos5250
  dt-bindings: Correct the example for Exynos power domain clocks
  ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-goni
  ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-aquila
  ARM: dts: Add vbus regulator to USB2 phy nodes on exynos3250, exynos4210 and exynos4412 boards
  clk: samsung: exynos5250: Add DISP1 clocks
  ARM: dts: use exynos5420-dw-mshc compatible for exynos3250

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3eb52a06 d6b9aea6

Documentation/devicetree/bindings/arm/samsung-boards.txt→Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+69 −0
Original line number Diff line number Diff line
@@ -16,7 +16,49 @@ Required root node properties: 
	- "samsung,sd5v1"	- for Exynos5440-based Samsung board.

	- "samsung,ssdk5440"	- for Exynos5440-based Samsung board.



Optional:

* Other companies Exynos SoC based

  * FriendlyARM

	- "friendlyarm,tiny4412"  - for Exynos4412-based FriendlyARM

				    TINY4412 board.



  * Google

	- "google,pi"		- for Exynos5800-based Google Peach Pi

				  Rev 10+ board,

	  also: "google,pi-rev16", "google,pi-rev15", "google,pi-rev14",

		"google,pi-rev13", "google,pi-rev12", "google,pi-rev11",

		"google,pi-rev10", "google,peach".



	- "google,pit"		- for Exynos5420-based Google Peach Pit

				  Rev 6+ (Exynos5420),

	  also: "google,pit-rev16", "google,pit-rev15", "google,pit-rev14",

		"google,pit-rev13", "google,pit-rev12", "google,pit-rev11",

		"google,pit-rev10", "google,pit-rev9", "google,pit-rev8",

		"google,pit-rev7", "google,pit-rev6", "google,peach".



	- "google,snow-rev4"	- for Exynos5250-based Google Snow board,

	  also: "google,snow"

	- "google,snow-rev5"	- for Exynos5250-based Google Snow

				  Rev 5+ board.

	- "google,spring"	- for Exynos5250-based Google Spring board.



  * Hardkernel

	- "hardkernel,odroid-u3"  - for Exynos4412-based Hardkernel Odroid U3.

	- "hardkernel,odroid-x"   - for Exynos4412-based Hardkernel Odroid X.

	- "hardkernel,odroid-x2"  - for Exynos4412-based Hardkernel Odroid X2.

	- "hardkernel,odroid-xu3" - for Exynos5422-based Hardkernel Odroid XU3.

	- "hardkernel,odroid-xu3-lite" - for Exynos5422-based Hardkernel

					 Odroid XU3 Lite board.

	- "hardkernel,odroid-xu4" - for Exynos5422-based Hardkernel Odroid XU4.



  * Insignal

	- "insignal,arndale"      - for Exynos5250-based Insignal Arndale board.

	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

				    Octa board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen4412    - for Exynos4412-based Insignal Origen board.





Optional nodes:

    - firmware node, specifying presence and type of secure firmware:

        - compatible: only "samsung,secure-firmware" is currently supported

        - reg: address of non-secure SYSRAM used for communication with firmware

Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ Required properties: 
- clocks: Required if the System MMU is needed to gate its clock.

- power-domains: Required if the System MMU is needed to gate its power.

	  Please refer to the following document:

	  Documentation/devicetree/bindings/arm/exynos/power_domain.txt

	  Documentation/devicetree/bindings/power/pd-samsung.txt



Examples:

	gsc_0: gsc@13e00000 {

Documentation/devicetree/bindings/arm/exynos/power_domain.txt→Documentation/devicetree/bindings/power/pd-samsung.txt

+2 −3
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ Example: 
	mfc_pd: power-domain@10044060 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044060 0x20>;

		clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_SW_ACLK333>,

			<&clock CLK_MOUT_USER_ACLK333>;

		clock-names = "oscclk", "pclk0", "clk0";

		clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_USER_ACLK333>;

		clock-names = "oscclk", "clk0";

		#power-domain-cells = <0>;

	};

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1450,6 +1450,10 @@ F: drivers/*/*s3c2410* 
F:	drivers/*/*/*s3c2410*

F:	drivers/spi/spi-s3c*

F:	sound/soc/samsung/*

F:	Documentation/arm/Samsung/

F:	Documentation/devicetree/bindings/arm/samsung/

F:	Documentation/devicetree/bindings/sram/samsung-sram.txt

F:	Documentation/devicetree/bindings/power/pd-samsung.txt

N:	exynos



ARM/SAMSUNG MOBILE MACHINE SUPPORT

arch/arm/boot/dts/exynos3250-monk.dts

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 
};



&exynos_usbphy {

	vbus-supply = <&safeout_reg>;

	status = "okay";

};