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

Commit ce4c6f9b authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: add gpio support for device tree boot 



It adds gpio support for device tree boot.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4052d45e

arch/arm/boot/dts/imx23.dtsi

+34 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,12 @@ 
/ {

/ {

	interrupt-parent = <&icoll>;

	interrupt-parent = <&icoll>;





	aliases {

		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

	};



	cpus {

	cpus {

		cpu@0 {

		cpu@0 {

			compatible = "arm,arm926ejs";

			compatible = "arm,arm926ejs";
@@ -74,9 +80,36 @@ 
			pinctrl@80018000 {

			pinctrl@80018000 {

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <0>;

				#size-cells = <0>;

				compatible = "fsl,imx23-pinctrl";

				compatible = "fsl,imx23-pinctrl", "simple-bus";

				reg = <0x80018000 2000>;

				reg = <0x80018000 2000>;





				gpio0: gpio@0 {

					compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";

					interrupts = <16>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				gpio1: gpio@1 {

					compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";

					interrupts = <17>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				gpio2: gpio@2 {

					compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";

					interrupts = <18>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				duart_pins_a: duart@0 {

				duart_pins_a: duart@0 {

					reg = <0>;

					reg = <0>;

					fsl,pinmux-ids = <0x11a2 0x11b2>;

					fsl,pinmux-ids = <0x11a2 0x11b2>;

arch/arm/boot/dts/imx28.dtsi

+54 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,14 @@ 
/ {

/ {

	interrupt-parent = <&icoll>;

	interrupt-parent = <&icoll>;





	aliases {

		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

		gpio3 = &gpio3;

		gpio4 = &gpio4;

	};



	cpus {

	cpus {

		cpu@0 {

		cpu@0 {

			compatible = "arm,arm926ejs";

			compatible = "arm,arm926ejs";
@@ -97,9 +105,54 @@ 
			pinctrl@80018000 {

			pinctrl@80018000 {

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <0>;

				#size-cells = <0>;

				compatible = "fsl,imx28-pinctrl";

				compatible = "fsl,imx28-pinctrl", "simple-bus";

				reg = <0x80018000 2000>;

				reg = <0x80018000 2000>;





				gpio0: gpio@0 {

					compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";

					interrupts = <127>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				gpio1: gpio@1 {

					compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";

					interrupts = <126>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				gpio2: gpio@2 {

					compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";

					interrupts = <125>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				gpio3: gpio@3 {

					compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";

					interrupts = <124>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				gpio4: gpio@4 {

					compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";

					interrupts = <123>;

					gpio-controller;

					#gpio-cells = <2>;

					interrupt-controller;

					#interrupt-cells = <2>;

				};



				duart_pins_a: duart@0 {

				duart_pins_a: duart@0 {

					reg = <0>;

					reg = <0>;

					fsl,pinmux-ids = <0x3102 0x3112>;

					fsl,pinmux-ids = <0x3102 0x3112>;

arch/arm/mach-mxs/mach-mxs.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -30,8 +30,20 @@ static int __init mxs_icoll_add_irq_domain(struct device_node *np, 
	return 0;

	return 0;

}

}





static int __init mxs_gpio_add_irq_domain(struct device_node *np,

				struct device_node *interrupt_parent)

{

	static int gpio_irq_base = MXS_GPIO_IRQ_START;



	irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, NULL);

	gpio_irq_base += 32;



	return 0;

}



static const struct of_device_id mxs_irq_match[] __initconst = {

static const struct of_device_id mxs_irq_match[] __initconst = {

	{ .compatible = "fsl,mxs-icoll", .data = mxs_icoll_add_irq_domain, },

	{ .compatible = "fsl,mxs-icoll", .data = mxs_icoll_add_irq_domain, },

	{ .compatible = "fsl,mxs-gpio", .data = mxs_gpio_add_irq_domain, },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};