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

Commit 92202876 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mxs-cleanup-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup 

From Shawn Guo <shawn.guo@linaro.org>:

The mxs cleanup for 3.10:

* Clean up timer code and move it into drivers/clocksource
* Clean up icoll code and move it into drivers/irqchip
* Clean up clock code to not include <mach/*> headers
* Clean up rtc-stmp3xxx, mxs-lradc and mxs-saif to not include <mach/*>
  headers
* Clean up mach-mxs code to get it prepared for multiplatform support

* tag 'mxs-cleanup-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6

: (26 commits)
  clocksource: mxs_timer: Add semicolon at end of line
  ARM: mxs: remove unused headers
  ARM: mxs: merge imx23 and imx28 into one machine_desc
  ARM: mxs: remove common.h
  ARM: mxs: move mxs_get_ocotp() into mach-mxs.c
  ARM: mxs: remove mm.c
  ARM: mxs: use debug_ll_io_init for low-level debug
  ARM: mxs: get ocotp base address from device tree
  ARM: mxs: remove system.c
  ARM: mxs: get reset address from device tree
  ARM: mxs: remove empty hardware.h
  ASoC: mxs-saif: remove mach header inclusion
  iio: mxs-lradc: remove unneeded mach header inclusion
  rtc: stmp3xxx: use stmp_reset_block() instead
  clk: mxs: remove the use of mach level IO accessor
  clk: mxs: get base address from device tree
  ARM: mxs: remove unneeded mach-types.h inclusion
  ARM: mxs: move icoll driver into drivers/irqchip
  ARM: mxs: call stmp_reset_block() in icoll
  ARM: mxs: get icoll base address from device tree
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 44c0d237 e933a1a1

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -473,12 +473,14 @@ config ARCH_MXS 
	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK_PREPARE

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select SPARSE_IRQ

	select STMP_DEVICE

	select USE_OF

	help

	  Support for Freescale MXS-based family of processors

arch/arm/boot/dts/imx23.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ 
			};



			digctl@8001c000 {

				compatible = "fsl,imx23-digctl";

				reg = <0x8001c000 2000>;

				status = "disabled";

			};
@@ -321,6 +322,7 @@ 
			};



			ocotp@8002c000 {

				compatible = "fsl,ocotp";

				reg = <0x8002c000 0x2000>;

				status = "disabled";

			};
@@ -360,7 +362,7 @@ 
			ranges;



			clks: clkctrl@80040000 {

				compatible = "fsl,imx23-clkctrl";

				compatible = "fsl,imx23-clkctrl", "fsl,clkctrl";

				reg = <0x80040000 0x2000>;

				#clock-cells = <1>;

			};
@@ -426,6 +428,7 @@ 
				compatible = "fsl,imx23-timrot", "fsl,timrot";

				reg = <0x80068000 0x2000>;

				interrupts = <28 29 30 31>;

				clocks = <&clks 28>;

			};



			auart0: serial@8006c000 {

arch/arm/boot/dts/imx28.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ 
			};



			digctl@8001c000 {

				compatible = "fsl,imx28-digctl";

				reg = <0x8001c000 0x2000>;

				interrupts = <89>;

				status = "disabled";
@@ -676,6 +677,7 @@ 
			};



			ocotp@8002c000 {

				compatible = "fsl,ocotp";

				reg = <0x8002c000 0x2000>;

				status = "disabled";

			};
@@ -755,7 +757,7 @@ 
			ranges;



			clks: clkctrl@80040000 {

				compatible = "fsl,imx28-clkctrl";

				compatible = "fsl,imx28-clkctrl", "fsl,clkctrl";

				reg = <0x80040000 0x2000>;

				#clock-cells = <1>;

			};
@@ -838,6 +840,7 @@ 
				compatible = "fsl,imx28-timrot", "fsl,timrot";

				reg = <0x80068000 0x2000>;

				interrupts = <48 49 50 51>;

				clocks = <&clks 26>;

			};



			auart0: serial@8006a000 {

arch/arm/mach-mxs/Makefile

+0 −4
Original line number Diff line number Diff line 
# Common support

obj-y := icoll.o ocotp.o system.o timer.o mm.o



obj-$(CONFIG_PM) += pm.o



obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o

arch/arm/mach-mxs/include/mach/debug-macro.S

+3 −6
Original line number Diff line number Diff line
@@ -11,16 +11,13 @@ 
 *

 */



#include <mach/mx23.h>

#include <mach/mx28.h>



#ifdef CONFIG_DEBUG_IMX23_UART

#define UART_PADDR	MX23_DUART_BASE_ADDR

#define UART_PADDR	0x80070000

#elif defined (CONFIG_DEBUG_IMX28_UART)

#define UART_PADDR	MX28_DUART_BASE_ADDR

#define UART_PADDR	0x80074000

#endif



#define UART_VADDR	MXS_IO_ADDRESS(UART_PADDR)

#define UART_VADDR	0xfe100000



		.macro	addruart, rp, rv, tmp

		ldr	\rp, =UART_PADDR	@ physical