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

Commit 2008ee09 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-pinctrl-4.9' of... 

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

Pull "Topic branch for Samsung DeviceTree cleanup for 4.9" from Krzysztof Kozłowski:

Replace in DT sources hard-coded values for pinctrl configuration like pull
up/down, drive strength and function. This makes the DTS easier to read,
especially that some drive strengths values are quite non-obvious.

* tag 'samsung-dt-pinctrl-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s3c64xx: Use macros for pinctrl configuration
  ARM: dts: s3c2416: Use macros for pinctrl configuration
  ARM: dts: s5pv210: Use macros for pinctrl configuration
  ARM: dts: s3c64xx: Use common macros for pinctrl configuration
  ARM: dts: exynos: Fix mismatched values of SD drive strengh configuration on exynos4415
  ARM: dts: exynos: Fix mismatched value for SD4 pull up/down configuration on exynos4210
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos542x/exynos5800
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos5410
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos5260
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos5250
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos4415
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos4x12
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos4210
  ARM: dts: exynos: Use macros for pinctrl configuration on exynos3250
  ARM: dts: exynos: Use common macros for pinctrl configuration
  pinctrl: dt-bindings: samsung: Update documentation with new macros
  pinctrl: dt-bindings: samsung: Add header with values used for configuration
parents b994738b d1379923

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

+23 −21
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ Example: A pin-controller node with pin banks: 


Example 1: A pin-controller node with pin groups.



	#include <dt-bindings/pinctrl/samsung.h>



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;
@@ -238,53 +240,53 @@ Example 1: A pin-controller node with pin groups. 


		uart0_data: uart0-data {

			samsung,pins = "gpa0-0", "gpa0-1";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

			samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

			samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

			samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

		};



		uart0_fctl: uart0-fctl {

			samsung,pins = "gpa0-2", "gpa0-3";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

			samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

			samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

			samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

		};



		uart1_data: uart1-data {

			samsung,pins = "gpa0-4", "gpa0-5";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

			samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

			samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

			samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

		};



		uart1_fctl: uart1-fctl {

			samsung,pins = "gpa0-6", "gpa0-7";

			samsung,pin-function = <2>;

			samsung,pin-pud = <0>;

			samsung,pin-drv = <0>;

			samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

			samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

			samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

		};



		i2c2_bus: i2c2-bus {

			samsung,pins = "gpa0-6", "gpa0-7";

			samsung,pin-function = <3>;

			samsung,pin-pud = <3>;

			samsung,pin-drv = <0>;

			samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

			samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

			samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

		};



		sd4_bus8: sd4-bus-width8 {

			part-1 {

				samsung,pins = "gpk0-3", "gpk0-4",

						"gpk0-5", "gpk0-6";

				samsung,pin-function = <3>;

				samsung,pin-pud = <3>;

				samsung,pin-drv = <3>;

				samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

				samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

				samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

			};

			part-2 {

				samsung,pins = "gpk1-3", "gpk1-4",

						"gpk1-5", "gpk1-6";

				samsung,pin-function = <4>;

				samsung,pin-pud = <4>;

				samsung,pin-drv = <3>;

				samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

				samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

				samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

			};

		};

	};

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -9252,6 +9252,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/pinctrl/samsung/

F:	include/dt-bindings/pinctrl/samsung.h

F:	Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt



PIN CONTROLLER - SINGLE

M:	Tony Lindgren <tony@atomide.com>

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

+167 −179
Original line number Diff line number Diff line
@@ -12,42 +12,30 @@ 
 * published by the Free Software Foundation.

*/



#define PIN_PULL_NONE		0

#define PIN_PULL_DOWN		1

#define PIN_PULL_UP		3



#define PIN_DRV_LV1		0

#define PIN_DRV_LV2		2

#define PIN_DRV_LV3		1

#define PIN_DRV_LV4		3



#define PIN_PDN_OUT0		0

#define PIN_PDN_OUT1		1

#define PIN_PDN_INPUT		2

#define PIN_PDN_PREV		3

#include <dt-bindings/pinctrl/samsung.h>



#define PIN_IN(_pin, _pull, _drv)					\

	_pin {								\

		samsung,pins = #_pin;					\

		samsung,pin-function = <0>;		\

		samsung,pin-pud = <PIN_PULL_ ##_pull>;	\

		samsung,pin-drv = <PIN_DRV_ ##_drv>;	\

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;		\

		samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>;		\

		samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>;		\

	}



#define PIN_OUT(_pin, _drv)						\

	_pin {								\

		samsung,pins = #_pin;					\

		samsung,pin-function = <1>;		\

		samsung,pin-pud = <0>;			\

		samsung,pin-drv = <PIN_DRV_ ##_drv>;	\

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;	\

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;		\

		samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>;		\

	}



#define PIN_OUT_SET(_pin, _val, _drv)					\

	_pin {								\

		samsung,pins = #_pin;					\

		samsung,pin-function = <1>;		\

		samsung,pin-pud = <0>;			\

		samsung,pin-drv = <PIN_DRV_ ##_drv>;	\

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;	\

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;		\

		samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>;		\

		samsung,pin-val = <_val>;				\

	}
@@ -55,15 +43,15 @@ 
	_pin {								\

		samsung,pins = #_pin;					\

		samsung,pin-function = <_sel>;				\

		samsung,pin-pud = <PIN_PULL_ ##_pull>;	\

		samsung,pin-drv = <PIN_DRV_ ##_drv>;	\

		samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>;		\

		samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>;		\

	}



