Commit bba383ee 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 late/all

From Kukjin Kim:
Update exynos DT:
- fix the RTC DT node name for exynos5250
- update the "status" property of RTC DT node for exynos5250
- add RTC DT node for  exynos5420
- add ADC DT node for exynos5420 and exynos5250

Based on previouse exynos DT branch, v3.12-next/dt-exynos

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

: (42 commits)
  ARM: dts: add ADC device tree node for exynos5420/5250
  ARM: dts: Add RTC DT node to Exynos5420 SoC
  ARM: dts: Update the "status" property of RTC DT node for Exynos5250 SoC
  ARM: dts: Fix the RTC DT node name for Exynos5250
  ARM: dts: Add USB host node for Exynos4
  ARM: dts: add audio clock controller for exynos5420
  ARM: dts: Correct the /include entry on exynos5420 dtsi file
  ARM: dts: Add MFC node for exynos 5420
  ARM: dts: Update 5250 MFC node
  ARM: dts: Remove unsused MFC clock from exynos4
  ARM: dts: Update clocks entry in MFC binding documentation
  ARM: dts: Hook up internal PHY on Arndale
  ARM: dts: Enable USB hub on Arndale
  ARM: dts: Add secure-firmware boot support for OrigenQaud board
  ARM: dts: Add pin state information for DP HPD support to Exynos5420
  ARM: dts: Add DP controller DT node to exynos5420 SoC
  ARM: dts: Update DP controller DT Node for Exynos5 based SoCs
  ARM: dts: Add FIMD DT node to exynos5420 DTS files
  ARM: dts: Add basic PM domains for EXYNOS5420
  ARM: dts: Update FIMD DT node for Exynos5 SoCs
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 66fafb6f f408f9db

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

+5 −5
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ Required properties: 
	  mapped region.



  - interrupts : MFC interrupt number to the CPU.

  - clocks : from common clock binding: handle to mfc clocks.

  - clock-names : from common clock binding: must contain "sclk_mfc" and "mfc",

		  corresponding to entries in the clocks property.

  - clocks : from common clock binding: handle to mfc clock.

  - clock-names : from common clock binding: must contain "mfc",

		  corresponding to entry in the clocks property.



  - samsung,mfc-r : Base address of the first memory bank used by MFC

		    for DMA contiguous memory allocation and its size.
@@ -37,8 +37,8 @@ mfc: codec@13400000 { 
	reg = <0x13400000 0x10000>;

	interrupts = <0 94 0>;

	samsung,power-domain = <&pd_mfc>;

	clocks = <&clock 170>, <&clock 273>;

	clock-names = "sclk_mfc", "mfc";

	clocks = <&clock 273>;

	clock-names = "mfc";

};



Board specific DT entry:

arch/arm/boot/dts/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -53,13 +53,14 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ 
	exynos4210-trats.dtb \

	exynos4210-universal_c210.dtb \

	exynos4412-odroidx.dtb \

	exynos4412-smdk4412.dtb \

	exynos4412-origen.dtb \

	exynos4412-smdk4412.dtb \

	exynos4412-trats2.dtb \

	exynos5250-arndale.dtb \

	exynos5440-sd5v1.dtb \

	exynos5250-smdk5250.dtb \

	exynos5250-snow.dtb \

	exynos5420-smdk5420.dtb \

	exynos5440-sd5v1.dtb \

	exynos5440-ssdk5440.dtb

dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \

	ecx-2000.dtb

arch/arm/boot/dts/exynos4.dtsi

