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

Commit f8731174 authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: mmp: add more compatible names in gpio driver 



Since more driver names are added into platform id, do the same thing on
compatible names for DT mode.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b8f649f1

Documentation/devicetree/bindings/gpio/mrvl-gpio.txt

+5 −2
Original line number Original line Diff line number Diff line 
* Marvell PXA GPIO controller

* Marvell PXA GPIO controller





Required properties:

Required properties:

- compatible : Should be "mrvl,pxa-gpio" or "mrvl,mmp-gpio"

- compatible : Should be "intel,pxa25x-gpio", "intel,pxa26x-gpio",

		"intel,pxa27x-gpio", "intel,pxa3xx-gpio",

		"marvell,pxa93x-gpio", "marvell,mmp-gpio" or

		"marvell,mmp2-gpio".

- reg : Address and length of the register set for the device

- reg : Address and length of the register set for the device

- interrupts : Should be the port interrupt shared by all gpio pins.

- interrupts : Should be the port interrupt shared by all gpio pins.

  There're three gpio interrupts in arch-pxa, and they're gpio0,

  There're three gpio interrupts in arch-pxa, and they're gpio0,
@@ -18,7 +21,7 @@ Required properties: 
Example:

Example:





	gpio: gpio@d4019000 {

	gpio: gpio@d4019000 {

		compatible = "mrvl,mmp-gpio";

		compatible = "marvell,mmp-gpio";

		reg = <0xd4019000 0x1000>;

		reg = <0xd4019000 0x1000>;

		interrupts = <49>;

		interrupts = <49>;

		interrupt-name = "gpio_mux";

		interrupt-name = "gpio_mux";

arch/arm/boot/dts/mmp2.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -160,7 +160,7 @@ 
			};

			};





			gpio@d4019000 {

			gpio@d4019000 {

				compatible = "mrvl,mmp-gpio";

				compatible = "marvell,mmp2-gpio";

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <1>;

				#size-cells = <1>;

				reg = <0xd4019000 0x1000>;

				reg = <0xd4019000 0x1000>;

arch/arm/boot/dts/pxa168.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ 
			};

			};





			gpio@d4019000 {

			gpio@d4019000 {

				compatible = "mrvl,mmp-gpio";

				compatible = "marvell,mmp-gpio";

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <1>;

				#size-cells = <1>;

				reg = <0xd4019000 0x1000>;

				reg = <0xd4019000 0x1000>;

arch/arm/boot/dts/pxa910.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ 
			};

			};





			gpio@d4019000 {

			gpio@d4019000 {

				compatible = "mrvl,mmp-gpio";

				compatible = "marvell,mmp-gpio";

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <1>;

				#size-cells = <1>;

				reg = <0xd4019000 0x1000>;

				reg = <0xd4019000 0x1000>;

arch/arm/mach-mmp/mmp-dt.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = { 
	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

	{}

};

};
@@ -39,7 +39,7 @@ static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst = { 
	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

	{}

};

};