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

Commit dee1c20c 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.16

- exynos4
  : add missing pinctrls

- exynos4412-trats2
  : update camera nodes and add rear camera nodes
  : rename alias for i2c_ak8975 label
  Update camera nodes for exynos4 and exynos4412-trats2

- exynos5250
  : update DWC3 usb controller and enable to use generic USB DRD phy

- exynos5250-snow
  : enable dp-controller, fimd, hdmi and pwm backlight
  : add sound node and Vbus regulator for USB 3.0
  : add tps65090 power regulator
  : add pinctrl for EC irq and i2c-arbitrator

- exynos5420
  : change to correct compatible string for hdmi
  : add PD entry to MFC codec and enable DWC3 and USB 3.0 PHY
  : add MFC memory banks for smdk5420 and arndale-octa boards

- exynos5420-peach-pit
  : add support exynos5420 based peach-pit board
  : add sound node and Vbus regulatro for USB 3.0
  : enable dp-controller, fimd
- exynos5420-smdk5420
  : add Vbus regulatro for USB 3.0

- use generic DT bindings for map SYSRAM

[olof: Fixed up conflict with a fix for 4212 secondary CPU startup, carrying
over the fix to the reworked code]

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

: (32 commits)
  ARM: dts: Add MFC memory banks to exynos5420 boards
  ARM: dts: enable dp-controller for exynos5420-peach-pit board
  ARM: dts: enable fimd for exynos5420 based peach-pit board
  ARM: dts: enable dp-controller for exynos5250-snow board
  ARM: dts: enable fimd for exynos5250-snow board
  ARM: dts: enable pwm backlight for exynos5250-snow
  ARM: dts: Add pwmX_out pinctrl nodes to exynos5250
  ARM: dts: Add Vbus regulator for USB 3.0 on exynos5420-smdk5420
  ARM: dts: Add Vbus regulator for USB 3.0 on exynos5420-peach-pit
  ARM: dts: Add Vbus regulator for USB 3.0 on exynos5250-snow
  ARM: dts: Add PD entry to MFC codec on exynos5420
  ARM: dts: Add sound node for exynos5420-peach-pit board
  ARM: dts: Add sound node for exynos5250-snow board
  ARM: dts: Update DWC3 usb controller to use new phy driver for exynos5250
  ARM: dts: Enable support for generic USB DRD phy for exynos5250
  ARM: dts: Enable support for DWC3 controller for exynos5420
  ARM: dts: Enable support for USB 3.0 PHY controller for exynos5420
  ARM: dts: enable hdmi for exynos5420-peach-pit board
  ARM: dts: change to correct compatible string for exynos5420 hdmi
  ARM: dts: enable hdmi for exynos5250 based snow board
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 89f6dfac b5839bd8

Documentation/devicetree/bindings/arm/exynos/smp-sysram.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
Samsung Exynos SYSRAM for SMP bringup:

------------------------------------



Samsung SMP-capable Exynos SoCs use part of the SYSRAM for the bringup

of the secondary cores. Once the core gets powered up it executes the

code that is residing at some specific location of the SYSRAM.



Therefore reserved section sub-nodes have to be added to the mmio-sram

declaration. These nodes are of two types depending upon secure or

non-secure execution environment.



Required sub-node properties:

- compatible : depending upon boot mode, should be

		"samsung,exynos4210-sysram" : for Secure SYSRAM

		"samsung,exynos4210-sysram-ns" : for Non-secure SYSRAM



The rest of the properties should follow the generic mmio-sram discription

found in ../../misc/sysram.txt



Example:



	sysram@02020000 {

		compatible = "mmio-sram";

		reg = <0x02020000 0x54000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x02020000 0x54000>;



		smp-sysram@0 {

			compatible = "samsung,exynos4210-sysram";

			reg = <0x0 0x1000>;

		};



		smp-sysram@53000 {

			compatible = "samsung,exynos4210-sysram-ns";

			reg = <0x53000 0x1000>;

		};

	};

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -844,6 +844,7 @@ config ARCH_EXYNOS 
	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	select SRAM

	select USE_OF

	help

	  Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ 
	exynos5250-smdk5250.dtb \

	exynos5250-snow.dtb \

	exynos5420-arndale-octa.dtb \

	exynos5420-peach-pit.dtb \

	exynos5420-smdk5420.dtb \

	exynos5440-sd5v1.dtb \

	exynos5440-ssdk5440.dtb

arch/arm/boot/dts/exynos4.dtsi

+14 −4
Original line number Diff line number Diff line
@@ -129,11 +129,9 @@ 
		status = "disabled";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		clock_cam: clock-controller {

		#clock-cells = <1>;

		};

		clock-output-names = "cam_a_clkout", "cam_b_clkout";

		ranges;



		fimc_0: fimc@11800000 {

			compatible = "samsung,exynos4210-fimc";
@@ -371,6 +369,8 @@ 
		interrupts = <0 60 0>;

		clocks = <&clock CLK_I2C2>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c2_bus>;

		status = "disabled";

	};
@@ -382,6 +382,8 @@ 
		interrupts = <0 61 0>;

		clocks = <&clock CLK_I2C3>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_bus>;

		status = "disabled";

	};
@@ -393,6 +395,8 @@ 
		interrupts = <0 62 0>;

		clocks = <&clock CLK_I2C4>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c4_bus>;

		status = "disabled";

	};
@@ -404,6 +408,8 @@ 
		interrupts = <0 63 0>;

		clocks = <&clock CLK_I2C5>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c5_bus>;

		status = "disabled";

	};
@@ -415,6 +421,8 @@ 
		interrupts = <0 64 0>;

		clocks = <&clock CLK_I2C6>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c6_bus>;

		status = "disabled";

	};
@@ -426,6 +434,8 @@ 
		interrupts = <0 65 0>;

		clocks = <&clock CLK_I2C7>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c7_bus>;

		status = "disabled";

	};

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

+15 −0
Original line number Diff line number Diff line
@@ -28,6 +28,21 @@ 
		bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";

	};



	sysram@02020000 {

		smp-sysram@0 {

			status = "disabled";

		};



		smp-sysram@5000 {

			compatible = "samsung,exynos4210-sysram";

			reg = <0x5000 0x1000>;

		};



		smp-sysram@1f000 {

			status = "disabled";

		};

	};



	mct@10050000 {

		compatible = "none";

	};