+114 −8
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ 
		i2c5 = &i2c_5;

		i2c6 = &i2c_6;

		i2c7 = &i2c_7;

		csis0 = &csis_0;

		csis1 = &csis_1;

		fimc0 = &fimc_0;

		fimc1 = &fimc_1;

		fimc2 = &fimc_2;

		fimc3 = &fimc_3;

	};



	chipid@10000000 {
@@ -92,6 +98,88 @@ 
		reg = <0x10010000 0x400>;

	};



	camera {

		compatible = "samsung,fimc", "simple-bus";

		status = "disabled";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		clock_cam: clock-controller {

			 #clock-cells = <1>;

		};



		fimc_0: fimc@11800000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11800000 0x1000>;

			interrupts = <0 84 0>;

			clocks = <&clock 256>, <&clock 128>;

			clock-names = "fimc", "sclk_fimc";

			samsung,power-domain = <&pd_cam>;

			samsung,sysreg = <&sys_reg>;

			status = "disabled";

		};



		fimc_1: fimc@11810000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11810000 0x1000>;

			interrupts = <0 85 0>;

			clocks = <&clock 257>, <&clock 129>;

			clock-names = "fimc", "sclk_fimc";

			samsung,power-domain = <&pd_cam>;

			samsung,sysreg = <&sys_reg>;

			status = "disabled";

		};



		fimc_2: fimc@11820000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11820000 0x1000>;

			interrupts = <0 86 0>;

			clocks = <&clock 258>, <&clock 130>;

			clock-names = "fimc", "sclk_fimc";

			samsung,power-domain = <&pd_cam>;

			samsung,sysreg = <&sys_reg>;

			status = "disabled";

		};



		fimc_3: fimc@11830000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11830000 0x1000>;

			interrupts = <0 87 0>;

			clocks = <&clock 259>, <&clock 131>;

			clock-names = "fimc", "sclk_fimc";

			samsung,power-domain = <&pd_cam>;

			samsung,sysreg = <&sys_reg>;

			status = "disabled";

		};



		csis_0: csis@11880000 {

			compatible = "samsung,exynos4210-csis";

			reg = <0x11880000 0x4000>;

			interrupts = <0 78 0>;

			clocks = <&clock 260>, <&clock 134>;

			clock-names = "csis", "sclk_csis";

			bus-width = <4>;

			samsung,power-domain = <&pd_cam>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};



		csis_1: csis@11890000 {

			compatible = "samsung,exynos4210-csis";

			reg = <0x11890000 0x4000>;

			interrupts = <0 80 0>;

			clocks = <&clock 261>, <&clock 135>;

			clock-names = "csis", "sclk_csis";

			bus-width = <2>;

			samsung,power-domain = <&pd_cam>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

		};

	};



	watchdog@10060000 {

		compatible = "samsung,s3c2410-wdt";

		reg = <0x10060000 0x100>;
@@ -155,13 +243,31 @@ 
		status = "disabled";

	};



	ehci@12580000 {

		compatible = "samsung,exynos4210-ehci";

		reg = <0x12580000 0x100>;

		interrupts = <0 70 0>;

		clocks = <&clock 304>;

		clock-names = "usbhost";

		status = "disabled";

	};



	ohci@12590000 {

		compatible = "samsung,exynos4210-ohci";

		reg = <0x12590000 0x100>;

		interrupts = <0 70 0>;

		clocks = <&clock 304>;

		clock-names = "usbhost";

		status = "disabled";

	};



	mfc: codec@13400000 {

		compatible = "samsung,mfc-v5";

		reg = <0x13400000 0x10000>;

		interrupts = <0 94 0>;

		samsung,power-domain = <&pd_mfc>;

		clocks = <&clock 170>, <&clock 273>;

		clock-names = "sclk_mfc", "mfc";

		clocks = <&clock 273>;

		clock-names = "mfc";

		status = "disabled";

	};
@@ -297,8 +403,8 @@ 
		compatible = "samsung,exynos4210-spi";

		reg = <0x13920000 0x100>;

		interrupts = <0 66 0>;

		tx-dma-channel = <&pdma0 7>; /* preliminary */

		rx-dma-channel = <&pdma0 6>; /* preliminary */

		dmas = <&pdma0 7>, <&pdma0 6>;

		dma-names = "tx", "rx";

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock 327>, <&clock 159>;
@@ -312,8 +418,8 @@ 
		compatible = "samsung,exynos4210-spi";

		reg = <0x13930000 0x100>;

		interrupts = <0 67 0>;

		tx-dma-channel = <&pdma1 7>; /* preliminary */

		rx-dma-channel = <&pdma1 6>; /* preliminary */

		dmas = <&pdma1 7>, <&pdma1 6>;

		dma-names = "tx", "rx";

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock 328>, <&clock 160>;
@@ -327,8 +433,8 @@ 
		compatible = "samsung,exynos4210-spi";

		reg = <0x13940000 0x100>;

		interrupts = <0 68 0>;

		tx-dma-channel = <&pdma0 9>; /* preliminary */

		rx-dma-channel = <&pdma0 8>; /* preliminary */

		dmas = <&pdma0 9>, <&pdma0 8>;

		dma-names = "tx", "rx";

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&clock 329>, <&clock 161>;

