Commit e4560010 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-cleanup-for-3.11' of... 

Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

From David Brown:
Cleanups for MSM for 3.11

These are a handful of cleanups to the MSM tree.  The gpio cleanups
get us closer to having proper pinmux and gpio support.

* tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm

:
  mfd: ssbi: Use devm_* and simplify code
  gpio: msm: Add device tree and irqdomain support for gpio-msm-v2
  ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
  msm: iomap: Remove unused bases and mappings
  msm: Remove unused file core.h
  ARM: msm: Remove init_irq declaration in machine description

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/boot/dts/msm8660-surf.dts
	arch/arm/boot/dts/msm8960-cdp.dts
parents bae994b1 1aa3d1a3

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
MSM GPIO controller bindings



Required properties:

- compatible:

  - "qcom,msm-gpio" for MSM controllers

- #gpio-cells : Should be two.

  - first cell is the pin number

  - second cell is used to specify optional parameters (unused)

- gpio-controller : Marks the device node as a GPIO controller.

- #interrupt-cells : Should be 2.

- interrupt-controller: Mark the device node as an interrupt controller

- interrupts : Specify the TLMM summary interrupt number

- ngpio : Specify the number of MSM GPIOs



Example:



	msmgpio: gpio@fd510000 {

		compatible = "qcom,msm-gpio";

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		reg = <0xfd510000 0x4000>;

		interrupts = <0 208 0>;

		ngpio = <150>;

	};

arch/arm/boot/dts/msm8660-surf.dts

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,17 @@ 
		cpu-offset = <0x40000>;

	};



	msmgpio: gpio@800000 {

		compatible = "qcom,msm-gpio";

		reg = <0x00800000 0x1000>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpio = <173>;

		interrupts = <0 32 0x4>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	serial@19c40000 {

		compatible = "qcom,msm-hsuart", "qcom,msm-uart";

		reg = <0x19c40000 0x1000>,

arch/arm/boot/dts/msm8960-cdp.dts

+12 −1
Original line number Diff line number Diff line
@@ -26,7 +26,18 @@ 
		cpu-offset = <0x80000>;

	};



	serial@16440000 {

	msmgpio: gpio@fd510000 {

		compatible = "qcom,msm-gpio";

		gpio-controller;

		#gpio-cells = <2>;

		ngpio = <150>;

		interrupts = <0 32 0x4>;

		interrupt-controller;

		#interrupt-cells = <2>;

		reg = <0xfd510000 0x4000>;

	};



	serial@19440000 {

		compatible = "qcom,msm-hsuart", "qcom,msm-uart";

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;

arch/arm/mach-msm/Kconfig

+5 −8
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ config ARCH_MSM8X60 
	select CPU_V7

	select GPIO_MSM_V2

	select HAVE_SMP

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select MSM_V2_TLMM

	select USE_OF



config ARCH_MSM8960
@@ -58,9 +56,8 @@ config ARCH_MSM8960 
	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select MSM_GPIOMUX

	select GPIO_MSM_V2

	select MSM_SCM if SMP

	select MSM_V2_TLMM

	select USE_OF



config MSM_HAS_DEBUG_UART_HS
@@ -124,10 +121,10 @@ config MSM_SMD 
	bool



config MSM_GPIOMUX

	bool



config MSM_V2_TLMM

	bool

	depends on !(ARCH_MSM8X60 || ARCH_MSM8960)

	bool "MSM V1 TLMM GPIOMUX architecture"

	help

	  Support for MSM V1 TLMM GPIOMUX architecture.



config MSM_SCM

	bool

arch/arm/mach-msm/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -27,7 +27,5 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o 
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o

obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o

obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o



obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
 
obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o

obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE