linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10
@ 2013-04-09 15:19 Shawn Guo
  2013-04-09 15:19 ` [GIT PULL 2/4] ARM: imx: cleanup " Shawn Guo
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-09 15:19 UTC (permalink / raw)
  To: linux-arm-kernel

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/imx-noncritical-fixes-3.10

for you to fetch changes up to 4f5ef62ced8e7e01179de734856e03bddb06389c:

  ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro (2013-04-03 16:50:54 +0800)

----------------------------------------------------------------
The imx noncritical fixes for 3.10:

* A bunch of fixes for sparse warings
* One fix for the typo in use of Kconfig symbol
  MACH_EUKREA_CPUIMX27_USEUART4

----------------------------------------------------------------
Fabio Estevam (15):
      ARM: mach-imx: cpu: Include "common.h"
      ARM: mach-imx: mm-imx3: Staticize imx3_init_l2x0()
      ARM: mach-imx: iomux-imx31: Staticize mxc_pin_alloc_map
      ARM: mach-imx: cpu-imx5: Include "common.h"
      ARM: mach-imx: clk-pllv1: Staticize clk_pllv1_ops
      ARM: mach-imx: clk-pllv2: Staticize clk_pllv2_ops
      ARM: mach-imx: clk-gate2: Include "clk.h"
      ARM: mach-imx: irq-common: Remove imx_irq_set_priority()
      ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops
      ARM: mach-imx: clk: Include "clk.h"
      ARM: mach-imx: tzic: Staticize *tzic_base
      ARM: mach-imx: avic: Staticize *avic_base
      ARM: mach-imx: gpc: Include "common.h"
      ARM: mach-imx: src: Include "common.h
      ARM: mach-imx: mach-imx6q: Fix sparse warnings

Paul Bolle (1):
      ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro

 arch/arm/mach-imx/avic.c                     |    2 +-
 arch/arm/mach-imx/clk-busy.c                 |    2 +-
 arch/arm/mach-imx/clk-gate2.c                |    1 +
 arch/arm/mach-imx/clk-pllv1.c                |    2 +-
 arch/arm/mach-imx/clk-pllv2.c                |    2 +-
 arch/arm/mach-imx/clk.c                      |    1 +
 arch/arm/mach-imx/cpu-imx5.c                 |    1 +
 arch/arm/mach-imx/cpu.c                      |    1 +
 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c |    4 ++--
 arch/arm/mach-imx/gpc.c                      |    1 +
 arch/arm/mach-imx/iomux-imx31.c              |    2 +-
 arch/arm/mach-imx/irq-common.c               |   19 -------------------
 arch/arm/mach-imx/mach-cpuimx27.c            |    4 ++--
 arch/arm/mach-imx/mach-imx6q.c               |    4 ++--
 arch/arm/mach-imx/mm-imx3.c                  |    2 +-
 arch/arm/mach-imx/src.c                      |    1 +
 arch/arm/mach-imx/tzic.c                     |    2 +-
 17 files changed, 19 insertions(+), 32 deletions(-)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 2/4] ARM: imx: cleanup for 3.10
  2013-04-09 15:19 [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10 Shawn Guo
@ 2013-04-09 15:19 ` Shawn Guo
  2013-04-11 10:08   ` Olof Johansson
  2013-04-09 15:19 ` [GIT PULL 3/4] ARM: imx: soc changes " Shawn Guo
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2013-04-09 15:19 UTC (permalink / raw)
  To: linux-arm-kernel

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/imx-cleanup-3.10

for you to fetch changes up to 3442a7b51d1cfae144f3289ab0be44e27c236f53:

  ARM: i.MX: remove unused ARCH_* configs (2013-04-09 21:07:36 +0800)

----------------------------------------------------------------
The imx cleanup for 3.10:

* Clean up a couple of unneeded function declarations
* Remove imx specific cpufreq driver as generic cpufreq-cpu0 works well
  as the replacement
* Remove platform ahci support
* Clean up unused ARCH/MACH Kconfig symbols
* Remove a couple of unused files

----------------------------------------------------------------
Fabio Estevam (2):
      ARM: imx: avic: Move avic_saved_mask_reg under CONFIG_PM
      ARM: imx: clk-imx27: Do not register peripheral clock for SSI

Markus Pargmann (1):
      ARM: imx: Remove cpufreq driver

Paul Bolle (1):
      ARM: i.MX: remove unused ARCH_* configs

Sascha Hauer (1):
      ARM i.MX53: remove platform ahci support

