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

Merge "1st Round of Samsung DT updates for v3.19" from Kukjin Kim:

Samsung DT updates for v3.19

- add CPU nodes for exynos4210, exynos4212, exynos4412

- exynos4x12-pinctrl: add utility macro to define pin sleep states
- exynos4412-trats2: add Maxim77693 PMIC node, add sleep mode pin
  configuration and keep eMMC regulators soft-disabled

- add new exynos5250-spring DT

- cleanup exynos5250-arndale, exynos5250-smdk5250 and exynos5250-snow

- exynos5250-arndale: fix apparent GPIO typo and simplify USB3503
- exynos5250-snow and exynos Peach boards: add rtc_src clock for RTC

- correct mmc0 capability string exynos5420-peach-pit and exynos5800-
  peach-pi

- exynos3250: add MFC codec nodes

- s3c64xx: enable PWM node by default

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

:
  ARM: dts: add CPU nodes for Exynos4 SoCs
  ARM: dts: add MFC codec device node for exynos3250
  ARM: dts: Add Maxim 77693 PMIC to exynos4412-trats2
  ARM: dts: Add sleep mode pin configuration for exynos4412-trats2
  ARM: dts: Add utility macro to define pin sleep states for exynos4x12-pinctrl
  ARM: dts: Keep eMMC regulators soft-disabled for exynos4412-trats2
  ARM: dts: correct the mmc0 capability string for exynos Peach boards
  ARM: dts: Add rtc_src clk for s3c-rtc on exynos5250-snow
  ARM: dts: Add rtc_src clk for s3c-rtc on exynos Peach boards
  ARM: dts: Enable PWM node by default for s3c64xx
  ARM: dts: Add exynos5250-spring device tree
  ARM: dts: Simplify USB3503 on exynos5250-arndale
  ARM: dts: Fix apparent GPIO typo in exynos5250-arndale
  ARM: dts: Clean up exynos5250-arndale
  ARM: dts: Clean up exynos5250-smdk5250
  ARM: dts: Fill in bootargs for exynos5250-snow
  ARM: dts: Clean up exynos5250-snow
  ARM: dts: Prepare node labels for exynos5250

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0df1f248 e540920c

arch/arm/boot/dts/Makefile

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

	exynos5250-smdk5250.dtb \

	exynos5250-snow.dtb \

	exynos5250-spring.dtb \

	exynos5260-xyref5260.dtb \

	exynos5410-smdk5410.dtb \

	exynos5420-arndale-octa.dtb \

arch/arm/boot/dts/exynos3250.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -320,6 +320,16 @@ 
			status = "disabled";

		};



		mfc: codec@13400000 {

			compatible = "samsung,mfc-v7";

			reg = <0x13400000 0x10000>;

			interrupts = <0 102 0>;

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

			clocks = <&cmu CLK_MFC>, <&cmu CLK_SCLK_MFC>;

			samsung,power-domain = <&pd_mfc>;

			status = "disabled";

		};



		serial_0: serial@13800000 {

			compatible = "samsung,exynos4210-uart";

			reg = <0x13800000 0x100>;

arch/arm/boot/dts/exynos4210.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -31,6 +31,23 @@ 
		pinctrl2 = &pinctrl_2;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@900 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0x900>;

		};



		cpu@901 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0x901>;

		};

	};



	pmu_system_controller: system-controller@10020000 {

		clock-names = "clkout0", "clkout1", "clkout2", "clkout3",

				"clkout4", "clkout8", "clkout9";

arch/arm/boot/dts/exynos4212.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -22,6 +22,23 @@ 
/ {

	compatible = "samsung,exynos4212", "samsung,exynos4";



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@A00 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0xA00>;

		};



		cpu@A01 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0xA01>;

		};

	};



	combiner: interrupt-controller@10440000 {

		samsung,combiner-nr = <18>;

	};

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

+348 −4
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


/dts-v1/;

