[PATCH 00/13] mach-mxs header files cleanup

[PATCH 00/13] mach-mxs header files cleanup

[Shawn Guo]

The series cleans up mach-mxs headers files in order to support
multiplatform build on mxs.

Andrew, Jonathan, Mark,

Can you please give your ACK on the patch you are copied, so that the
series can go via arm-soc as a whole?  Thanks.

Shawn

Shawn Guo (13):
  rtc: stmp3xxx: use stmp_reset_block() instead
  iio: mxs-lradc: remove unneeded mach header inclusion
  ASoC: mxs-saif: remove mach header inclusion
  ARM: mxs: remove empty hardware.h
  ARM: mxs: get reset address from device tree
  ARM: mxs: remove system.c
  ARM: mxs: get ocotp base address from device tree
  ARM: mxs: use debug_ll_io_init for low-level debug
  ARM: mxs: remove mm.c
  ARM: mxs: move mxs_get_ocotp() into mach-mxs.c
  ARM: mxs: remove common.h
  ARM: mxs: merge imx23 and imx28 into one machine_desc
  ARM: mxs: remove unused headers

 arch/arm/boot/dts/imx23.dtsi                 |    3 +-
 arch/arm/boot/dts/imx28.dtsi                 |    3 +-
 arch/arm/mach-mxs/Makefile                   |    4 -
 arch/arm/mach-mxs/include/mach/common.h      |   25 ---
 arch/arm/mach-mxs/include/mach/debug-macro.S |    9 +-
 arch/arm/mach-mxs/include/mach/digctl.h      |   22 ---
 arch/arm/mach-mxs/include/mach/hardware.h    |   23 ---
 arch/arm/mach-mxs/include/mach/mx23.h        |  169 -------------------
 arch/arm/mach-mxs/include/mach/mx28.h        |  225 --------------------------
 arch/arm/mach-mxs/include/mach/mxs.h         |  116 -------------
 arch/arm/mach-mxs/mach-mxs.c                 |  182 +++++++++++++++++----
 arch/arm/mach-mxs/mm.c                       |   52 ------
 arch/arm/mach-mxs/ocotp.c                    |   93 -----------
 arch/arm/mach-mxs/system.c                   |  139 ----------------
 drivers/rtc/rtc-stmp3xxx.c                   |    6 +-
 drivers/staging/iio/adc/mxs-lradc.c          |    3 -
 include/linux/clk/mxs.h                      |   16 ++
 sound/soc/mxs/mxs-saif.c                     |    5 +-
 18 files changed, 180 insertions(+), 915 deletions(-)
 delete mode 100644 arch/arm/mach-mxs/include/mach/common.h
 delete mode 100644 arch/arm/mach-mxs/include/mach/digctl.h
 delete mode 100644 arch/arm/mach-mxs/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-mxs/include/mach/mx23.h
 delete mode 100644 arch/arm/mach-mxs/include/mach/mx28.h
 delete mode 100644 arch/arm/mach-mxs/include/mach/mxs.h
 delete mode 100644 arch/arm/mach-mxs/mm.c
 delete mode 100644 arch/arm/mach-mxs/ocotp.c
 delete mode 100644 arch/arm/mach-mxs/system.c
 create mode 100644 include/linux/clk/mxs.h

-- 
1.7.9.5

[PATCH 03/13] ASoC: mxs-saif: remove mach header inclusion

[Shawn Guo]

The header <mach/hardware.h> is not needed at all, and <mach/mxs.h> is
needed only for macros MXS_SET_ADDR and MXS_CLR_ADDR.  Define the macros
and remove the mach header inclusions.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
---
 sound/soc/mxs/mxs-saif.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 3a2aa1d..41a6136 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -33,11 +33,12 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/mxs.h>
 
 #include "mxs-saif.h"
 
+#define MXS_SET_ADDR	0x4
+#define MXS_CLR_ADDR	0x8
+
 static struct mxs_saif *mxs_saif[2];
 
 /*
-- 
1.7.9.5

Re: [PATCH 03/13] ASoC: mxs-saif: remove mach header inclusion

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 308 bytes --]

On Fri, Mar 29, 2013 at 04:55:39PM +0800, Shawn Guo wrote:
> The header <mach/hardware.h> is not needed at all, and <mach/mxs.h> is
> needed only for macros MXS_SET_ADDR and MXS_CLR_ADDR.  Define the macros
> and remove the mach header inclusions.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]