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

Commit 045c8f63 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: dts: add pin state information in client nodes for Exynos4 platforms 



Add default pin state information for all client nodes that require
pin configuration support using pinctrl interface.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 81b6eb40

arch/arm/boot/dts/exynos4.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
		interrupts = <0 58 0>;

		clocks = <&clock 317>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c0_bus>;

		status = "disabled";

	};
@@ -208,6 +210,8 @@ 
		interrupts = <0 59 0>;

		clocks = <&clock 318>;

		clock-names = "i2c";

		pinctrl-names = "default";

		pinctrl-0 = <&i2c1_bus>;

		status = "disabled";

	};
@@ -287,6 +291,8 @@ 
		#size-cells = <0>;

		clocks = <&clock 327>, <&clock 159>;

		clock-names = "spi", "spi_busclk0";

		pinctrl-names = "default";

		pinctrl-0 = <&spi0_bus>;

		status = "disabled";

	};
@@ -300,6 +306,8 @@ 
		#size-cells = <0>;

		clocks = <&clock 328>, <&clock 160>;

		clock-names = "spi", "spi_busclk0";

		pinctrl-names = "default";

		pinctrl-0 = <&spi1_bus>;

		status = "disabled";

	};
@@ -313,6 +321,8 @@ 
		#size-cells = <0>;

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

		clock-names = "spi", "spi_busclk0";

		pinctrl-names = "default";

		pinctrl-0 = <&spi2_bus>;

		status = "disabled";

	};

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

+24 −29
Original line number Diff line number Diff line
@@ -30,16 +30,9 @@ 
	};



	sdhci@12530000 {

		samsung,sdhci-bus-width = <4>;

		linux,mmc_cap_4_bit_data;

		samsung,sdhci-cd-internal;

		gpio-cd = <&gpk2 2 2 3 3>;

		gpios = <&gpk2 0 2 0 3>,

			<&gpk2 1 2 0 3>,

			<&gpk2 3 2 3 3>,

			<&gpk2 4 2 3 3>,

			<&gpk2 5 2 3 3>,

			<&gpk2 6 2 3 3>;

		bus-width = <4>;

		pinctrl-names = "default";

		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;

		status = "okay";

	};
@@ -69,25 +62,32 @@ 
		status = "okay";

	};



	pinctrl@11000000 {

		keypad_rows: keypad-rows {

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

			samsung,pin-function = <3>;

			samsung,pin-pud = <3>;

			samsung,pin-drv = <0>;

		};



		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>;

		};

	};



	keypad@100A0000 {

		samsung,keypad-num-rows = <2>;

		samsung,keypad-num-columns = <8>;

		linux,keypad-no-autorepeat;

		linux,keypad-wakeup;

		pinctrl-names = "default";

		pinctrl-0 = <&keypad_rows &keypad_cols>;

		status = "okay";



		row-gpios = <&gpx2 0 3 3 0>,

			    <&gpx2 1 3 3 0>;



		col-gpios = <&gpx1 0 3 0 0>,

			    <&gpx1 1 3 0 0>,

			    <&gpx1 2 3 0 0>,

			    <&gpx1 3 3 0 0>,

			    <&gpx1 4 3 0 0>,

			    <&gpx1 5 3 0 0>,

			    <&gpx1 6 3 0 0>,

			    <&gpx1 7 3 0 0>;



		key_1 {

			keypad,row = <0>;

			keypad,column = <3>;
@@ -153,9 +153,7 @@ 
		#address-cells = <1>;

		#size-cells = <0>;

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

		samsung,i2c-max-bus-freq = <20000>;

		gpios = <&gpd1 0 2 3 0>,

			<&gpd1 1 2 3 0>;

		samsung,i2c-max-bus-freq = <100000>;

		status = "okay";



		eeprom@50 {
@@ -170,9 +168,6 @@ 
	};



	spi_2: spi@13940000 {

		gpios = <&gpc1 1 5 3 0>,

			<&gpc1 3 5 3 0>,

			<&gpc1 4 5 3 0>;

		status = "okay";



		w25x80@0 {
@@ -183,7 +178,7 @@ 
			spi-max-frequency = <1000000>;



			controller-data {

				cs-gpio = <&gpc1 2 1 0 3>;

				cs-gpio = <&gpc1 2 0>;

				samsung,spi-feedback-delay = <0>;

			};