#include "exynos4412.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Samsung Trats 2 based on Exynos4412";
@@ -22,6 +23,7 @@ 
	aliases {

		i2c9 = &i2c_ak8975;

		i2c10 = &i2c_cm36651;

		i2c11 = &i2c_max77693;

	};



	memory {
@@ -399,8 +401,6 @@ 
					regulator-name = "VMEM_VDD_2.8V";

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

					regulator-always-on;

					regulator-mem-off;

				};



				ldo23_reg: ldo23 {
@@ -503,8 +503,6 @@ 
					regulator-name = "VMEM_VDDF_3.0V";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

					regulator-mem-off;

				};



				buck9_reg: buck9 {
@@ -518,6 +516,36 @@ 
		};

	};



	i2c_max77693: i2c-gpio-1 {

		compatible = "i2c-gpio";

		gpios = <&gpm2 0 GPIO_ACTIVE_HIGH>, <&gpm2 1 GPIO_ACTIVE_HIGH>;

		i2c-gpio,delay-us = <2>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";



		max77693@66 {

			compatible = "maxim,max77693";

			interrupt-parent = <&gpx1>;

			interrupts = <5 2>;

			reg = <0x66>;



			regulators {

				esafeout1_reg: ESAFEOUT1@1 {

					regulator-name = "ESAFEOUT1";

				};

				esafeout2_reg: ESAFEOUT2@2 {

					regulator-name = "ESAFEOUT2";

				};

				charger_reg: CHARGER@0 {

					regulator-name = "CHARGER";

					regulator-min-microamp = <60000>;

					regulator-max-microamp = <2580000>;

				};

			};

		};

	};



	mmc@12550000 {

		num-slots = <1>;

		broken-cd;
@@ -782,3 +810,319 @@ 
		io-channels = <&adc 2>;  /* Battery temperature */

	};

};



&pinctrl_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sleep0>;



	sleep0: sleep-states {

		PIN_SLP(gpa0-0, INPUT, NONE);

		PIN_SLP(gpa0-1, OUT0, NONE);

		PIN_SLP(gpa0-2, INPUT, NONE);

		PIN_SLP(gpa0-3, INPUT, UP);

		PIN_SLP(gpa0-4, INPUT, NONE);

		PIN_SLP(gpa0-5, INPUT, DOWN);

		PIN_SLP(gpa0-6, INPUT, DOWN);

		PIN_SLP(gpa0-7, INPUT, UP);



		PIN_SLP(gpa1-0, INPUT, DOWN);

		PIN_SLP(gpa1-1, INPUT, DOWN);

		PIN_SLP(gpa1-2, INPUT, DOWN);

		PIN_SLP(gpa1-3, INPUT, DOWN);

		PIN_SLP(gpa1-4, INPUT, DOWN);

		PIN_SLP(gpa1-5, INPUT, DOWN);



		PIN_SLP(gpb-0, INPUT, NONE);

		PIN_SLP(gpb-1, INPUT, NONE);

		PIN_SLP(gpb-2, INPUT, NONE);

		PIN_SLP(gpb-3, INPUT, NONE);

		PIN_SLP(gpb-4, INPUT, DOWN);

		PIN_SLP(gpb-5, INPUT, UP);

		PIN_SLP(gpb-6, INPUT, DOWN);

		PIN_SLP(gpb-7, INPUT, DOWN);



		PIN_SLP(gpc0-0, INPUT, DOWN);

		PIN_SLP(gpc0-1, INPUT, DOWN);

		PIN_SLP(gpc0-2, INPUT, DOWN);

		PIN_SLP(gpc0-3, INPUT, DOWN);

		PIN_SLP(gpc0-4, INPUT, DOWN);



		PIN_SLP(gpc1-0, INPUT, NONE);

		PIN_SLP(gpc1-1, PREV, NONE);

		PIN_SLP(gpc1-2, INPUT, NONE);

		PIN_SLP(gpc1-3, INPUT, NONE);

		PIN_SLP(gpc1-4, INPUT, NONE);



		PIN_SLP(gpd0-0, INPUT, DOWN);

		PIN_SLP(gpd0-1, INPUT, DOWN);

		PIN_SLP(gpd0-2, INPUT, NONE);

		PIN_SLP(gpd0-3, INPUT, NONE);



		PIN_SLP(gpd1-0, INPUT, DOWN);

		PIN_SLP(gpd1-1, INPUT, DOWN);

		PIN_SLP(gpd1-2, INPUT, NONE);

		PIN_SLP(gpd1-3, INPUT, NONE);



		PIN_SLP(gpf0-0, INPUT, NONE);

		PIN_SLP(gpf0-1, INPUT, NONE);

		PIN_SLP(gpf0-2, INPUT, DOWN);

		PIN_SLP(gpf0-3, INPUT, DOWN);

		PIN_SLP(gpf0-4, INPUT, NONE);

		PIN_SLP(gpf0-5, INPUT, DOWN);

		PIN_SLP(gpf0-6, INPUT, NONE);

		PIN_SLP(gpf0-7, INPUT, DOWN);



		PIN_SLP(gpf1-0, INPUT, DOWN);

		PIN_SLP(gpf1-1, INPUT, DOWN);

		PIN_SLP(gpf1-2, INPUT, DOWN);

		PIN_SLP(gpf1-3, INPUT, DOWN);

		PIN_SLP(gpf1-4, INPUT, NONE);

		PIN_SLP(gpf1-5, INPUT, NONE);

		PIN_SLP(gpf1-6, INPUT, DOWN);

		PIN_SLP(gpf1-7, PREV, NONE);



		PIN_SLP(gpf2-0, PREV, NONE);

		PIN_SLP(gpf2-1, INPUT, DOWN);

		PIN_SLP(gpf2-2, INPUT, DOWN);

		PIN_SLP(gpf2-3, INPUT, DOWN);

		PIN_SLP(gpf2-4, INPUT, DOWN);

		PIN_SLP(gpf2-5, INPUT, DOWN);

		PIN_SLP(gpf2-6, INPUT, NONE);

		PIN_SLP(gpf2-7, INPUT, NONE);



		PIN_SLP(gpf3-0, INPUT, NONE);

		PIN_SLP(gpf3-1, PREV, NONE);

		PIN_SLP(gpf3-2, PREV, NONE);

		PIN_SLP(gpf3-3, PREV, NONE);

		PIN_SLP(gpf3-4, OUT1, NONE);

		PIN_SLP(gpf3-5, INPUT, DOWN);



		PIN_SLP(gpj0-0, PREV, NONE);

		PIN_SLP(gpj0-1, PREV, NONE);

		PIN_SLP(gpj0-2, PREV, NONE);

		PIN_SLP(gpj0-3, INPUT, DOWN);

		PIN_SLP(gpj0-4, PREV, NONE);

		PIN_SLP(gpj0-5, PREV, NONE);

		PIN_SLP(gpj0-6, INPUT, DOWN);

		PIN_SLP(gpj0-7, INPUT, DOWN);



		PIN_SLP(gpj1-0, INPUT, DOWN);

		PIN_SLP(gpj1-1, PREV, NONE);

		PIN_SLP(gpj1-2, PREV, NONE);

		PIN_SLP(gpj1-3, INPUT, DOWN);

		PIN_SLP(gpj1-4, INPUT, DOWN);

	};

};