arch/arm/boot/dts/exynos4210-pinctrl.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -797,6 +797,29 @@ 
			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

		};



		cam_port_a_io: cam-port-a-io {

			samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",

					"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",

					"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

		};



		cam_port_a_clk_active: cam-port-a-clk-active {

			samsung,pins = "gpj1-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <3>;

		};



		cam_port_a_clk_idle: cam-port-a-clk-idle {

			samsung,pins = "gpj1-3";

			samsung,pin-function = <0>;

			samsung,pin-pud = <1>;

			samsung,pin-drv = <0>;

		};

	};



	pinctrl@03860000 {

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

+84 −16
Original line number Diff line number Diff line
@@ -30,7 +30,10 @@ 
		bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";

	};



	vemmc_reg: voltage-regulator@0 {

	regulators {

		compatible = "simple-bus";



		vemmc_reg: regulator-0 {

			compatible = "regulator-fixed";

			regulator-name = "VMEM_VDD_2.8V";

			regulator-min-microvolt = <2800000>;
@@ -39,6 +42,52 @@ 
			enable-active-high;

		};



		tsp_reg: regulator-1 {

			compatible = "regulator-fixed";

			regulator-name = "TSP_FIXED_VOLTAGES";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpl0 3 0>;

			enable-active-high;

		};



		cam_af_28v_reg: regulator-2 {

			compatible = "regulator-fixed";

			regulator-name = "8M_AF_2.8V_EN";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpk1 1 0>;

			enable-active-high;

		};



		cam_io_en_reg: regulator-3 {

			compatible = "regulator-fixed";

			regulator-name = "CAM_IO_EN";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpe2 1 0>;

			enable-active-high;

		};



		cam_io_12v_reg: regulator-4 {

			compatible = "regulator-fixed";

			regulator-name = "8M_1.2V_EN";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			gpio = <&gpe2 5 0>;

			enable-active-high;

		};



		vt_core_15v_reg: regulator-5 {

			compatible = "regulator-fixed";

			regulator-name = "VT_CORE_1.5V";

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			gpio = <&gpe2 2 0>;

			enable-active-high;

		};

	};



	sdhci_emmc: sdhci@12510000 {

		bus-width = <8>;

		non-removable;
@@ -97,15 +146,6 @@ 
		};

	};



	tsp_reg: voltage-regulator {

		compatible = "regulator-fixed";

		regulator-name = "TSP_FIXED_VOLTAGES";

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

		gpio = <&gpl0 3 0>;

		enable-active-high;

	};



	i2c@13890000 {

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-slave-addr = <0x10>;
@@ -218,6 +258,12 @@ 
				     regulator-always-on;

				};



				vtcam_reg: LDO12 {

				     regulator-name = "VT_CAM_1.8V";

				     regulator-min-microvolt = <1800000>;

				     regulator-max-microvolt = <1800000>;

				};



				vcclcd_reg: LDO13 {

				     regulator-name = "VCC_3.3V_LCD";

				     regulator-min-microvolt = <3300000>;
@@ -301,4 +347,26 @@ 
			clock-frequency = <24000000>;

		};

	};



	camera {

		pinctrl-names = "default";

		pinctrl-0 = <>;

		status = "okay";



		fimc_0: fimc@11800000 {

			status = "okay";

		};



		fimc_1: fimc@11810000 {

			status = "okay";

		};



		fimc_2: fimc@11820000 {

			status = "okay";

		};



		fimc_3: fimc@11830000 {

			status = "okay";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE