[GIT PULL 1/4] ARM: mxs: cleanup for 3.10

[GIT PULL 1/4] ARM: mxs: cleanup for 3.10

[Shawn Guo]

Hi Arnd, Olof,

This is the mxs cleanup material for 3.10.  It's based on clksrc/cleanup
branch in arm-soc tree.  Please pull, thanks.

Shawn

The following changes since commit 3ed628a8122112ee796cd643e2478c4a6def234c:

  Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup (2013-04-01 16:29:56 +0800)

are available in the git repository at:


  git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-cleanup-3.10

for you to fetch changes up to e933a1a12a02f42e0013cda87bba37ccb59efc47:

  clocksource: mxs_timer: Add semicolon at end of line (2013-04-03 10:30:08 +0800)

----------------------------------------------------------------
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

----------------------------------------------------------------
Fabio Estevam (1):
      clocksource: mxs_timer: Add semicolon at end of line

Shawn Guo (25):
      ARM: mxs: use CLKSRC_OF helper to initialize timer
      ARM: mxs: look up timrot clock from device tree
      ARM: mxs: get timrot base address from device tree
      ARM: mxs: remove cpu_is_mx23() call from timer code
      ARM: mxs: select STMP_DEVICE and use it for timer code
      ARM: mxs: move timer driver into drivers/clocksource
      ARM: mxs: get icoll base address from device tree
      ARM: mxs: call stmp_reset_block() in icoll
      ARM: mxs: move icoll driver into drivers/irqchip
      ARM: mxs: remove unneeded mach-types.h inclusion
      clk: mxs: get base address from device tree
      clk: mxs: remove the use of mach level IO accessor
      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/Kconfig                                   |    2 +
 arch/arm/boot/dts/imx23.dtsi                       |    5 +-
 arch/arm/boot/dts/imx28.dtsi                       |    5 +-
 arch/arm/mach-mxs/Makefile                         |    4 -
 arch/arm/mach-mxs/include/mach/common.h            |   29 ---
 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               |  117 ----------
 arch/arm/mach-mxs/mach-mxs.c                       |  185 +++++++++++++---
 arch/arm/mach-mxs/mm.c                             |   52 -----
 arch/arm/mach-mxs/ocotp.c                          |   93 --------
 arch/arm/mach-mxs/system.c                         |  139 ------------
 drivers/clk/mxs/clk-imx23.c                        |   42 ++--
 drivers/clk/mxs/clk-imx28.c                        |   42 ++--
 drivers/clocksource/Makefile                       |    1 +
 .../timer.c => drivers/clocksource/mxs_timer.c     |   36 ++--
 drivers/irqchip/Makefile                           |    1 +
 .../mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c  |   24 +--
 drivers/rtc/rtc-stmp3xxx.c                         |    6 +-
 drivers/staging/iio/adc/mxs-lradc.c                |    3 -
 include/linux/clk/mxs.h                            |   16 ++
 include/linux/irqchip/mxs.h                        |   14 ++
 sound/soc/mxs/mxs-saif.c                           |    5 +-
 26 files changed, 279 insertions(+), 990 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
 rename arch/arm/mach-mxs/timer.c => drivers/clocksource/mxs_timer.c (91%)
 rename arch/arm/mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c (89%)
 create mode 100644 include/linux/clk/mxs.h
 create mode 100644 include/linux/irqchip/mxs.h

[GIT PULL 2/4] ARM: mxs: multiplatform for 3.10

[Shawn Guo]

Hi Arnd, Olof,

It's based on mxs-cleanup-3.10 to enable multiplatform build for
mach-mxs. Please pull, thanks.

Shawn

The following changes since commit e933a1a12a02f42e0013cda87bba37ccb59efc47:

  clocksource: mxs_timer: Add semicolon at end of line (2013-04-03 10:30:08 +0800)

are available in the git repository at:

  git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-multiplatform-3.10

for you to fetch changes up to d696e3f6585ddeb7bddbf0783b649fa669459a5c:

  ARM: mxs: enable multiplatform build (2013-04-04 21:15:58 +0800)

----------------------------------------------------------------
The mxs multiplatform support for 3.10:

* It enables the multiplatform build for mach-mxs platform.

----------------------------------------------------------------
Shawn Guo (3):
      ARM: mxs: call mxs_pm_init() as a machine_desc hook
      ARM: mxs: rename debug-macro.S for multiplatform build
      ARM: mxs: enable multiplatform build

 arch/arm/Kconfig                                   |   17 -----
 arch/arm/Kconfig.debug                             |    1 +
 arch/arm/configs/mxs_defconfig                     |    2 +-
 .../mach/debug-macro.S => include/debug/mxs.S}     |    0
 arch/arm/mach-mxs/Kconfig                          |   22 +++---
 arch/arm/mach-mxs/Makefile                         |    2 +-
 arch/arm/mach-mxs/Makefile.boot                    |    1 -
 arch/arm/mach-mxs/include/mach/timex.h             |   21 ------
 arch/arm/mach-mxs/include/mach/uncompress.h        |   76 --------------------
 arch/arm/mach-mxs/mach-mxs.c                       |    3 +
 arch/arm/mach-mxs/pm.c                             |    4 +-
 arch/arm/mach-mxs/pm.h                             |   14 ++++
 12 files changed, 33 insertions(+), 130 deletions(-)
 rename arch/arm/{mach-mxs/include/mach/debug-macro.S => include/debug/mxs.S} (100%)
 delete mode 100644 arch/arm/mach-mxs/Makefile.boot
 delete mode 100644 arch/arm/mach-mxs/include/mach/timex.h
 delete mode 100644 arch/arm/mach-mxs/include/mach/uncompress.h
 create mode 100644 arch/arm/mach-mxs/pm.h

[GIT PULL 3/4] ARM: mxs: soc changes for 3.10

[Shawn Guo]

The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:

  Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)

are available in the git repository at:

  git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-soc-3.10

for you to fetch changes up to 656c284c5c517460245db159e122b0207f06f998:

  ARM: mxs_defconfig: Select watchdog driver (2013-04-01 16:31:04 +0800)

----------------------------------------------------------------
The mxs soc changes for 3.10:

* A few mxs_defconfig changes
* Select ARM_CPU_SUSPEND for suspend testing

----------------------------------------------------------------
Fabio Estevam (4):
      ARM: mxs: Select ARM_CPU_SUSPEND
      ARM: mxs_defconfig: Build CONFIG_INPUT_EVDEV as built-in
      ARM: mxs_defconfig: Select CONFIG_MMC_UNSAFE_RESUME
      ARM: mxs_defconfig: Select watchdog driver

 arch/arm/configs/mxs_defconfig |    5 ++++-
 arch/arm/mach-mxs/Kconfig      |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

[GIT PULL 4/4] ARM: mxs: device tree changes for 3.10

[Shawn Guo]

Hi Arnd, Olof,

This is the mxs device tree changes for 3.10.  It's based on
mxs-cleanup-3.10 to avoid some nasty conflicts.  Please pull, thanks.

Shawn

The following changes since commit e933a1a12a02f42e0013cda87bba37ccb59efc47:

  clocksource: mxs_timer: Add semicolon at end of line (2013-04-03 10:30:08 +0800)

are available in the git repository at:

  git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.10

for you to fetch changes up to 4344429d3d926d219671f607125cff51223a140a:

  video: mxsfb: Introduce regulator support (2013-04-08 15:44:55 +0800)

----------------------------------------------------------------
The mxs device tree changes for 3.10:

* Move enet_out clk into device tree and have fec driver handle it.
* Convert mxsfb driver to generic display timings bindings, and remove
  the mxsfb auxdata from platform code.
* Add generic DMA device tree binding for mxs-dma, and convert the most
  of client device drivers to it.
* Change mxsfb driver to use regulator for controlling power of panel.
* A few device tree source updates

----------------------------------------------------------------
Alexandre Belloni (3):
      ARM: cfa10036: add one wire bitbanging to the cfa10049
      pinctrl: pinctrl-mxs: document the missing pull-ups
      ARM: dts: cfa10036: Add touchscreen support to the CFA-10049

Alexandre Pereira da Silva (1):
      ARM: dts: imx23-olinuxino: mark sdcard cd as broken

Fabio Estevam (1):
      video: mxsfb: Introduce regulator support

Shawn Guo (16):
      net: fec: handle optional clk_ptp more gracefully
      ARM: mxs: remove unneeded enet_out clk initialization
      video: mxsfb: use devm_* managed functions
      video: mxsfb: remove fb_phys/fb_size from platform_data
      video: mxsfb: remove dotclk_delay from platform_data
      video: mxsfb: get display timings from device tree
      ARM: mxs: move display timing configurations into device tree
      video: mxsfb: remove mxsfb_platform_data
      ARM: dts: add generic DMA device tree binding for mxs-dma
      dma: mxs-dma: use devm_* managed functions
      dma: mxs-dma: move to generic device tree binding
      mmc: mxs-mmc: move to use generic DMA helper
      spi: mxs-spi: move to use generic DMA helper
      i2c: i2c-mxs: move to use generic DMA helper
      mtd: gpmi: move to use generic DMA helper
      serial: mxs-auart: move to use generic DMA helper