#define PIN_SLP(_pin, _mode, _pull)					\

	_pin {								\

		samsung,pins = #_pin;					\

		samsung,pin-con-pdn = <PIN_PDN_ ##_mode>;	\

		samsung,pin-pud-pdn = <PIN_PULL_ ##_pull>;	\

		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_ ##_mode>;	\

		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_ ##_pull>;	\

	}



&pinctrl_0 {
@@ -125,158 +113,158 @@ 


	uart0_data: uart0-data {

		samsung,pins = "gpa0-0", "gpa0-1";

		samsung,pin-function = <0x2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	uart0_fctl: uart0-fctl {

		samsung,pins = "gpa0-2", "gpa0-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	uart1_data: uart1-data {

		samsung,pins = "gpa0-4", "gpa0-5";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	uart1_fctl: uart1-fctl {

		samsung,pins = "gpa0-6", "gpa0-7";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c2_bus: i2c2-bus {

		samsung,pins = "gpa0-6", "gpa0-7";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	uart2_data: uart2-data {

		samsung,pins = "gpa1-0", "gpa1-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c3_bus: i2c3-bus {

		samsung,pins = "gpa1-2", "gpa1-3";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	spi0_bus: spi0-bus {

		samsung,pins = "gpb-0", "gpb-2", "gpb-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c4_bus: i2c4-bus {

		samsung,pins = "gpb-0", "gpb-1";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	spi1_bus: spi1-bus {

		samsung,pins = "gpb-4", "gpb-6", "gpb-7";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c5_bus: i2c5-bus {

		samsung,pins = "gpb-2", "gpb-3";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2s2_bus: i2s2-bus {

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

				"gpc1-4";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	pcm2_bus: pcm2-bus {

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

				"gpc1-4";

		samsung,pin-function = <3>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c6_bus: i2c6-bus {

		samsung,pins = "gpc1-3", "gpc1-4";

		samsung,pin-function = <4>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	pwm0_out: pwm0-out {

		samsung,pins = "gpd0-0";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	pwm1_out: pwm1-out {

		samsung,pins = "gpd0-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c7_bus: i2c7-bus {

		samsung,pins = "gpd0-2", "gpd0-3";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	pwm2_out: pwm2-out {

		samsung,pins = "gpd0-2";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	pwm3_out: pwm3-out {

		samsung,pins = "gpd0-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c0_bus: i2c0-bus {

		samsung,pins = "gpd1-0", "gpd1-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	mipi0_clk: mipi0-clk {

		samsung,pins = "gpd1-0", "gpd1-1";

		samsung,pin-function = <3>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	i2c1_bus: i2c1-bus {

		samsung,pins = "gpd1-2", "gpd1-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};

};
@@ -408,164 +396,164 @@ 


	sd0_clk: sd0-clk {

		samsung,pins = "gpk0-0";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd0_cmd: sd0-cmd {

		samsung,pins = "gpk0-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd0_cd: sd0-cd {

		samsung,pins = "gpk0-2";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd0_rdqs: sd0-rdqs {

		samsung,pins = "gpk0-7";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd0_bus1: sd0-bus-width1 {

		samsung,pins = "gpk0-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd0_bus4: sd0-bus-width4 {

		samsung,pins = "gpk0-4", "gpk0-5", "gpk0-6";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd0_bus8: sd0-bus-width8 {

		samsung,pins = "gpl0-0", "gpl0-1", "gpl0-2", "gpl0-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd1_clk: sd1-clk {

		samsung,pins = "gpk1-0";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd1_cmd: sd1-cmd {

		samsung,pins = "gpk1-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd1_cd: sd1-cd {

		samsung,pins = "gpk1-2";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd1_bus1: sd1-bus-width1 {

		samsung,pins = "gpk1-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd1_bus4: sd1-bus-width4 {

		samsung,pins = "gpk1-4", "gpk1-5", "gpk1-6";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd2_clk: sd2-clk {

		samsung,pins = "gpk2-0";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd2_cmd: sd2-cmd {

		samsung,pins = "gpk2-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd2_cd: sd2-cd {

		samsung,pins = "gpk2-2";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd2_bus1: sd2-bus-width1 {

		samsung,pins = "gpk2-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	sd2_bus4: sd2-bus-width4 {

		samsung,pins = "gpk2-4", "gpk2-5", "gpk2-6";

		samsung,pin-function = <2>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	cam_port_b_io: cam-port-b-io {

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

				"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",

				"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	cam_port_b_clk_active: cam-port-b-clk-active {

		samsung,pins = "gpm2-2";

		samsung,pin-function = <3>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <3>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;

	};



	cam_port_b_clk_idle: cam-port-b-clk-idle {

		samsung,pins = "gpm2-2";

		samsung,pin-function = <0>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	fimc_is_i2c0: fimc-is-i2c0 {

		samsung,pins = "gpm4-0", "gpm4-1";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	fimc_is_i2c1: fimc-is-i2c1 {

		samsung,pins = "gpm4-2", "gpm4-3";

		samsung,pin-function = <2>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	fimc_is_uart: fimc-is-uart {

		samsung,pins = "gpm3-5", "gpm3-7";

		samsung,pin-function = <3>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};

};

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

+230 −228

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −6
Original line number Diff line number Diff line
@@ -137,17 +137,17 @@ 
&pinctrl_1 {

	keypad_rows: keypad-rows {

		samsung,pins = "gpx2-0", "gpx2-1";

		samsung,pin-function = <3>;

		samsung,pin-pud = <3>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};



	keypad_cols: keypad-cols {

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

			       "gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";

		samsung,pin-function = <3>;

		samsung,pin-pud = <0>;

		samsung,pin-drv = <0>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};

};