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

Commit a35306d3 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

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

- for all of Samsung SoCs
  : use generic power domain bindings
  : add 'dr_mode' property for hsotg/dwc2 devices

- exynos3250-rinato and exynos3250-monk
  : add regulator-haptic

- exynos5422-odroidxu3
  : reduce total RAM by 22 MiB because last 22 MiB
    for secure monitor cannot be accessed by kernel
  : add on-board INA231 sensors and LDO26 of PMIC
    for the sensors

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

:
  ARM: dts: reduce total RAM by 22 MiB for exynos5422-odroidxu3
  ARM: dts: add on-board INA231 sensors for exynos5422-odroidxu3
  ARM: dts: Add regulator-haptic node for exynos3250-monk
  ARM: dts: Add regulator-haptic node for exynos3250-rinato
  ARM: dts: add 'dr_mode' property to hsotg devices for exynos boards
  ARM: dts: convert to generic power domain bindings for exynos DT

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1e4cd7e5 6591a02e

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Optional Properties: 
		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.



Node of a device using power domains must have a samsung,power-domain property

Node of a device using power domains must have a power-domains property

defined with a phandle to respective power domain.



Example:

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

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Required properties: 
	       Exynos4 SoCs, there needs no "master" clock.

	       Exynos5 SoCs, some System MMUs must have "master" clocks.

- clocks: Required if the System MMU is needed to gate its clock.

- samsung,power-domain: Required if the System MMU is needed to gate its power.

- 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
@@ -54,7 +54,7 @@ Examples: 
		compatible = "samsung,exynos5-gsc";

		reg = <0x13e00000 0x1000>;

		interrupts = <0 85 0>;

		samsung,power-domain = <&pd_gsc>;

		power-domains = <&pd_gsc>;

		clocks = <&clock CLK_GSCL0>;

		clock-names = "gscl";

	};
@@ -66,5 +66,5 @@ Examples: 
		interrupts = <2 0>;

		clock-names = "sysmmu", "master";

		clocks = <&clock CLK_SMMU_GSCL0>, <&clock CLK_GSCL0>;

		samsung,power-domain = <&pd_gsc>;

		power-domains = <&pd_gsc>;

	};

Documentation/devicetree/bindings/media/s5p-mfc.txt

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Required properties: 
		    for DMA contiguous memory allocation and its size.



Optional properties:

  - samsung,power-domain : power-domain property defined with a phandle

  - power-domains : power-domain property defined with a phandle

			   to respective power domain.



Example:
@@ -38,7 +38,7 @@ mfc: codec@13400000 { 
	compatible = "samsung,mfc-v5";

	reg = <0x13400000 0x10000>;

	interrupts = <0 94 0>;

	samsung,power-domain = <&pd_mfc>;

	power-domains = <&pd_mfc>;

	clocks = <&clock 273>;

	clock-names = "mfc";

};

Documentation/devicetree/bindings/video/exynos_dsim.txt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Required properties: 
    according to DSI host bindings (see MIPI DSI bindings [1])



Optional properties:

  - samsung,power-domain: a phandle to DSIM power domain node

  - power-domains: a phandle to DSIM power domain node



Child nodes:

  Should contain DSI peripheral nodes (see MIPI DSI bindings [1]).
@@ -53,7 +53,7 @@ Example: 
		phy-names = "dsim";

		vddcore-supply = <&vusb_reg>;

		vddio-supply = <&vmipi_reg>;

		samsung,power-domain = <&pd_lcd0>;

		power-domains = <&pd_lcd0>;

		#address-cells = <1>;

		#size-cells = <0>;

		samsung,pll-clock-frequency = <24000000>;

Documentation/devicetree/bindings/video/samsung-fimd.txt

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Required properties: 
               property. Must contain "sclk_fimd" and "fimd".



Optional Properties:

- samsung,power-domain: a phandle to FIMD power domain node.

- power-domains: a phandle to FIMD power domain node.

- samsung,invert-vden: video enable signal is inverted

- samsung,invert-vclk: video clock signal is inverted

- display-timings: timing settings for FIMD, as described in document [1].
@@ -97,7 +97,7 @@ SoC specific DT entry: 
		interrupts = <11 0>, <11 1>, <11 2>;

		clocks = <&clock 140>, <&clock 283>;

		clock-names = "sclk_fimd", "fimd";

		samsung,power-domain = <&pd_lcd0>;

		power-domains = <&pd_lcd0>;

		status = "disabled";

	};