Shawn Guo (4):
      ARM: imx: remove duplicated function declaration
      ARM: imx: remove pl310_get_save_ptr() declaration
      ARM: imx: remove Makefile.boot
      ARM: imx: remove mx6q.h

 arch/arm/Kconfig                              |    7 -
 arch/arm/mach-imx/Kconfig                     |   18 ---
 arch/arm/mach-imx/Makefile                    |    3 +-
 arch/arm/mach-imx/Makefile.boot               |   35 -----
 arch/arm/mach-imx/avic.c                      |    4 +-
 arch/arm/mach-imx/clk-imx27.c                 |    2 -
 arch/arm/mach-imx/common.h                    |    3 -
 arch/arm/mach-imx/cpu_op-mx51.c               |   31 ----
 arch/arm/mach-imx/cpu_op-mx51.h               |   14 --
 arch/arm/mach-imx/cpufreq.c                   |  206 -------------------------
 arch/arm/mach-imx/devices/Kconfig             |    4 -
 arch/arm/mach-imx/devices/Makefile            |    1 -
 arch/arm/mach-imx/devices/devices-common.h    |   10 --
 arch/arm/mach-imx/devices/platform-ahci-imx.c |  157 -------------------
 arch/arm/mach-imx/hardware.h                  |    1 -
 arch/arm/mach-imx/mach-cpuimx51sd.c           |    5 -
 arch/arm/mach-imx/mach-mx51_babbage.c         |    4 -
 arch/arm/mach-imx/mx6q.h                      |   31 ----
 18 files changed, 3 insertions(+), 533 deletions(-)
 delete mode 100644 arch/arm/mach-imx/Makefile.boot
 delete mode 100644 arch/arm/mach-imx/cpu_op-mx51.c
 delete mode 100644 arch/arm/mach-imx/cpu_op-mx51.h
 delete mode 100644 arch/arm/mach-imx/cpufreq.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-ahci-imx.c
 delete mode 100644 arch/arm/mach-imx/mx6q.h

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 3/4] ARM: imx: soc changes for 3.10
  2013-04-09 15:19 [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10 Shawn Guo
  2013-04-09 15:19 ` [GIT PULL 2/4] ARM: imx: cleanup " Shawn Guo
@ 2013-04-09 15:19 ` Shawn Guo
  2013-04-09 15:19 ` [GIT PULL 4/4] ARM: imx: device tree " Shawn Guo
  2013-04-11 10:05 ` [GIT PULL 1/4] ARM: imx: noncritical fixes " Olof Johansson
  3 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-09 15:19 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Arnd, Olof,

It's based on imx-cleanup-3.10 and Philipp Zabel's "Reset controller
API" pull request to resolve dependency and conflicts.

There will still be one trivial conflict with your clksrc/cleanup
branch.  My for-next branch contains the resolution.

Shawn

The following changes since commit a86a36ef05484eea7144bbf06e2194c831c325de:

  Merge remote-tracking branch 'pza/reset/for_v3.10' into imx/soc (2013-04-09 21:50:50 +0800)

are available in the git repository at:


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

for you to fetch changes up to 723bf2b0844f1d2435b8ffa4e706962a6a852179:

  ARM i.MX53: set CLK_SET_RATE_PARENT flag on the tve_ext_sel clock (2013-04-09 21:52:14 +0800)

----------------------------------------------------------------
The imx soc changes for 3.10:

* Enable anatop, well bisa and RBC for suspend to optimize the power
  consumption a little bit
* Clock changes for TVE, LDB, PATA, SRTC support
* Add System Reset Controller (SRC) support for imx5 and imx6
* Add initial imx6dl support based on imx6q code
* Kconfig for cpufreq-cpu0, defconfig updates and few other changes

----------------------------------------------------------------
Anson Huang (3):
      ARM: imx: enable anatop suspend/resume
      ARM: imx: enable periphery well bias for suspend
      ARM: imx: enable RBC to support anatop LPM mode

Fabio Estevam (3):
      ARM: mach-imx: anatop: Include "common.h"
      ARM: imx_v6_v7_defconfig: Select CONFIG_PERF_EVENTS
      ARM: imx_v4_v5_defconfig: Add CONFIG_GPIO_SYSFS

Gwenhael Goavec-Merou (1):
      ARM: imx1: mm: add call to mxc_device_init

Markus Pargmann (1):
      ARM: imx27, imx5: Add kconfig selects for cpufreq-cpu0

Martin Fuzzey (1):
      ARM: i.MX53 Add the cko1, cko2 clock outputs.

Philipp Zabel (14):
      ARM i.MX53: Add GPU clocks to clock tree
      ARM i.MX6q: export imx6q_revision
      ARM i.MX: Add imx_clk_divider_flags and imx_clk_mux_flags
      ARM i.MX53: fix ldb di divider and selector clocks
      ARM i.MX6q: fix ldb di divider and selector clocks
      ARM i.MX6q: Add audio/video PLL post dividers for i.MX6q rev 1.1
      ARM i.MX6q: set the LDB serial clock parent to the video PLL
      ARM i.MX6q: Add GPU, VPU, IPU, and OpenVG resets to System Reset Controller (SRC)
      staging: drm/imx: Use SRC to reset IPU
      ARM i.MX5: Remove tve_sel clock from i.MX53 clock tree
      ARM i.MX53: Remove unused tve_gate clkdev entry
      ARM i.MX53: make tve_ext_sel propagate rate change to PLL
      ARM i.MX53: tve_di clock is not part of the CCM, but of TVE
      ARM i.MX53: set CLK_SET_RATE_PARENT flag on the tve_ext_sel clock

Sascha Hauer (1):
      ARM: i.MX5: Add PATA and SRTC clocks

Shawn Guo (3):
      ARM: imx: do not use regmap_read for ANADIG_DIGPROG
      ARM: imx: add initial imx6dl support
      ARM: imx: do not bring up unavailable cores

 .../devicetree/bindings/clock/imx5-clock.txt       |   14 ++-
 .../devicetree/bindings/clock/imx6q-clock.txt      |    3 +
 .../devicetree/bindings/reset/fsl,imx-src.txt      |   49 ++++++++
 .../bindings/staging/imx-drm/fsl-imx-drm.txt       |    3 +
 arch/arm/Kconfig.debug                             |    4 +-
 arch/arm/configs/imx_v4_v5_defconfig               |    1 +
 arch/arm/configs/imx_v6_v7_defconfig               |    1 +
 arch/arm/mach-imx/Kconfig                          |   10 +-
 arch/arm/mach-imx/Makefile                         |    1 +
 arch/arm/mach-imx/anatop.c                         |  103 ++++++++++++++++
 arch/arm/mach-imx/clk-imx51-imx53.c                |   75 +++++++++---
 arch/arm/mach-imx/clk-imx6q.c                      |  128 ++++++++++++++++++--
 arch/arm/mach-imx/clk.h                            |   17 +++
 arch/arm/mach-imx/common.h                         |   10 +-
 arch/arm/mach-imx/gpc.c                            |   23 +++-
 arch/arm/mach-imx/mach-imx6q.c                     |   74 ++++-------
 arch/arm/mach-imx/mm-imx1.c                        |    2 +
 arch/arm/mach-imx/mxc.h                            |   11 ++
 arch/arm/mach-imx/platsmp.c                        |    4 +-
 arch/arm/mach-imx/pm-imx6q.c                       |    4 +-
 arch/arm/mach-imx/src.c                            |   65 ++++++++++
 drivers/staging/imx-drm/ipu-v3/ipu-common.c        |   12 +-
 22 files changed, 525 insertions(+), 89 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt
 create mode 100644 arch/arm/mach-imx/anatop.c

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 4/4] ARM: imx: device tree changes for 3.10
  2013-04-09 15:19 [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10 Shawn Guo
  2013-04-09 15:19 ` [GIT PULL 2/4] ARM: imx: cleanup " Shawn Guo
  2013-04-09 15:19 ` [GIT PULL 3/4] ARM: imx: soc changes " Shawn Guo
@ 2013-04-09 15:19 ` Shawn Guo
  2013-04-10  2:54   ` Shawn Guo
                     ` (2 more replies)
  2013-04-11 10:05 ` [GIT PULL 1/4] ARM: imx: noncritical fixes " Olof Johansson
  3 siblings, 3 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-09 15:19 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Arnd, Olof,

It's based on imx-cleanup-3.10 and Stephen Warren's "[GIT PULL] dt:
run C pre-processor on *.dts, create some standard headers" to resolve
dependency and conflicts.

Shawn

The following changes since commit 8b9ad9f67d094efd2c2765d82cc1866bee9052c2:

  Merge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' into imx/dt (2013-04-09 22:52:42 +0800)

are available in the git repository at:


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

for you to fetch changes up to 4b23185ff5e1c2ada2845002a034e8840ab98b63:

  ARM: dts: imx6dl-wandboard: Add USB Host support (2013-04-09 22:53:40 +0800)

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

* The huge diff stat is introduced by the pinctrl changes.  With DTC
  macro support ready, we're moving those huge mount of data about pins
  out of pinctrl driver.
* Device tree source updates for GPI, LDB, SRC, cpufreq-cpu0.
* Initial imx6dl device tree support
* Board level DTS changes for some imx27 and imx51 platforms.

----------------------------------------------------------------
Alexander Shiyan (2):
      ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
      ARM: dts: Add missing imx27-phytec-phycore dtb target

Dirk Behme (1):
      ARM: dts: imx6q: add PMU

Fabio Estevam (3):
      ARM: mx27: Replace clk_register_clkdev with clock DT lookup
      ARM: dts: Add initial support for Wandboard Dual-Lite
      ARM: dts: imx6dl-wandboard: Add USB Host support

Gwenhael Goavec-Merou (5):
      ARM: imx: Add support for the Armadeus Systems APF51Dev docking board
      ARM: imx51: Add pinctrl for ecspi2
      ARM: imx51: Add a second pinctrl group for i2c2
      ARM: imx: apf51dev: add ecspi1, ecspi2 and i2c2 support
      ARM: imx: Add support for the Armadeus Systems APF27Dev docking board

Marek Vasut (1):
      ARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configuration

Markus Pargmann (3):
      ARM: imx27 DT init cpufreq-cpu0 device
      ARM: imx5 DT init cpufreq-cpu0 device
      ARM: dts: imx51 cpu node

Pavel Machek (1):
      ARM: dts: MicroSys sbc6x support (i.MX6)

Peter Chen (1):
      ARM: dts: imx6q-sabresd: Add USB support

Philipp Zabel (6):
      ARM i.MX5: Move IPU clock lookups into device tree
      ARM i.MX53: Add IOMUXC GPR to device tree
      ARM i.MX53: Add LDB device to device tree
      ARM i.MX6q: Link system reset controller (SRC) to IPU in DT
      ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree
      ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53

Sascha Hauer (8):
      ARM: i.MX: Add GPT devicetree Documentation
      ARM: i.MX27: Add GPT devicetree nodes
      ARM: i.MX31: Add GPT devicetree node
      ARM: i.MX51: Add GPT devicetree node
      ARM: i.MX53: Add GPT devicetree node
      ARM: i.MX6: Add clocks to GPT devicetree node
      ARM: i.MX27: Add clocks to GPT devicetree nodes
      ARM: i.MX51: Add PATA support

Sean Cross (3):
      ARM: dts: imx6q: Add pinctrl for ecspi3
      ARM: dts: imx6q: Add pinctrl for i2c2 and i2c3
      ARM: dts: imx6q: Add pinctrl for audmix on AUD3

Shawn Guo (7):
      ARM: imx: use #include for all device trees
      pinctrl: imx: move hard-coding data into device tree
      pinctrl: add pinctrl driver for imx6dl
      pinctrl: add pinctrl driver for imx6sl
      ARM: dts: imx: make sabreauto and sabresd common
      ARM: dts: imx: add initial imx6dl-sabresd support
      ARM: dts: imx: add initial imx6dl-sabreauto support

Steffen Trumtrar (1):
      ARM i.MX6q: Add LDB device to device tree

 .../devicetree/bindings/clock/imx27-clock.txt      |  117 +
 .../bindings/pinctrl/fsl,imx-pinctrl.txt           |    6 +-
 .../bindings/pinctrl/fsl,imx35-pinctrl.txt         |  955 +-------
 .../bindings/pinctrl/fsl,imx51-pinctrl.txt         |  759 +------
 .../bindings/pinctrl/fsl,imx53-pinctrl.txt         | 1174 +---------
 .../bindings/pinctrl/fsl,imx6dl-pinctrl.txt        |   38 +
 .../bindings/pinctrl/fsl,imx6q-pinctrl.txt         | 1596 +-------------
 .../bindings/pinctrl/fsl,imx6sl-pinctrl.txt        |   39 +
 .../devicetree/bindings/timer/fsl,imxgpt.txt       |   18 +
 arch/arm/boot/dts/Makefile                         |    9 +-
 arch/arm/boot/dts/imx25-karo-tx25.dts              |    2 +-
 arch/arm/boot/dts/imx25-pdk.dts                    |    2 +-
 arch/arm/boot/dts/imx25.dtsi                       |    2 +-
 arch/arm/boot/dts/imx27-apf27.dts                  |    2 +-
 arch/arm/boot/dts/imx27-apf27dev.dts               |   60 +
 arch/arm/boot/dts/imx27-pdk.dts                    |    2 +-
 arch/arm/boot/dts/imx27-phytec-phycore.dts         |    8 +-
 arch/arm/boot/dts/imx27.dtsi                       |   82 +-
 arch/arm/boot/dts/imx31-bug.dts                    |    2 +-
 arch/arm/boot/dts/imx31.dtsi                       |   18 +-
 arch/arm/boot/dts/imx35-pinfunc.h                  |  970 +++++++++
 arch/arm/boot/dts/imx51-apf51.dts                  |    2 +-
 arch/arm/boot/dts/imx51-apf51dev.dts               |   97 +
 arch/arm/boot/dts/imx51-babbage.dts                |   16 +-
 arch/arm/boot/dts/imx51-pinfunc.h                  |  773 +++++++
 arch/arm/boot/dts/imx51.dtsi                       |  343 +--
 arch/arm/boot/dts/imx53-ard.dts                    |   70 +-
 arch/arm/boot/dts/imx53-evk.dts                    |   18 +-
 arch/arm/boot/dts/imx53-mba53.dts                  |   82 +-
 arch/arm/boot/dts/imx53-pinfunc.h                  | 1189 ++++++++++
 arch/arm/boot/dts/imx53-qsb.dts                    |   22 +-
 arch/arm/boot/dts/imx53-smd.dts                    |   16 +-
 arch/arm/boot/dts/imx53-tqma53.dtsi                |   32 +-
 arch/arm/boot/dts/imx53.dtsi                       |  256 ++-
 arch/arm/boot/dts/imx6dl-pinfunc.h                 | 1085 +++++++++
 arch/arm/boot/dts/imx6dl-sabreauto.dts             |   31 +
 arch/arm/boot/dts/imx6dl-sabresd.dts               |   35 +
 arch/arm/boot/dts/imx6dl-wandboard.dts             |   44 +
 arch/arm/boot/dts/imx6dl.dtsi                      |  125 +-
 arch/arm/boot/dts/imx6q-arm2.dts                   |    8 +-
 arch/arm/boot/dts/imx6q-pinfunc.h                  | 1041 +++++++++
 arch/arm/boot/dts/imx6q-sabreauto.dts              |   33 +-
 arch/arm/boot/dts/imx6q-sabrelite.dts              |   18 +-
 arch/arm/boot/dts/imx6q-sabresd.dts                |   67 +-
 arch/arm/boot/dts/imx6q-sbc6x.dts                  |   44 +
 arch/arm/boot/dts/imx6q.dtsi                       |  280 ++-
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |   38 +
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |   87 +
 arch/arm/boot/dts/imx6qdl.dtsi                     |   33 +-
 arch/arm/boot/dts/imx6sl-pinfunc.h                 | 1077 +++++++++
 arch/arm/mach-imx/Kconfig                          |    2 +
 arch/arm/mach-imx/clk-imx27.c                      |   11 +-
 arch/arm/mach-imx/clk-imx51-imx53.c                |    9 +-
 arch/arm/mach-imx/imx27-dt.c                       |   22 +-
 arch/arm/mach-imx/imx51-dt.c                       |    3 +
 arch/arm/mach-imx/mm-imx5.c                        |    2 +
 arch/arm/mach-imx/src.c                            |    4 +-
 drivers/pinctrl/Kconfig                            |   12 +-
 drivers/pinctrl/Makefile                           |    1 +
 drivers/pinctrl/pinctrl-imx.c                      |  126 +-
 drivers/pinctrl/pinctrl-imx.h                      |   29 +-
 drivers/pinctrl/pinctrl-imx35.c                    | 2088 +++++++-----------
 drivers/pinctrl/pinctrl-imx51.c                    | 1532 +++++--------
 drivers/pinctrl/pinctrl-imx53.c                    | 1597 ++------------
 drivers/pinctrl/pinctrl-imx6dl.c                   |  497 +++++
 drivers/pinctrl/pinctrl-imx6q.c                    | 2301 ++------------------
 drivers/pinctrl/pinctrl-imx6sl.c                   |  403 ++++
 67 files changed, 10490 insertions(+), 10972 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6dl-pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sl-pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.txt
 create mode 100644 arch/arm/boot/dts/imx27-apf27dev.dts
 create mode 100644 arch/arm/boot/dts/imx35-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx51-apf51dev.dts
 create mode 100644 arch/arm/boot/dts/imx51-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx53-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx6dl-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx6dl-sabreauto.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-sabresd.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-wandboard.dts
 create mode 100644 arch/arm/boot/dts/imx6q-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx6q-sbc6x.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-sabresd.dtsi
 create mode 100644 arch/arm/boot/dts/imx6sl-pinfunc.h
 create mode 100644 drivers/pinctrl/pinctrl-imx6dl.c
 create mode 100644 drivers/pinctrl/pinctrl-imx6sl.c

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 4/4] ARM: imx: device tree changes for 3.10
  2013-04-09 15:19 ` [GIT PULL 4/4] ARM: imx: device tree " Shawn Guo
@ 2013-04-10  2:54   ` Shawn Guo
  2013-04-16  3:08   ` Shawn Guo
  2013-04-18 16:25   ` Olof Johansson
  2 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-10  2:54 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Apr 09, 2013 at 11:19:35PM +0800, Shawn Guo wrote:
