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

Commit b533c868 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: dts: fix compatible value for exynos pinctrl 



Fix the incorrect compatible property value of pinctrl for EXYNOS4 SoCs.

Cc: Thomas Abraham <thomas.ab@samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent f6925432

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

+6 −6
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ on-chip controllers onto these pads. 


Required Properties:

- compatible: should be one of the following.

  - "samsung,pinctrl-exynos4210": for Exynos4210 compatible pin-controller.

  - "samsung,pinctrl-exynos4x12": for Exynos4x12 compatible pin-controller.

  - "samsung,pinctrl-exynos5250": for Exynos5250 compatible pin-controller.

  - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller.

  - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller.

  - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.



- reg: Base address of the pin controller hardware module and length of

  the address space it occupies.
@@ -142,7 +142,7 @@ the following format 'pinctrl{n}' where n is a unique number for the alias. 
Example: A pin-controller node with pin banks:



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;
@@ -185,7 +185,7 @@ Example: A pin-controller node with pin banks: 
Example 1: A pin-controller node with pin groups.



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;
@@ -230,7 +230,7 @@ Example 1: A pin-controller node with pin groups. 
Example 2: A pin-controller node with external wakeup interrupt controller node.



	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>

arch/arm/boot/dts/exynos4210.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -48,13 +48,13 @@ 
	};



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;

	};



	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>;
@@ -66,7 +66,7 @@ 
	};



	pinctrl_2: pinctrl@03860000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x03860000 0x1000>;

	};

arch/arm/boot/dts/exynos4x12.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ 
	};



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;

	};



	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>;
@@ -55,14 +55,14 @@ 
	};



	pinctrl_2: pinctrl@03860000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x03860000 0x1000>;

		interrupt-parent = <&combiner>;

		interrupts = <10 0>;

	};



	pinctrl_3: pinctrl@106E0000 {

		compatible = "samsung,pinctrl-exynos4x12";

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x106E0000 0x1000>;

		interrupts = <0 72 0>;

	};

arch/arm/mach-exynos/common.c

+2 −2
Original line number Diff line number Diff line
@@ -1031,8 +1031,8 @@ static int __init exynos_init_irq_eint(void) 
	 * interrupt support code here can be completely removed.

	 */

	static const struct of_device_id exynos_pinctrl_ids[] = {

		{ .compatible = "samsung,pinctrl-exynos4210", },

		{ .compatible = "samsung,pinctrl-exynos4x12", },

		{ .compatible = "samsung,exynos4210-pinctrl", },

		{ .compatible = "samsung,exynos4x12-pinctrl", },

	};

	struct device_node *pctrl_np, *wkup_np;

	const char *wkup_compat = "samsung,exynos4210-wakeup-eint";

drivers/gpio/gpio-samsung.c

+2 −2
Original line number Diff line number Diff line
@@ -3023,8 +3023,8 @@ static __init int samsung_gpiolib_init(void) 
	*/

	struct device_node *pctrl_np;

	static const struct of_device_id exynos_pinctrl_ids[] = {

		{ .compatible = "samsung,pinctrl-exynos4210", },

		{ .compatible = "samsung,pinctrl-exynos4x12", },

		{ .compatible = "samsung,exynos4210-pinctrl", },

		{ .compatible = "samsung,exynos4x12-pinctrl", },

		{ .compatible = "samsung,exynos5440-pinctrl", },

	};

	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)