&pinctrl_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&sleep1>;



	sleep1: sleep-states {

		PIN_SLP(gpk0-0, PREV, NONE);

		PIN_SLP(gpk0-1, PREV, NONE);

		PIN_SLP(gpk0-2, OUT0, NONE);

		PIN_SLP(gpk0-3, PREV, NONE);

		PIN_SLP(gpk0-4, PREV, NONE);

		PIN_SLP(gpk0-5, PREV, NONE);

		PIN_SLP(gpk0-6, PREV, NONE);



		PIN_SLP(gpk1-0, INPUT, DOWN);

		PIN_SLP(gpk1-1, INPUT, DOWN);

		PIN_SLP(gpk1-2, INPUT, DOWN);

		PIN_SLP(gpk1-3, PREV, NONE);

		PIN_SLP(gpk1-4, PREV, NONE);

		PIN_SLP(gpk1-5, PREV, NONE);

		PIN_SLP(gpk1-6, PREV, NONE);



		PIN_SLP(gpk2-0, INPUT, DOWN);

		PIN_SLP(gpk2-1, INPUT, DOWN);

		PIN_SLP(gpk2-2, INPUT, DOWN);

		PIN_SLP(gpk2-3, INPUT, DOWN);

		PIN_SLP(gpk2-4, INPUT, DOWN);

		PIN_SLP(gpk2-5, INPUT, DOWN);

		PIN_SLP(gpk2-6, INPUT, DOWN);



		PIN_SLP(gpk3-0, OUT0, NONE);

		PIN_SLP(gpk3-1, INPUT, NONE);

		PIN_SLP(gpk3-2, INPUT, DOWN);

		PIN_SLP(gpk3-3, INPUT, NONE);

		PIN_SLP(gpk3-4, INPUT, NONE);

		PIN_SLP(gpk3-5, INPUT, NONE);

		PIN_SLP(gpk3-6, INPUT, NONE);



		PIN_SLP(gpl0-0, INPUT, DOWN);

		PIN_SLP(gpl0-1, INPUT, DOWN);

		PIN_SLP(gpl0-2, INPUT, DOWN);

		PIN_SLP(gpl0-3, INPUT, DOWN);

		PIN_SLP(gpl0-4, PREV, NONE);

		PIN_SLP(gpl0-6, PREV, NONE);



		PIN_SLP(gpl1-0, INPUT, DOWN);

		PIN_SLP(gpl1-1, INPUT, DOWN);

		PIN_SLP(gpl2-0, INPUT, DOWN);

		PIN_SLP(gpl2-1, INPUT, DOWN);

		PIN_SLP(gpl2-2, INPUT, DOWN);

		PIN_SLP(gpl2-3, INPUT, DOWN);

		PIN_SLP(gpl2-4, INPUT, DOWN);

		PIN_SLP(gpl2-5, INPUT, DOWN);

		PIN_SLP(gpl2-6, PREV, NONE);

		PIN_SLP(gpl2-7, INPUT, DOWN);



		PIN_SLP(gpm0-0, INPUT, DOWN);

		PIN_SLP(gpm0-1, INPUT, DOWN);

		PIN_SLP(gpm0-2, INPUT, DOWN);

		PIN_SLP(gpm0-3, INPUT, DOWN);

		PIN_SLP(gpm0-4, INPUT, DOWN);

		PIN_SLP(gpm0-5, INPUT, DOWN);

		PIN_SLP(gpm0-6, INPUT, DOWN);

		PIN_SLP(gpm0-7, INPUT, DOWN);



		PIN_SLP(gpm1-0, INPUT, DOWN);

		PIN_SLP(gpm1-1, INPUT, DOWN);

		PIN_SLP(gpm1-2, INPUT, NONE);

		PIN_SLP(gpm1-3, INPUT, NONE);

		PIN_SLP(gpm1-4, INPUT, NONE);

		PIN_SLP(gpm1-5, INPUT, NONE);

		PIN_SLP(gpm1-6, INPUT, DOWN);



		PIN_SLP(gpm2-0, INPUT, NONE);

		PIN_SLP(gpm2-1, INPUT, NONE);

		PIN_SLP(gpm2-2, INPUT, DOWN);

		PIN_SLP(gpm2-3, INPUT, DOWN);

		PIN_SLP(gpm2-4, INPUT, DOWN);



		PIN_SLP(gpm3-0, PREV, NONE);

		PIN_SLP(gpm3-1, PREV, NONE);

		PIN_SLP(gpm3-2, PREV, NONE);

		PIN_SLP(gpm3-3, OUT1, NONE);

		PIN_SLP(gpm3-4, INPUT, DOWN);

		PIN_SLP(gpm3-5, INPUT, DOWN);

		PIN_SLP(gpm3-6, INPUT, DOWN);

		PIN_SLP(gpm3-7, INPUT, DOWN);



		PIN_SLP(gpm4-0, INPUT, DOWN);

		PIN_SLP(gpm4-1, INPUT, DOWN);

		PIN_SLP(gpm4-2, INPUT, DOWN);

		PIN_SLP(gpm4-3, INPUT, DOWN);

		PIN_SLP(gpm4-4, INPUT, DOWN);

		PIN_SLP(gpm4-5, INPUT, DOWN);

		PIN_SLP(gpm4-6, INPUT, DOWN);

		PIN_SLP(gpm4-7, INPUT, DOWN);



		PIN_SLP(gpy0-0, INPUT, DOWN);

		PIN_SLP(gpy0-1, INPUT, DOWN);

		PIN_SLP(gpy0-2, INPUT, DOWN);

		PIN_SLP(gpy0-3, INPUT, DOWN);

		PIN_SLP(gpy0-4, INPUT, DOWN);

		PIN_SLP(gpy0-5, INPUT, DOWN);



		PIN_SLP(gpy1-0, INPUT, DOWN);

		PIN_SLP(gpy1-1, INPUT, DOWN);

		PIN_SLP(gpy1-2, INPUT, DOWN);

		PIN_SLP(gpy1-3, INPUT, DOWN);



		PIN_SLP(gpy2-0, PREV, NONE);

		PIN_SLP(gpy2-1, INPUT, DOWN);

		PIN_SLP(gpy2-2, INPUT, NONE);

		PIN_SLP(gpy2-3, INPUT, NONE);

		PIN_SLP(gpy2-4, INPUT, NONE);

		PIN_SLP(gpy2-5, INPUT, NONE);



		PIN_SLP(gpy3-0, INPUT, DOWN);

		PIN_SLP(gpy3-1, INPUT, DOWN);

		PIN_SLP(gpy3-2, INPUT, DOWN);

		PIN_SLP(gpy3-3, INPUT, DOWN);

		PIN_SLP(gpy3-4, INPUT, DOWN);

		PIN_SLP(gpy3-5, INPUT, DOWN);

		PIN_SLP(gpy3-6, INPUT, DOWN);

		PIN_SLP(gpy3-7, INPUT, DOWN);



		PIN_SLP(gpy4-0, INPUT, DOWN);

		PIN_SLP(gpy4-1, INPUT, DOWN);

		PIN_SLP(gpy4-2, INPUT, DOWN);

		PIN_SLP(gpy4-3, INPUT, DOWN);

		PIN_SLP(gpy4-4, INPUT, DOWN);

		PIN_SLP(gpy4-5, INPUT, DOWN);

		PIN_SLP(gpy4-6, INPUT, DOWN);

		PIN_SLP(gpy4-7, INPUT, DOWN);



		PIN_SLP(gpy5-0, INPUT, DOWN);

		PIN_SLP(gpy5-1, INPUT, DOWN);

		PIN_SLP(gpy5-2, INPUT, DOWN);

		PIN_SLP(gpy5-3, INPUT, DOWN);

		PIN_SLP(gpy5-4, INPUT, DOWN);

		PIN_SLP(gpy5-5, INPUT, DOWN);

		PIN_SLP(gpy5-6, INPUT, DOWN);

		PIN_SLP(gpy5-7, INPUT, DOWN);



		PIN_SLP(gpy6-0, INPUT, DOWN);

		PIN_SLP(gpy6-1, INPUT, DOWN);

		PIN_SLP(gpy6-2, INPUT, DOWN);

		PIN_SLP(gpy6-3, INPUT, DOWN);

		PIN_SLP(gpy6-4, INPUT, DOWN);

		PIN_SLP(gpy6-5, INPUT, DOWN);

		PIN_SLP(gpy6-6, INPUT, DOWN);

		PIN_SLP(gpy6-7, INPUT, DOWN);

	};

};



