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

Commit e5886451 authored by Maciej Purski's avatar Maciej Purski Committed by Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Use pinctrl labels in exynos4412-pinctrl 



Define pinctrl labels in exynos4412.dtsi and use them in
exynos4412-pinctrl.dtsi, as it is done in other Exynos DTSes.

Signed-off-by: default avatarMaciej Purski <m.purski@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 88c166ce

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

+956 −958
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_ ##_pull>;	\

	}



/ {

	pinctrl_0: pinctrl@11400000 {

&pinctrl_0 {

	gpa0: gpa0 {

		gpio-controller;

		#gpio-cells = <2>;
@@ -431,7 +430,7 @@ 
	};

};



	pinctrl_1: pinctrl@11000000 {

&pinctrl_1 {

	gpk0: gpk0 {

		gpio-controller;

		#gpio-cells = <2>;
@@ -896,7 +895,7 @@ 
	};

};



	pinctrl_2: pinctrl@3860000 {

&pinctrl_2 {

	gpz: gpz {

		gpio-controller;

		#gpio-cells = <2>;
@@ -922,7 +921,7 @@ 
	};

};



	pinctrl_3: pinctrl@106e0000 {

&pinctrl_3 {

	gpv0: gpv0 {

		gpio-controller;

		#gpio-cells = <2>;
@@ -978,4 +977,3 @@ 
		samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;

	};

};
 
};

arch/arm/boot/dts/exynos4412.dtsi

+34 −31
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include "exynos4.dtsi"

#include "exynos4412-pinctrl.dtsi"



#include "exynos4-cpu-thermal.dtsi"



/ {
@@ -147,6 +147,37 @@ 
		};

	};



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

	};



	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11000000 0x1000>;

		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;



		wakup_eint: wakeup-interrupt-controller {

			compatible = "samsung,exynos4210-wakeup-eint";

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		};

	};



	pinctrl_2: pinctrl@3860000 {

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x03860000 0x1000>;

		interrupt-parent = <&combiner>;

		interrupts = <10 0>;

	};



	pinctrl_3: pinctrl@106e0000 {

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x106E0000 0x1000>;

		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

	};



	sysram@2020000 {

		compatible = "mmio-sram";

		reg = <0x02020000 0x40000>;
@@ -693,36 +724,6 @@ 
		 <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>;

};



&pinctrl_0 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x11400000 0x1000>;

	interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

};



&pinctrl_1 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x11000000 0x1000>;

	interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;



	wakup_eint: wakeup-interrupt-controller {

		compatible = "samsung,exynos4210-wakeup-eint";

		interrupt-parent = <&gic>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

	};

};



&pinctrl_2 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x03860000 0x1000>;

	interrupt-parent = <&combiner>;

	interrupts = <10 0>;

};



&pinctrl_3 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x106E0000 0x1000>;

	interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

};



&pmu_system_controller {

	compatible = "samsung,exynos4412-pmu", "syscon";
@@ -743,3 +744,5 @@ 
	clock-names = "tmu_apbif";

	status = "disabled";

};



#include "exynos4412-pinctrl.dtsi"