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

Commit 2652fbde authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt' of... 

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

From Kukjin Kim:
Samsung DT updates for v3.14
- Add support Octa Cores for exynos5420
  : populate CPU node entries to 8 Cores
  : extend mct to support 8 local interrupts
- Update dwmmc nodes for exynos5250 and exynos5420
  : change status property of dwmmc nodes for exynos5250
  : move dwmmc nodes from exynos5 to exynos5250 because
    it's different between exynos5250 and exynos5420
  : rename mmc nodes from dwmmc for exynos5 SoCs
  : add dwmmc nodes for exynos5420
- Add G-Scaler nodes for exynos5420
- Add HS-i2c nodes in exynos5420
  : High Speed I2C 7 channels (4 to 10)
- Update sysreg binding and node name in exynos4
- Update min voltage on exynos5250-arndale
- Move fifo-depth property from boards to exynos5250 SoC
  : because the fifo-depth property is SoC specific

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

:
  ARM: dts: Update Samsung sysreg binding document
  ARM: dts: Fix sysreg node name in exynos4.dtsi
  ARM: dts: Add hs-i2c nodes to exynos5420
  ARM: dts: Update min voltage for vdd_arm on Arndale
  ARM: dts: populate cpu node entries to 8 cpus for exynos5420
  clocksource: mct: extend mct to support 8 local interrupts for Exynos5420
  ARM: dts: Add device nodes for GScaler blocks for exynos5420
  ARM: dts: Add dwmmc DT nodes for exynos5420 SOC
  ARM: dts: rename mmc dts node for exynos5 series
  ARM: dts: Move fifo-depth property from exynos5250 board dts
  ARM: dts: change status property of dwmmc nodes for exynos5250
  ARM: dts: Move dwmmc nodes from exynos5.dtsi to exynos5250.dtsi

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 448e7ede e0b51c2e

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

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



Properties:

 - name : should be 'sysreg';

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

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

 - reg : offset and length of the register set.



Example:

	syscon@10010000 {

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

		reg = <0x10010000 0x400>;

	};

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ Required Properties: 
	  specific extensions.

	- "samsung,exynos5250-dw-mshc": for controllers with Samsung Exynos5250

	  specific extensions.

	- "samsung,exynos5420-dw-mshc": for controllers with Samsung Exynos5420

	  specific extensions.



* samsung,dw-mshc-ciu-div: Specifies the divider value for the card interface

  unit (ciu) clock. This property is applicable only for Exynos5 SoC's and

arch/arm/boot/dts/cros5250-common.dtsi

+4 −7
Original line number Diff line number Diff line
@@ -241,11 +241,10 @@ 
		};

	};



	dwmmc0@12200000 {

	mmc@12200000 {

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -259,14 +258,13 @@ 
		};

	};



	dwmmc1@12210000 {

	mmc@12210000 {

		status = "disabled";

	};



	dwmmc2@12220000 {

	mmc@12220000 {

		num-slots = <1>;

		supports-highspeed;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -281,11 +279,10 @@ 
		};

	};



	dwmmc3@12230000 {

	mmc@12230000 {

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

arch/arm/boot/dts/exynos4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
		reg = <0x10440000 0x1000>;

	};



	sys_reg: sysreg {

	sys_reg: syscon@10010000 {

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

		reg = <0x10010000 0x400>;

	};

arch/arm/boot/dts/exynos5.dtsi

+0 −21
Original line number Diff line number Diff line
@@ -50,27 +50,6 @@ 
		interrupts = <1 9 0xf04>;

	};



	dwmmc_0: dwmmc0@12200000 {

		compatible = "samsung,exynos5250-dw-mshc";

		interrupts = <0 75 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	dwmmc_1: dwmmc1@12210000 {

		compatible = "samsung,exynos5250-dw-mshc";

		interrupts = <0 76 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	dwmmc_2: dwmmc2@12220000 {

		compatible = "samsung,exynos5250-dw-mshc";

		interrupts = <0 77 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	serial@12C00000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0x12C00000 0x100>;