Wolfram Sang (2):
      net: freescale: fec: add support for optional enet_out clk
      ARM: dts: mxs: add enet_out clock to devicetree

 .../devicetree/bindings/dma/fsl-mxs-dma.txt        |   49 +++-
 Documentation/devicetree/bindings/fb/mxsfb.txt     |   36 ++-
 Documentation/devicetree/bindings/i2c/i2c-mxs.txt  |   12 +-
 Documentation/devicetree/bindings/mmc/mxs-mmc.txt  |   12 +-
 .../devicetree/bindings/mtd/gpmi-nand.txt          |   17 +-
 .../bindings/pinctrl/fsl,mxs-pinctrl.txt           |    4 +
 Documentation/devicetree/bindings/spi/mxs-spi.txt  |   12 +-
 .../bindings/tty/serial/fsl-mxs-auart.txt          |   16 +-
 arch/arm/boot/dts/imx23-evk.dts                    |   36 ++-
 arch/arm/boot/dts/imx23-olinuxino.dts              |    1 +
 arch/arm/boot/dts/imx23.dtsi                       |   42 +++-
 arch/arm/boot/dts/imx28-apf28dev.dts               |   25 ++
 arch/arm/boot/dts/imx28-apx4devkit.dts             |   25 ++
 arch/arm/boot/dts/imx28-cfa10049.dts               |   50 +++-
 arch/arm/boot/dts/imx28-evk.dts                    |   36 ++-
 arch/arm/boot/dts/imx28-m28evk.dts                 |   27 ++
 arch/arm/boot/dts/imx28.dtsi                       |   62 ++++-
 arch/arm/boot/dts/imx6qdl.dtsi                     |    8 +-
 arch/arm/mach-mxs/mach-mxs.c                       |  170 -------------
 drivers/dma/mxs-dma.c                              |  109 +++++---
 drivers/i2c/busses/i2c-mxs.c                       |   40 +--
 drivers/mmc/host/mxs-mmc.c                         |   48 +---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |   51 +---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |    3 +-
 drivers/net/ethernet/freescale/fec.c               |   18 +-
 drivers/net/ethernet/freescale/fec.h               |    1 +
 drivers/spi/spi-mxs.c                              |   60 +----
 drivers/tty/serial/mxs-auart.c                     |   52 +---
 drivers/video/Kconfig                              |    2 +
 drivers/video/mxsfb.c                              |  260 ++++++++++++--------
 include/linux/mxsfb.h                              |   52 ----
 include/linux/spi/mxs-spi.h                        |    4 +-
 32 files changed, 696 insertions(+), 644 deletions(-)
 delete mode 100644 include/linux/mxsfb.h

[GIT PULL 1/4] ARM: mxs: cleanup for 3.10

[Arnd Bergmann]

On Monday 08 April 2013, Shawn Guo wrote:
> Hi Arnd, Olof,
> 
> This is the mxs cleanup material for 3.10.  It's based on clksrc/cleanup
> branch in arm-soc tree.  Please pull, thanks.

Pulled into next/cleanup, thanks!

	Arnd

[GIT PULL 2/4] ARM: mxs: multiplatform for 3.10

[Arnd Bergmann]

On Monday 08 April 2013, Shawn Guo wrote:
> Hi Arnd, Olof,
> 
> It's based on mxs-cleanup-3.10 to enable multiplatform build for
> mach-mxs. Please pull, thanks.

Great work, I did not see this one coming for 3.10.

Pulled into next/multiplatform, thanks!

	Arnd

[GIT PULL 3/4] ARM: mxs: soc changes for 3.10

[Arnd Bergmann]

On Monday 08 April 2013, Shawn Guo wrote:
> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
> 
>   Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
> 
> are available in the git repository at:
> 
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-soc-3.10
> 
> for you to fetch changes up to 656c284c5c517460245db159e122b0207f06f998:
> 
>   ARM: mxs_defconfig: Select watchdog driver (2013-04-01 16:31:04 +0800)
> 

Pulled into next/soc, thanks!

	Arnd

[GIT PULL 4/4] ARM: mxs: device tree changes for 3.10

[Arnd Bergmann]

On Monday 08 April 2013, Shawn Guo wrote:
> Hi Arnd, Olof,
> 
> This is the mxs device tree changes for 3.10.  It's based on
> mxs-cleanup-3.10 to avoid some nasty conflicts.  Please pull, thanks.
> 
> Shawn
> 
> The following changes since commit e933a1a12a02f42e0013cda87bba37ccb59efc47:
> 
>   clocksource: mxs_timer: Add semicolon at end of line (2013-04-03 10:30:08 +0800)
> 
> are available in the git repository at:
> 
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.10
> 
> for you to fetch changes up to 4344429d3d926d219671f607125cff51223a140a:
> 
>   video: mxsfb: Introduce regulator support (2013-04-08 15:44:55 +0800)
> 
> ----------------------------------------------------------------
> The mxs device tree changes for 3.10:
> 
> * Move enet_out clk into device tree and have fec driver handle it.
> * Convert mxsfb driver to generic display timings bindings, and remove
>   the mxsfb auxdata from platform code.
> * Add generic DMA device tree binding for mxs-dma, and convert the most
>   of client device drivers to it.
> * Change mxsfb driver to use regulator for controlling power of panel.
> * A few device tree source updates

Pulled into next/dt2, thanks!

	Arnd