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

Commit 70384d3f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'armsoc/pxa' of git://github.com/hzhuang1/linux into next/boards 

A series dealing with gpio configuration cleanup from Haojian Zhuang.

* 'armsoc/pxa' of git://github.com/hzhuang1/linux

:
  ARM: pxa: move debug uart code
  ARM: pxa: select PXA935 on saar & tavorevb
  ARM: mmp: add more compatible names in gpio driver
  ARM: pxa: move PXA_GPIO_TO_IRQ macro
  ARM: pxa: remove cpu_is_xxx in gpio driver

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 67028154 0a43cd3b

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

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



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

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

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



	gpio: gpio@d4019000 {

		compatible = "mrvl,mmp-gpio";

		compatible = "marvell,mmp-gpio";

		reg = <0xd4019000 0x1000>;

		interrupts = <49>;

		interrupt-name = "gpio_mux";

arch/arm/Kconfig.debug

+9 −0
Original line number Diff line number Diff line
@@ -312,6 +312,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on PicoXcell based platforms.



	config DEBUG_PXA_UART1

		depends on ARCH_PXA

		bool "Use PXA UART1 for low-level debug"

		help

		  Say Y here if you want kernel low-level debugging support

		  on PXA UART1.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW
@@ -593,6 +600,8 @@ config DEBUG_LL_INCLUDE 
	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \

				 DEBUG_MMP_UART3

	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \

arch/arm/boot/dts/mmp2.dtsi

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



			gpio@d4019000 {

				compatible = "mrvl,mmp-gpio";

				compatible = "marvell,mmp2-gpio";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = <0xd4019000 0x1000>;

arch/arm/boot/dts/pxa168.dtsi

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



			gpio@d4019000 {

				compatible = "mrvl,mmp-gpio";

				compatible = "marvell,mmp-gpio";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = <0xd4019000 0x1000>;

arch/arm/boot/dts/pxa910.dtsi

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



			gpio@d4019000 {

				compatible = "mrvl,mmp-gpio";

				compatible = "marvell,mmp-gpio";

				#address-cells = <1>;

				#size-cells = <1>;

				reg = <0xd4019000 0x1000>;