&pinctrl_2 {

	pinctrl-names = "default";

	pinctrl-0 = <&sleep2>;



	sleep2: sleep-states {

		PIN_SLP(gpz-0, INPUT, DOWN);

		PIN_SLP(gpz-1, INPUT, DOWN);

		PIN_SLP(gpz-2, INPUT, DOWN);

		PIN_SLP(gpz-3, INPUT, DOWN);

		PIN_SLP(gpz-4, INPUT, DOWN);

		PIN_SLP(gpz-5, INPUT, DOWN);

		PIN_SLP(gpz-6, INPUT, DOWN);

	};

};



&pinctrl_3 {

	pinctrl-names = "default";

	pinctrl-0 = <&sleep3>;



	sleep3: sleep-states {

		PIN_SLP(gpv0-0, INPUT, DOWN);

		PIN_SLP(gpv0-1, INPUT, DOWN);

		PIN_SLP(gpv0-2, INPUT, DOWN);

		PIN_SLP(gpv0-3, INPUT, DOWN);

		PIN_SLP(gpv0-4, INPUT, DOWN);

		PIN_SLP(gpv0-5, INPUT, DOWN);

		PIN_SLP(gpv0-6, INPUT, DOWN);

		PIN_SLP(gpv0-7, INPUT, DOWN);



		PIN_SLP(gpv1-0, INPUT, DOWN);

		PIN_SLP(gpv1-1, INPUT, DOWN);

		PIN_SLP(gpv1-2, INPUT, DOWN);

		PIN_SLP(gpv1-3, INPUT, DOWN);

		PIN_SLP(gpv1-4, INPUT, DOWN);

		PIN_SLP(gpv1-5, INPUT, DOWN);

		PIN_SLP(gpv1-6, INPUT, DOWN);

		PIN_SLP(gpv1-7, INPUT, DOWN);



		PIN_SLP(gpv2-0, INPUT, DOWN);

		PIN_SLP(gpv2-1, INPUT, DOWN);

		PIN_SLP(gpv2-2, INPUT, DOWN);

		PIN_SLP(gpv2-3, INPUT, DOWN);

		PIN_SLP(gpv2-4, INPUT, DOWN);

		PIN_SLP(gpv2-5, INPUT, DOWN);

		PIN_SLP(gpv2-6, INPUT, DOWN);

		PIN_SLP(gpv2-7, INPUT, DOWN);



		PIN_SLP(gpv3-0, INPUT, DOWN);

		PIN_SLP(gpv3-1, INPUT, DOWN);

		PIN_SLP(gpv3-2, INPUT, DOWN);

		PIN_SLP(gpv3-3, INPUT, DOWN);

		PIN_SLP(gpv3-4, INPUT, DOWN);

		PIN_SLP(gpv3-5, INPUT, DOWN);

		PIN_SLP(gpv3-6, INPUT, DOWN);

		PIN_SLP(gpv3-7, INPUT, DOWN);



		PIN_SLP(gpv4-0, INPUT, DOWN);

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE