Commit 591346c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-dt-for-3.7' of... 

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

From David Brown:

These patches migrate both the 8660 and 8960 targets on msm to be
devicetree only.  This also sets most of the frame in place necessary
to build both targets into the same image.

There's a couple of cleanups in here that are kept in this series
because they are intimately tied to the changes necessary to support
the devicetree conversions.

By Stephen Boyd
via David Brown
* tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm

:
  ARM: msm: Remove non-DT targets from 8960
  ARM: msm: Add DT support for 8960
  ARM: msm: Move io mapping prototypes to common.h
  ARM: msm: Rename board-msm8x60 to signify its DT only status
  ARM: msm: Make 8660 a DT only target
  ARM: msm: Move 8660 to DT timer
  ARM: msm: Add DT support to msm_timer
  ARM: msm: Allow timer.c to compile on multiple targets
  ARM: msm: Don't touch GIC registers outside of GIC code
  ARM: msm: Add msm8660-surf.dts to Makefile.boot
  ARM: msm: Add handle_irq handler for 8660 DT machine

Resolved trivial context conflict in arch/arm/mach-msm/io.c and a
remove/change conflict in arch/arm/mach-msm/board-msm8x60.c.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bada1c5b 0607fa58

Documentation/devicetree/bindings/arm/msm/timer.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
* MSM Timer



Properties:



- compatible : Should at least contain "qcom,msm-timer". More specific

  properties such as "qcom,msm-gpt" and "qcom,msm-dgt" specify a general

  purpose timer and a debug timer respectively.



- interrupts : Interrupt indicating a match event.



- reg : Specifies the base address of the timer registers. The second region

  specifies an optional register used to configure the clock divider.



- clock-frequency : The frequency of the timer in Hz.



Optional:



- cpu-offset : per-cpu offset used when the timer is accessed without the

  CPU remapping facilities. The offset is cpu-offset * cpu-nr.



Example:



       timer@200a004 {

               compatible = "qcom,msm-gpt", "qcom,msm-timer";

               interrupts = <1 2 0x301>;

               reg = <0x0200a004 0x10>;

               clock-frequency = <32768>;

               cpu-offset = <0x40000>;

       };



       timer@200a024 {

               compatible = "qcom,msm-dgt", "qcom,msm-timer";

               interrupts = <1 3 0x301>;

               reg = <0x0200a024 0x10>,

                     <0x0200a034 0x4>;

               clock-frequency = <6750000>;

               cpu-offset = <0x40000>;

       };

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

+18 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
	compatible = "qcom,msm8660-surf", "qcom,msm8660";

	interrupt-parent = <&intc>;



	intc: interrupt-controller@02080000 {

	intc: interrupt-controller@2080000 {

		compatible = "qcom,msm-8660-qgic";

		interrupt-controller;

		#interrupt-cells = <3>;
@@ -15,6 +15,23 @@ 
		      < 0x02081000 0x1000 >;

	};



	timer@2000004 {

		compatible = "qcom,msm-gpt", "qcom,msm-timer";

		interrupts = <1 1 0x301>;

		reg = <0x02000004 0x10>;

		clock-frequency = <32768>;

		cpu-offset = <0x40000>;

	};



	timer@2000024 {

		compatible = "qcom,msm-dgt", "qcom,msm-timer";

		interrupts = <1 0 0x301>;

		reg = <0x02000024 0x10>,

		      <0x02000034 0x4>;

		clock-frequency = <6750000>;

		cpu-offset = <0x40000>;

	};



	serial@19c400000 {

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

		reg = <0x19c40000 0x1000>,

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "skeleton.dtsi"



/ {

	model = "Qualcomm MSM8960 CDP";

	compatible = "qcom,msm8960-cdp", "qcom,msm8960";

	interrupt-parent = <&intc>;



	intc: interrupt-controller@2000000 {

		compatible = "qcom,msm-qgic2";

		interrupt-controller;

		#interrupt-cells = <3>;

		reg = < 0x02000000 0x1000 >,

		      < 0x02002000 0x1000 >;

	};



	timer@200a004 {

		compatible = "qcom,msm-gpt", "qcom,msm-timer";

		interrupts = <1 2 0x301>;

		reg = <0x0200a004 0x10>;

		clock-frequency = <32768>;

		cpu-offset = <0x80000>;

	};



	timer@200a024 {

		compatible = "qcom,msm-dgt", "qcom,msm-timer";

		interrupts = <1 1 0x301>;

		reg = <0x0200a024 0x10>,

		      <0x0200a034 0x4>;

		clock-frequency = <6750000>;

		cpu-offset = <0x80000>;

	};



	serial@19c400000 {

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

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;

		interrupts = <0 154 0x0>;

	};

};

arch/arm/mach-msm/Kconfig

+2 −39
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ config ARCH_QSD8X50 


config ARCH_MSM8X60

	bool "MSM8X60"

	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \

				  && !MACH_MSM8X60_FFA)

	select ARCH_MSM_SCORPIONMP

	select ARM_GIC

	select CPU_V7
@@ -47,16 +45,17 @@ config ARCH_MSM8X60 
	select GPIO_MSM_V2

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select USE_OF



config ARCH_MSM8960

	bool "MSM8960"

	select ARCH_MSM_SCORPIONMP

	select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)

	select ARM_GIC

	select CPU_V7

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select USE_OF



endchoice
@@ -112,42 +111,6 @@ config MACH_QSD8X50A_ST1_5 
	help

	  Support for the Qualcomm ST1.5.



config MACH_MSM8X60_RUMI3

	depends on ARCH_MSM8X60

	bool "MSM8x60 RUMI3"

	help

	  Support for the Qualcomm MSM8x60 RUMI3 emulator.



config MACH_MSM8X60_SURF

	depends on ARCH_MSM8X60

	bool "MSM8x60 SURF"

	help

	  Support for the Qualcomm MSM8x60 SURF eval board.



config MACH_MSM8X60_SIM

	depends on ARCH_MSM8X60

	bool "MSM8x60 Simulator"

	help

	  Support for the Qualcomm MSM8x60 simulator.



config MACH_MSM8X60_FFA

	depends on ARCH_MSM8X60

	bool "MSM8x60 FFA"

	help

	  Support for the Qualcomm MSM8x60 FFA eval board.



config MACH_MSM8960_SIM

	depends on ARCH_MSM8960

	bool "MSM8960 Simulator"

	help

	  Support for the Qualcomm MSM8960 simulator.



config MACH_MSM8960_RUMI3

	depends on ARCH_MSM8960

	bool "MSM8960 RUMI3"

	help

	  Support for the Qualcomm MSM8960 RUMI3 emulator.



endmenu



config MSM_SMD_PKG3

arch/arm/mach-msm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o b 
obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o

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-msm8x60.o

obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.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

CRA Git | Maintained and supported by SUSTech CRA and CCSE