> Hi Arnd, Olof,
> 
> It's based on imx-cleanup-3.10 and Stephen Warren's "[GIT PULL] dt:
> run C pre-processor on *.dts, create some standard headers" to resolve
> dependency and conflicts.

Just a note, Rob just pulled Stephen's branch.  So it will be merged
via DT tree, and we only need it as a dependency in arm-soc tree.

Shawn

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10
  2013-04-09 15:19 [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10 Shawn Guo
                   ` (2 preceding siblings ...)
  2013-04-09 15:19 ` [GIT PULL 4/4] ARM: imx: device tree " Shawn Guo
@ 2013-04-11 10:05 ` Olof Johansson
  3 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2013-04-11 10:05 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Apr 09, 2013 at 11:19:32PM +0800, 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/imx-noncritical-fixes-3.10

Thanks, pulled into next/fixes-non-critical.


-Oof

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 2/4] ARM: imx: cleanup for 3.10
  2013-04-09 15:19 ` [GIT PULL 2/4] ARM: imx: cleanup " Shawn Guo
@ 2013-04-11 10:08   ` Olof Johansson
  0 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2013-04-11 10:08 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Apr 09, 2013 at 11:19:33PM +0800, 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/imx-cleanup-3.10

Merged into next/cleanup.


-Olof

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 4/4] ARM: imx: device tree changes for 3.10
  2013-04-09 15:19 ` [GIT PULL 4/4] ARM: imx: device tree " Shawn Guo
  2013-04-10  2:54   ` Shawn Guo
@ 2013-04-16  3:08   ` Shawn Guo
  2013-04-18 16:25   ` Olof Johansson
  2 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-16  3:08 UTC (permalink / raw)
  To: linux-arm-kernel

Ping.

On Tue, Apr 09, 2013 at 11:19:35PM +0800, Shawn Guo wrote:
> Hi Arnd, Olof,
> 
> It's based on imx-cleanup-3.10 and Stephen Warren's "[GIT PULL] dt:
> run C pre-processor on *.dts, create some standard headers" to resolve
> dependency and conflicts.
> 
> Shawn
> 
> The following changes since commit 8b9ad9f67d094efd2c2765d82cc1866bee9052c2:
> 
>   Merge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' into imx/dt (2013-04-09 22:52:42 +0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.10
> 
> for you to fetch changes up to 4b23185ff5e1c2ada2845002a034e8840ab98b63:
> 
>   ARM: dts: imx6dl-wandboard: Add USB Host support (2013-04-09 22:53:40 +0800)
> 
> ----------------------------------------------------------------
> The imx device tree changes for 3.10:
> 
> * The huge diff stat is introduced by the pinctrl changes.  With DTC
>   macro support ready, we're moving those huge mount of data about pins
>   out of pinctrl driver.
> * Device tree source updates for GPI, LDB, SRC, cpufreq-cpu0.
> * Initial imx6dl device tree support
> * Board level DTS changes for some imx27 and imx51 platforms.
> 
> ----------------------------------------------------------------
> Alexander Shiyan (2):
>       ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
>       ARM: dts: Add missing imx27-phytec-phycore dtb target
> 
> Dirk Behme (1):
>       ARM: dts: imx6q: add PMU
> 
> Fabio Estevam (3):
>       ARM: mx27: Replace clk_register_clkdev with clock DT lookup
>       ARM: dts: Add initial support for Wandboard Dual-Lite
>       ARM: dts: imx6dl-wandboard: Add USB Host support
> 
> Gwenhael Goavec-Merou (5):
>       ARM: imx: Add support for the Armadeus Systems APF51Dev docking board
>       ARM: imx51: Add pinctrl for ecspi2
>       ARM: imx51: Add a second pinctrl group for i2c2
>       ARM: imx: apf51dev: add ecspi1, ecspi2 and i2c2 support
>       ARM: imx: Add support for the Armadeus Systems APF27Dev docking board
> 
> Marek Vasut (1):
>       ARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configuration
> 
> Markus Pargmann (3):
>       ARM: imx27 DT init cpufreq-cpu0 device
>       ARM: imx5 DT init cpufreq-cpu0 device
>       ARM: dts: imx51 cpu node
> 
> Pavel Machek (1):
>       ARM: dts: MicroSys sbc6x support (i.MX6)
> 
> Peter Chen (1):
>       ARM: dts: imx6q-sabresd: Add USB support
> 
> Philipp Zabel (6):
>       ARM i.MX5: Move IPU clock lookups into device tree
>       ARM i.MX53: Add IOMUXC GPR to device tree
>       ARM i.MX53: Add LDB device to device tree
>       ARM i.MX6q: Link system reset controller (SRC) to IPU in DT
>       ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree
>       ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53
> 
> Sascha Hauer (8):
>       ARM: i.MX: Add GPT devicetree Documentation
>       ARM: i.MX27: Add GPT devicetree nodes
>       ARM: i.MX31: Add GPT devicetree node
>       ARM: i.MX51: Add GPT devicetree node
>       ARM: i.MX53: Add GPT devicetree node
>       ARM: i.MX6: Add clocks to GPT devicetree node
>       ARM: i.MX27: Add clocks to GPT devicetree nodes
>       ARM: i.MX51: Add PATA support
> 
> Sean Cross (3):
>       ARM: dts: imx6q: Add pinctrl for ecspi3
>       ARM: dts: imx6q: Add pinctrl for i2c2 and i2c3
>       ARM: dts: imx6q: Add pinctrl for audmix on AUD3
> 
> Shawn Guo (7):
>       ARM: imx: use #include for all device trees
>       pinctrl: imx: move hard-coding data into device tree
>       pinctrl: add pinctrl driver for imx6dl
>       pinctrl: add pinctrl driver for imx6sl
>       ARM: dts: imx: make sabreauto and sabresd common
>       ARM: dts: imx: add initial imx6dl-sabresd support
>       ARM: dts: imx: add initial imx6dl-sabreauto support
> 
> Steffen Trumtrar (1):
>       ARM i.MX6q: Add LDB device to device tree
> 
>  .../devicetree/bindings/clock/imx27-clock.txt      |  117 +
>  .../bindings/pinctrl/fsl,imx-pinctrl.txt           |    6 +-
>  .../bindings/pinctrl/fsl,imx35-pinctrl.txt         |  955 +-------
>  .../bindings/pinctrl/fsl,imx51-pinctrl.txt         |  759 +------
>  .../bindings/pinctrl/fsl,imx53-pinctrl.txt         | 1174 +---------
>  .../bindings/pinctrl/fsl,imx6dl-pinctrl.txt        |   38 +
>  .../bindings/pinctrl/fsl,imx6q-pinctrl.txt         | 1596 +-------------
>  .../bindings/pinctrl/fsl,imx6sl-pinctrl.txt        |   39 +
>  .../devicetree/bindings/timer/fsl,imxgpt.txt       |   18 +
>  arch/arm/boot/dts/Makefile                         |    9 +-
>  arch/arm/boot/dts/imx25-karo-tx25.dts              |    2 +-
>  arch/arm/boot/dts/imx25-pdk.dts                    |    2 +-
>  arch/arm/boot/dts/imx25.dtsi                       |    2 +-
>  arch/arm/boot/dts/imx27-apf27.dts                  |    2 +-
>  arch/arm/boot/dts/imx27-apf27dev.dts               |   60 +
>  arch/arm/boot/dts/imx27-pdk.dts                    |    2 +-
>  arch/arm/boot/dts/imx27-phytec-phycore.dts         |    8 +-
>  arch/arm/boot/dts/imx27.dtsi                       |   82 +-
>  arch/arm/boot/dts/imx31-bug.dts                    |    2 +-
>  arch/arm/boot/dts/imx31.dtsi                       |   18 +-
>  arch/arm/boot/dts/imx35-pinfunc.h                  |  970 +++++++++
>  arch/arm/boot/dts/imx51-apf51.dts                  |    2 +-
>  arch/arm/boot/dts/imx51-apf51dev.dts               |   97 +
>  arch/arm/boot/dts/imx51-babbage.dts                |   16 +-
>  arch/arm/boot/dts/imx51-pinfunc.h                  |  773 +++++++
>  arch/arm/boot/dts/imx51.dtsi                       |  343 +--
>  arch/arm/boot/dts/imx53-ard.dts                    |   70 +-
>  arch/arm/boot/dts/imx53-evk.dts                    |   18 +-
>  arch/arm/boot/dts/imx53-mba53.dts                  |   82 +-
>  arch/arm/boot/dts/imx53-pinfunc.h                  | 1189 ++++++++++
>  arch/arm/boot/dts/imx53-qsb.dts                    |   22 +-
>  arch/arm/boot/dts/imx53-smd.dts                    |   16 +-
>  arch/arm/boot/dts/imx53-tqma53.dtsi                |   32 +-
>  arch/arm/boot/dts/imx53.dtsi                       |  256 ++-
>  arch/arm/boot/dts/imx6dl-pinfunc.h                 | 1085 +++++++++
>  arch/arm/boot/dts/imx6dl-sabreauto.dts             |   31 +
>  arch/arm/boot/dts/imx6dl-sabresd.dts               |   35 +
>  arch/arm/boot/dts/imx6dl-wandboard.dts             |   44 +
>  arch/arm/boot/dts/imx6dl.dtsi                      |  125 +-
>  arch/arm/boot/dts/imx6q-arm2.dts                   |    8 +-
>  arch/arm/boot/dts/imx6q-pinfunc.h                  | 1041 +++++++++
>  arch/arm/boot/dts/imx6q-sabreauto.dts              |   33 +-
>  arch/arm/boot/dts/imx6q-sabrelite.dts              |   18 +-
>  arch/arm/boot/dts/imx6q-sabresd.dts                |   67 +-
>  arch/arm/boot/dts/imx6q-sbc6x.dts                  |   44 +
>  arch/arm/boot/dts/imx6q.dtsi                       |  280 ++-
>  arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |   38 +
>  arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |   87 +
>  arch/arm/boot/dts/imx6qdl.dtsi                     |   33 +-
>  arch/arm/boot/dts/imx6sl-pinfunc.h                 | 1077 +++++++++
>  arch/arm/mach-imx/Kconfig                          |    2 +
>  arch/arm/mach-imx/clk-imx27.c                      |   11 +-
>  arch/arm/mach-imx/clk-imx51-imx53.c                |    9 +-
>  arch/arm/mach-imx/imx27-dt.c                       |   22 +-
>  arch/arm/mach-imx/imx51-dt.c                       |    3 +
>  arch/arm/mach-imx/mm-imx5.c                        |    2 +
>  arch/arm/mach-imx/src.c                            |    4 +-
>  drivers/pinctrl/Kconfig                            |   12 +-
>  drivers/pinctrl/Makefile                           |    1 +
>  drivers/pinctrl/pinctrl-imx.c                      |  126 +-
>  drivers/pinctrl/pinctrl-imx.h                      |   29 +-
>  drivers/pinctrl/pinctrl-imx35.c                    | 2088 +++++++-----------
>  drivers/pinctrl/pinctrl-imx51.c                    | 1532 +++++--------
>  drivers/pinctrl/pinctrl-imx53.c                    | 1597 ++------------
>  drivers/pinctrl/pinctrl-imx6dl.c                   |  497 +++++
>  drivers/pinctrl/pinctrl-imx6q.c                    | 2301 ++------------------
>  drivers/pinctrl/pinctrl-imx6sl.c                   |  403 ++++
>  67 files changed, 10490 insertions(+), 10972 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.txt
>  create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6dl-pinctrl.txt
>  create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sl-pinctrl.txt
>  create mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.txt
>  create mode 100644 arch/arm/boot/dts/imx27-apf27dev.dts
>  create mode 100644 arch/arm/boot/dts/imx35-pinfunc.h
>  create mode 100644 arch/arm/boot/dts/imx51-apf51dev.dts
>  create mode 100644 arch/arm/boot/dts/imx51-pinfunc.h
>  create mode 100644 arch/arm/boot/dts/imx53-pinfunc.h
>  create mode 100644 arch/arm/boot/dts/imx6dl-pinfunc.h
>  create mode 100644 arch/arm/boot/dts/imx6dl-sabreauto.dts
>  create mode 100644 arch/arm/boot/dts/imx6dl-sabresd.dts
>  create mode 100644 arch/arm/boot/dts/imx6dl-wandboard.dts
>  create mode 100644 arch/arm/boot/dts/imx6q-pinfunc.h
>  create mode 100644 arch/arm/boot/dts/imx6q-sbc6x.dts
>  create mode 100644 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
>  create mode 100644 arch/arm/boot/dts/imx6qdl-sabresd.dtsi
>  create mode 100644 arch/arm/boot/dts/imx6sl-pinfunc.h
>  create mode 100644 drivers/pinctrl/pinctrl-imx6dl.c
>  create mode 100644 drivers/pinctrl/pinctrl-imx6sl.c
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 4/4] ARM: imx: device tree changes for 3.10
  2013-04-09 15:19 ` [GIT PULL 4/4] ARM: imx: device tree " Shawn Guo
  2013-04-10  2:54   ` Shawn Guo
  2013-04-16  3:08   ` Shawn Guo
@ 2013-04-18 16:25   ` Olof Johansson
  2013-04-18 23:30     ` Shawn Guo
  2 siblings, 1 reply; 10+ messages in thread
From: Olof Johansson @ 2013-04-18 16:25 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On Tue, Apr 09, 2013 at 11:19:35PM +0800, Shawn Guo wrote:
> Hi Arnd, Olof,
> 
> It's based on imx-cleanup-3.10 and Stephen Warren's "[GIT PULL] dt:
> run C pre-processor on *.dts, create some standard headers" to resolve
> dependency and conflicts.
> 

That's not adequate description of a dependency. We need to know what git
branch, not what patch posting, this is based on. And we need to make sure that
said git branch will never be rebased on the way up to Linus. That's
a three-way handshake between you, us and the maintainer with that dependency
in his tree.

> The following changes since commit 8b9ad9f67d094efd2c2765d82cc1866bee9052c2:
> 
>   Merge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' into imx/dt (2013-04-09 22:52:42 +0800)
> 
> are available in the git repository at:
> 
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.10
> 

Pulled, after finding Rob Herring's tree and finding him on irc to make sure he
doesn't rebase that branch.


-Olof

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL 4/4] ARM: imx: device tree changes for 3.10
  2013-04-18 16:25   ` Olof Johansson
@ 2013-04-18 23:30     ` Shawn Guo
  0 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2013-04-18 23:30 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Apr 18, 2013 at 09:25:45AM -0700, Olof Johansson wrote:
> Hi,
> 
> On Tue, Apr 09, 2013 at 11:19:35PM +0800, Shawn Guo wrote:
> > Hi Arnd, Olof,
> > 
> > It's based on imx-cleanup-3.10 and Stephen Warren's "[GIT PULL] dt:
> > run C pre-processor on *.dts, create some standard headers" to resolve
> > dependency and conflicts.
> > 
> 
> That's not adequate description of a dependency. We need to know what git
> branch, not what patch posting, this is based on. And we need to make sure that
> said git branch will never be rebased on the way up to Linus. That's
> a three-way handshake between you, us and the maintainer with that dependency
> in his tree.

Ok, will do better in the future.

Shawn

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2013-04-18 23:30 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-09 15:19 [GIT PULL 1/4] ARM: imx: noncritical fixes for 3.10 Shawn Guo
2013-04-09 15:19 ` [GIT PULL 2/4] ARM: imx: cleanup " Shawn Guo
2013-04-11 10:08   ` Olof Johansson
2013-04-09 15:19 ` [GIT PULL 3/4] ARM: imx: soc changes " Shawn Guo
2013-04-09 15:19 ` [GIT PULL 4/4] ARM: imx: device tree " Shawn Guo
2013-04-10  2:54   ` Shawn Guo
2013-04-16  3:08   ` Shawn Guo
2013-04-18 16:25   ` Olof Johansson
2013-04-18 23:30     ` Shawn Guo
2013-04-11 10:05 ` [GIT PULL 1/4] ARM: imx: noncritical fixes " Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).