Commit 516561a5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt' of... 

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

Samsung DT updates for v3.15 from Kukjin Kim:

For exynos4412
- update vdd_arm voltage range for odroidx board

For exynos5250
- add PMU sysreg node and update watchdog node
- re-organize RTC status
- add max77686 pmic node for smdk5250

For exynos5420
- add PMU sysreg, i2s, adma and watchdog nodes
- re-organize RTC status
- add fixed voltage regulators and regulator nodes
  for smdk5420
- add PMIC, GPIO based wake up key and vmmc-supply
  support for arndale-octa board

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

:
  ARM: dts: Add vmmc-supply to MMC on arndale-octa board
  ARM: dts: Add wake up key to arndale-octa board
  ARM: dts: Add PMIC support to arndale-octa board
  ARM: dts: Add fixed voltage regulators to smdk5420
  ARM: dts: Add I2S nodes to exynos5420
  ARM: dts: Add ADMA node to exynos5420
  ARM: dts: Re-organize RTC status for exynos5250
  ARM: dts: Re-organize RTC status for exynos5420
  ARM: dts: Add regulator entries to smdk5420
  ARM: dts: add max77686 pmic node for smdk5250
  ARM: dts: update vdd_arm voltage range for exynos4412 based boards
  ARM: dts: update watchdog device nodes for exynos5250 and exynos5420
  ARM: dts: Add pmu sysreg node to exynos5250 and exynos5420

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 20bb4685 d726ca2d

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
SAMSUNG Exynos SoC series PMU Registers



Properties:

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

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

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

		second value must be always "syscon".



 - reg : offset and length of the register set.



Example :

pmu_system_controller: system-controller@10040000 {

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

	reg = <0x10040000 0x5000>;

};

arch/arm/boot/dts/exynos4412-odroidx.dts

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ 
				buck2_reg: BUCK2 {

					regulator-name = "vdd_arm";

					regulator-min-microvolt = <900000>;

					regulator-max-microvolt = <1300000>;

					regulator-max-microvolt = <1350000>;

					regulator-always-on;

					regulator-boot-on;

				};

arch/arm/boot/dts/exynos4412-origen.dts

+2 −2
Original line number Diff line number Diff line
@@ -459,8 +459,8 @@ 


				buck2_reg: BUCK2 {

					regulator-name = "vdd_arm";

					regulator-min-microvolt = <925000>;

					regulator-max-microvolt	= <1300000>;

					regulator-min-microvolt = <900000>;

					regulator-max-microvolt	= <1350000>;

					regulator-always-on;

					regulator-boot-on;

					op_mode = <1>; /* Normal Mode */

arch/arm/boot/dts/exynos5.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -81,13 +81,6 @@ 
		status = "disabled";

	};



	watchdog {

		compatible = "samsung,s3c2410-wdt";

		reg = <0x101D0000 0x100>;

		interrupts = <0 42 0>;

		status = "disabled";

	};



	fimd@14400000 {

		compatible = "samsung,exynos5250-fimd";

		interrupt-parent = <&combiner>;

arch/arm/boot/dts/exynos5250-arndale.dts

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
		bootargs = "console=ttySAC2,115200";

	};



	rtc@101E0000 {

		status = "okay";

	};



	codec@11000000 {

		samsung,mfc-r = <0x43000000 0x800000>;

		samsung,mfc-l = <0x51000000 0x800000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE