[GIT PULL 1/5] ARM: imx: weim bus driver update for 3.12

[GIT PULL 1/5] ARM: imx: weim bus driver update for 3.12

[Shawn Guo]

The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:

  Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)

are available in the git repository at:

  git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-weim-3.12

for you to fetch changes up to 3f98b6baad63b181da4e859d81953e88ce8a50ec:

  drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53 (2013-08-16 12:59:44 +0800)

----------------------------------------------------------------
This is a patch series that updates imx-weim bus driver to have it
support more i.MX SoCs.  Because there is no maintainer for
drivers/bus so far, I'm forwarding it through IMX tree for 3.12 merge
window.

----------------------------------------------------------------
Alexander Shiyan (5):
      drivers: bus: imx-weim: Remove private driver data
      drivers: bus: imx-weim: Simplify error path
      drivers: bus: imx-weim: use module_platform_driver_probe()
      drivers: bus: imx-weim: Add missing platform_driver.owner field
      drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53

 Documentation/devicetree/bindings/bus/imx-weim.txt |   17 ++-
 drivers/bus/Kconfig                                |    3 +-
 drivers/bus/imx-weim.c                             |  129 +++++++++++---------
 3 files changed, 87 insertions(+), 62 deletions(-)

[GIT PULL 3/5] ARM: imx: device tree changes for 3.12

[Shawn Guo]

Olof, Kevin,

The pull request depends on the previous one imx-soc-3.12.  Please take
care of it.  Thanks.

Shawn

The following changes since commit 130ef23a4b3bf9e564a6d000c096e9cb50f2e5c5:

  Merge tag 'imx-soc-3.12' into imx/dt (2013-08-18 16:30:14 +0800)

are available in the git repository at:


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

for you to fetch changes up to 63f4b28640da45ecae5bfacfe0d2a12c71a25c56:

  ARM: dts: vf610-twr: enable i2c0 device (2013-08-18 16:33:05 +0800)

----------------------------------------------------------------
It contains the imx device tree updates for 3.12.

- New pinctrl entry additions for various peripherals
- Devices enabling for imx6, imx5 and imx27 boards
- Add missing device nodes like iim, owire, audmux and sram, etc.
- Various updates on boards like phytec, wandboard and sabresd
- Consolidate pad macros between imx6q and imx6dl

----------------------------------------------------------------
Alexander Shiyan (25):
      ARM: dts: imx27: Add SAHARA2 devicetree node
      ARM: dts: imx27: Add AUDMUX devicetree node
      ARM: dts: imx27: Rename PWM devicetree node
      ARM: dts: imx27: Sort entries by address
      ARM: dts: imx27-phytec-phycore-som: Define minimal memory layout
      ARM: dts: imx27: Add kpp devicetree node
      ARM: dts: i.MX27: Move IIM node under AIPI2 bus
      ARM: dts: i.MX27: Add WEIM node
      ARM: dts: imx27-phytec-phycore-som: Add WEIM node
      ARM: dts: imx27-phytec-phycore-som: Add SRAM node
      ARM: dts: imx27-phytec-phycore-rdk: Add CAN node
      ARM: dts: imx27-phytec-phycore-som: Using labels for reusing UART, I2C and FEC
      ARM: dts: i.MX51: Add WEIM node
      ARM: dts: imx27: Add core voltages
      ARM: dts: i.MX27: Using "wdog_ipg_gate" clock source for watchdog
      ARM: dts: i.MX27: Remove optional "ptp" clock source for FEC
      ARM: dts: i.MX27: Add label to CPU node
      ARM: dts: i.MX27: Increase "clock-latency" value
      ARM: dts: i.MX27: Remove clock name from CPU node
      ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
      ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
      ARM: dts: i.MX27: Disable AUDMUX in the template
      ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
      ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
      ARM: dts: i.MX51: Add one more I2C2 pinmux entry

Fabio Estevam (13):
      ARM: imx27: Use 'AITC' for the interrupt controller name
      ARM: dts: mx53qsb: Enable VPU support
      ARM: dts: imx6dl-wandboard: Add audio support
      ARM: dts: imx: Add the missing cpus node
      ARM: dts: imx6qdl.dtsi: Add usdhc1 pin groups
      ARM: dts: imx6qdl.dtsi: Add another uart3 pin group
      ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports
      ARM: dts: imx6dl-wandboard: Add support for UART3
      ARM: dts: imx6: Add support for imx6q wandboard
      ARM: dts: imx6q-wandboard: Add sata support
      ARM: dts: imx6qdl-sabresd: Allow buttons to wake-up the system
      ARM: dts: imx6qdl-sabresd: Add touchscreen support
      ARM: dts: imx53-qsb: Make USBH1 functional

Huang Shijie (10):
      ARM: dts: imx6dl: add a new pinctrl for ecspi1
      ARM: dts: imx6q: add a new pinctrl for ecspi1
      ARM: dts: imx6qdl-sabresd: enable the SPI NOR
      ARM: dts: imx: add #dma-cells property for sdma
      ARM: dts: imx6sl: add "fsl,imx6q-uart" for uart compatible
      ARM: dts: imx6q{dl}: add DTE pads for uart
      ARM: dts: imx6q{dl}: add a DTE uart pinctrl for uart2
      ARM: dts: enable the uart2 for imx6q-arm2
      ARM: dts: imx6qdl: add a new pinctrl for uart3
      ARM: dts: imx6qdl/imx6sl: add the dma property for uart

Jingchang Lu (1):
      ARM: dts: vf610-twr: enable i2c0 device

Markus Pargmann (8):
      ARM: dts: imx27: Add imx framebuffer device
      ARM: dts: imx27: Add 1-wire
      ARM: dts: imx27 cpufreq-cpu0 frequencies
      ARM: dts: Add device tree support for phycard pca100
      ARM: dts: imx27 phyCARD-S remove wrong I2C RTC
      ARM: dts: imx27 phyCARD-S SOM remove wrong i2c sensor
      ARM: dts: imx27 phyCARD-S, move i2c1 and owire to rdk
      ARM: dts: imx27 phyCARD-S, i2c ADC device node

Matthias Weisser (1):
      ARM: dts: imx25: Make lcdc compatible to imx21 fb

Peter Chen (2):
      ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
      ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog

Philipp Zabel (4):
      ARM: dts: add sram for imx53 and imx6q
      ARM i.MX6DL: dts: add clock and mux configuration for LDB
      ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
      ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module

Philippe Reynes (1):
      ARM: apf27dev: add rtc ds1374 to the device tree

Richard Zhu (1):
      ARM: dtsi: enable ahci sata on imx6q platforms

Sascha Hauer (16):
      ARM: dts: i.MX6: sync imx6q and imx6dl pinmux entries
      ARM: dts: i.MX6qdl: Add compatible and clock to flexcan nodes
      ARM: dts: i.MX6qdl: Add i.MX31 compatible to gpt node
      ARM: dts: i.MX27: Add iim node
      ARM: dts: i.MX31: Add iim node
      ARM: dts: i.MX25: Add iim node
      ARM: dts: i.MX51: Add iim node
      ARM: dts: i.MX53: Add iim node
      ARM: dts: i.MX25: Add i2c and spi aliases
      ARM: dts: i.MX27: Add i2c aliases
      ARM: dts: i.MX51: Add i2c and spi aliases
      ARM: dts: i.MX53: Add i2c and spi aliases
      ARM: dts: i.MX6: Add i2c and spi aliases
      ARM: dts: i.MX51: move kpp pinmux entry
      ARM: dts: i.MX51 babbage: Add spi-cs-high property to pmic
      ARM: dts: i.MX51: Add USB host1/2 pinmux entries

Shawn Guo (9):
      ARM: dts: imx: share pad macro names between imx6q and imx6dl
      ARM: dts: add more imx6q/dl pin groups
      ARM: dts: imx: remove old DMA binding data from gpmi node
      ARM: dts: imx: add tempmon node for imx6q thermal support
      ARM: dts: imx: add LVDS panel for imx6qdl-sabresd
      ARM: dts: imx: use generic DMA bindings for SSI nodes
      ARM: imx6q: remove board specific CLKO setup
      ARM: dts: imx: ocram size is different between imx6q and imx6dl
      ARM: imx: add ocram clock for imx53

Tony Prisk (1):
      ARM: dts: wandboard: Add support for SDIO bcm4329

 .../devicetree/bindings/clock/imx5-clock.txt       |    1 +
 arch/arm/boot/dts/Makefile                         |    3 +
 arch/arm/boot/dts/imx25.dtsi                       |   35 +-
 arch/arm/boot/dts/imx27-apf27dev.dts               |    5 +
 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts   |   93 +
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts   |   44 +
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts     |   13 +
 arch/arm/boot/dts/imx27-phytec-phycore-som.dts     |  125 +-
 arch/arm/boot/dts/imx27.dtsi                       |  120 +-
 arch/arm/boot/dts/imx31.dtsi                       |   17 +
 arch/arm/boot/dts/imx51-apf51.dts                  |    4 -
 arch/arm/boot/dts/imx51-babbage.dts                |    5 +
 arch/arm/boot/dts/imx51.dtsi                       |  632 +++---
 arch/arm/boot/dts/imx53-qsb.dts                    |   18 +-
 arch/arm/boot/dts/imx53.dtsi                       |   56 +-
 arch/arm/boot/dts/imx6dl-pinfunc.h                 | 2138 ++++++++++----------
 arch/arm/boot/dts/imx6dl-sabreauto.dts             |   22 -
 arch/arm/boot/dts/imx6dl-sabresd.dts               |   19 -
 arch/arm/boot/dts/imx6dl-wandboard.dts             |   24 +-
 arch/arm/boot/dts/imx6dl.dtsi                      |  254 +--
 arch/arm/boot/dts/imx6q-arm2.dts                   |   14 +-
 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi         |  112 +-
 arch/arm/boot/dts/imx6q-pinfunc.h                  | 2050 +++++++++----------
 arch/arm/boot/dts/imx6q-sabreauto.dts              |   22 +-
 arch/arm/boot/dts/imx6q-sabrelite.dts              |   22 +-
 arch/arm/boot/dts/imx6q-sabresd.dts                |   19 +-
 arch/arm/boot/dts/imx6q-wandboard.dts              |   26 +
 arch/arm/boot/dts/imx6q.dtsi                       |  393 +---
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |   22 +
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |   92 +-
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |  137 ++
 arch/arm/boot/dts/imx6qdl.dtsi                     |  770 ++++++-
 arch/arm/boot/dts/imx6sl.dtsi                      |   35 +-
 arch/arm/boot/dts/vf610-twr.dts                    |    7 +
 arch/arm/mach-imx/clk-imx51-imx53.c                |    3 +-
 arch/arm/mach-imx/clk-imx6q.c                      |   11 +
 arch/arm/mach-imx/mach-imx6q.c                     |   69 -
 37 files changed, 4201 insertions(+), 3231 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
 create mode 100644 arch/arm/boot/dts/imx6q-wandboard.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard.dtsi

[GIT PULL 3/5] ARM: imx: device tree changes for 3.12

[Kevin Hilman]

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

> Olof, Kevin,
>
> The pull request depends on the previous one imx-soc-3.12.  Please take
> care of it.  Thanks.

It seems it also has a dependency on [GIT PULL 1/5] for the binding
changes to the weim bus?  (specifically patch "ARM: dts: i.MX27: Add
WEIM node" uses the updated binding, correct?)  Please try and describe
all the dependencies.

Also, since it's based on the previous pull where I asked for some
changes (dropping DEBUG_LL support) you'll need to respin this one as well.

Kevin

[GIT PULL 3/5] ARM: imx: device tree changes for 3.12

[Shawn Guo]

On Thu, Aug 22, 2013 at 07:20:05AM -0700, Kevin Hilman wrote:
> Shawn Guo <shawn.guo@linaro.org> writes:
> 
> > Olof, Kevin,
> >
> > The pull request depends on the previous one imx-soc-3.12.  Please take
> > care of it.  Thanks.
> 
> It seems it also has a dependency on [GIT PULL 1/5] for the binding
> changes to the weim bus?  (specifically patch "ARM: dts: i.MX27: Add
> WEIM node" uses the updated binding, correct?)

Applying this patch without [GIT PULL 1/5] does not causes any breakage
or regression.  This new support is supposed to start working when
imx/weim and imx/dt branch get merged together.  We generally do not
take such thing as a dependency, right?

> Please try and describe
> all the dependencies.
> 
> Also, since it's based on the previous pull where I asked for some
> changes (dropping DEBUG_LL support) you'll need to respin this one as well.

Yes, I will respin this one as well.

Shawn

[GIT PULL 1/5] ARM: imx: weim bus driver update for 3.12

[Kevin Hilman]

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

> The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
>
>   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
>
> are available in the git repository at:
>
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-weim-3.12
>
> for you to fetch changes up to 3f98b6baad63b181da4e859d81953e88ce8a50ec:
>
>   drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53 (2013-08-16 12:59:44 +0800)
>
> ----------------------------------------------------------------
> This is a patch series that updates imx-weim bus driver to have it
> support more i.MX SoCs.  Because there is no maintainer for
> drivers/bus so far, I'm forwarding it through IMX tree for 3.12 merge
> window.
>
> ----------------------------------------------------------------
> Alexander Shiyan (5):
>       drivers: bus: imx-weim: Remove private driver data
>       drivers: bus: imx-weim: Simplify error path
>       drivers: bus: imx-weim: use module_platform_driver_probe()
>       drivers: bus: imx-weim: Add missing platform_driver.owner field
>       drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53
>
>  Documentation/devicetree/bindings/bus/imx-weim.txt |   17 ++-
>  drivers/bus/Kconfig                                |    3 +-
>  drivers/bus/imx-weim.c                             |  129 +++++++++++---------
>  3 files changed, 87 insertions(+), 62 deletions(-)

The bindings changes in the last patch need a a review and ack from the
devicetree maintainers.

Can you please repost that patch with devicetree at vger.kernel.org Cc'd?

Without a review/ack from the DT maintainers, we won't be pulling any
bindings changes.

Also, the binding is changed but there are no corresponding .dts file
changes.  Was that an oversight, or doess that mean there are no current
users of this binding.

Thanks,

Kevin

[GIT PULL 1/5] ARM: imx: weim bus driver update for 3.12

[Shawn Guo]

On Thu, Aug 22, 2013 at 05:59:04AM -0700, Kevin Hilman wrote:

<snip>

> >       drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53
> >
> >  Documentation/devicetree/bindings/bus/imx-weim.txt |   17 ++-
> >  drivers/bus/Kconfig                                |    3 +-
> >  drivers/bus/imx-weim.c                             |  129 +++++++++++---------
> >  3 files changed, 87 insertions(+), 62 deletions(-)
> 
> The bindings changes in the last patch need a a review and ack from the
> devicetree maintainers.
> 
> Can you please repost that patch with devicetree at vger.kernel.org Cc'd?
> 
Okay, will do.

> Without a review/ack from the DT maintainers, we won't be pulling any
> bindings changes.
> 
> Also, the binding is changed but there are no corresponding .dts file
> changes.  Was that an oversight, or doess that mean there are no current
> users of this binding.

The binding changes does not break the existing users, and new users are
added through imx/dt branch.

Shawn

[GIT PULL 1/5] ARM: imx: weim bus driver update for 3.12

[Kevin Hilman]

On Thu, Aug 22, 2013 at 7:10 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Thu, Aug 22, 2013 at 05:59:04AM -0700, Kevin Hilman wrote:
>
> <snip>
>
>> >       drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53
>> >
>> >  Documentation/devicetree/bindings/bus/imx-weim.txt |   17 ++-
>> >  drivers/bus/Kconfig                                |    3 +-
>> >  drivers/bus/imx-weim.c                             |  129 +++++++++++---------
>> >  3 files changed, 87 insertions(+), 62 deletions(-)
>>
>> The bindings changes in the last patch need a a review and ack from the
>> devicetree maintainers.
>>
>> Can you please repost that patch with devicetree at vger.kernel.org Cc'd?
>>
> Okay, will do.

Looking closer at this, seems this change is a trivial binding update
that just generalizes the binding to more SoCs.  I'm OK with taking
that change.  But in the future, please make sure binding changes are
posted to the DT list.

>> Without a review/ack from the DT maintainers, we won't be pulling any
>> bindings changes.
>>
>> Also, the binding is changed but there are no corresponding .dts file
>> changes.  Was that an oversight, or doess that mean there are no current
>> users of this binding.
>
> The binding changes does not break the existing users, and new users are
> added through imx/dt branch.

OK, thanks for the clarification.

Kevin

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Kevin Hilman]

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

> The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
>
>   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
>
> are available in the git repository at:
>
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.12
>
> for you to fetch changes up to 0c383e6a56c2e70db9f2a68f9fe095645f11c151:
>
>   phy: micrel: Add definitions for common Micrel PHY registers (2013-08-18 09:30:39 +0800)
>
> ----------------------------------------------------------------
> It contains a bunch of imx soc updates for 3.12.
>
> - Add more ethernet phy fixups for imx6 boards
> - Add some missing imx6q clocks into clock driver
> - Add new clock types fixup mux and div to work around some ugly
>   hardware defect
> - Consolidate L2 cache initialization function, so that it can be used
>   on more i.MX SoCs
> - Replace magic numbers in mach-imx6q.c with well defined macros
> - Support low-level debug for vybrid

This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
already in linux-next.

For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
support on top of Russell's cleanup.  Have a look at that and see if you
can reuse the the generic 8250 stuff added by Russell.  While there, you
might look at imx.S as well.

If that's OK with you, can you send an updated pull request without the
DEBUG_LL changes?  The other changes look OK for v3.12.

Kevin

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Shawn Guo]

On Thu, Aug 22, 2013 at 06:54:35AM -0700, Kevin Hilman wrote:
> Shawn Guo <shawn.guo@linaro.org> writes:
> 
> > The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
> >
> >   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
> >
> > are available in the git repository at:
> >
> >   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.12
> >
> > for you to fetch changes up to 0c383e6a56c2e70db9f2a68f9fe095645f11c151:
> >
> >   phy: micrel: Add definitions for common Micrel PHY registers (2013-08-18 09:30:39 +0800)
> >
> > ----------------------------------------------------------------
> > It contains a bunch of imx soc updates for 3.12.
> >
> > - Add more ethernet phy fixups for imx6 boards
> > - Add some missing imx6q clocks into clock driver
> > - Add new clock types fixup mux and div to work around some ugly
> >   hardware defect
> > - Consolidate L2 cache initialization function, so that it can be used
> >   on more i.MX SoCs
> > - Replace magic numbers in mach-imx6q.c with well defined macros
> > - Support low-level debug for vybrid
> 
> This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
> already in linux-next.

The vybrid patch is already in linux-next as well.  And conflict was
reported and solved by Stephen one month ago [1].

>From the past experience, such trivial conflict with other tree is
allowed by arm-soc folks, and they will ask Linus to take care of it
when sending patches upstream.  But ...

> For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
> support on top of Russell's cleanup.

... I'm also fine with your suggestion.

> Have a look at that and see if you
> can reuse the the generic 8250 stuff added by Russell.

Seems not.

> While there, you
> might look at imx.S as well.

I think Russell would have converted it if it can reuse 8250 stuff.

> 
> If that's OK with you, can you send an updated pull request without the
> DEBUG_LL changes?  The other changes look OK for v3.12.

Okay, will send you an updated pull request without DEBUG_LL changes.

Shawn

[1] https://lkml.org/lkml/2013/6/3/22

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Kevin Hilman]

On Thu, Aug 22, 2013 at 7:42 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Thu, Aug 22, 2013 at 06:54:35AM -0700, Kevin Hilman wrote:
>> Shawn Guo <shawn.guo@linaro.org> writes:
>>
>> > The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
>> >
>> >   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
>> >
>> > are available in the git repository at:
>> >
>> >   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.12
>> >
>> > for you to fetch changes up to 0c383e6a56c2e70db9f2a68f9fe095645f11c151:
>> >
>> >   phy: micrel: Add definitions for common Micrel PHY registers (2013-08-18 09:30:39 +0800)
>> >
>> > ----------------------------------------------------------------
>> > It contains a bunch of imx soc updates for 3.12.
>> >
>> > - Add more ethernet phy fixups for imx6 boards
>> > - Add some missing imx6q clocks into clock driver
>> > - Add new clock types fixup mux and div to work around some ugly
>> >   hardware defect
>> > - Consolidate L2 cache initialization function, so that it can be used
>> >   on more i.MX SoCs
>> > - Replace magic numbers in mach-imx6q.c with well defined macros
>> > - Support low-level debug for vybrid
>>
>> This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
>> already in linux-next.
>
> The vybrid patch is already in linux-next as well.  And conflict was
> reported and solved by Stephen one month ago [1].
>
> From the past experience, such trivial conflict with other tree is
> allowed by arm-soc folks, and they will ask Linus to take care of it
> when sending patches upstream.  But ...

Yes, the conflict is trivial, but having seen several similar ones
this merge window, it's getting kinda old.  Also, I'm not crazy about
having Linus see several merge conflicts to the same area.  He'll see
that arm-soc folks are not properly coordinating things with Russell
and IMO that's something we need to fix in ARM land, not expose it to
Linus.

Also, in the future, if you're already aware of merge conflicts in
-next in a branch you're submitting for a pull request, it would be
*very* helpful to mention that in the pull request.

>> For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
>> support on top of Russell's cleanup.
>
> ... I'm also fine with your suggestion.

Thanks.

>> Have a look at that and see if you
>> can reuse the the generic 8250 stuff added by Russell.
>
> Seems not.
>
>> While there, you
>> might look at imx.S as well.
>
> I think Russell would have converted it if it can reuse 8250 stuff.

OK, thanks for checking.

>>
>> If that's OK with you, can you send an updated pull request without the
>> DEBUG_LL changes?  The other changes look OK for v3.12.
>
> Okay, will send you an updated pull request without DEBUG_LL changes.

Thanks.

> Shawn
>
> [1] https://lkml.org/lkml/2013/6/3/22

Seems this is an unrelated conflict to the one I was seeing in Kconfig.debug

Kevin

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Shawn Guo]

On Thu, Aug 22, 2013 at 07:59:34AM -0700, Kevin Hilman wrote:
> Yes, the conflict is trivial, but having seen several similar ones
> this merge window, it's getting kinda old.  Also, I'm not crazy about
> having Linus see several merge conflicts to the same area.  He'll see
> that arm-soc folks are not properly coordinating things with Russell
> and IMO that's something we need to fix in ARM land, not expose it to
> Linus.

Understood.

> 
> Also, in the future, if you're already aware of merge conflicts in
> -next in a branch you're submitting for a pull request, it would be
> *very* helpful to mention that in the pull request.

Okay, got it.

<snip>

> > [1] https://lkml.org/lkml/2013/6/3/22
> 
> Seems this is an unrelated conflict to the one I was seeing in Kconfig.debug

Sorry, gave the wrong link.  It should be:

http://article.gmane.org/gmane.linux.kernel.next/28290

Shawn

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Russell King - ARM Linux]

On Thu, Aug 22, 2013 at 06:54:35AM -0700, Kevin Hilman wrote:
> This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
> already in linux-next.
> 
> For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
> support on top of Russell's cleanup.  Have a look at that and see if you
> can reuse the the generic 8250 stuff added by Russell.  While there, you
> might look at imx.S as well.

I'm not sure why you think imx.S may be able to use the generic 8250
stuff, it doesn't seem to have the same register layout or even the
same bit positions as 8250:

                .macro  senduart,rd,rx
                str     \rd, [\rx, #0x40]       @ TXDATA

                .macro  busyuart,rd,rx
1002:           ldr     \rd, [\rx, #0x98]       @ SR2
                tst     \rd, #1 << 3            @ TXDC
                beq     1002b                   @ wait until transmit done

I did convert everything which I considered convertable@the time.

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Kevin Hilman]

On Fri, Aug 23, 2013 at 3:11 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Thu, Aug 22, 2013 at 06:54:35AM -0700, Kevin Hilman wrote:
>> This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
>> already in linux-next.
>>
>> For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
>> support on top of Russell's cleanup.  Have a look at that and see if you
>> can reuse the the generic 8250 stuff added by Russell.  While there, you
>> might look at imx.S as well.
>
> I'm not sure why you think imx.S may be able to use the generic 8250
> stuff,

Only because I was lazy and didn't actually look.  I just suggested he
take a look.

> I did convert everything which I considered convertable at the time.

OK, good. I didn't realize you did all the conversions.  I thought you
did a few to set the example and wanted others to finish converting.

Thanks for the cleanup,

Kevin

[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Russell King - ARM Linux]

On Fri, Aug 23, 2013 at 09:47:44AM -0700, Kevin Hilman wrote:
> OK, good. I didn't realize you did all the conversions.  I thought you
> did a few to set the example and wanted others to finish converting.
> 
> Thanks for the cleanup,

It's the full thing - which is why I'm eager for there not to be residual
work.

Most of the debug stuff is self-contained, so there shouldn't be a problem
if people want to send me their debug additions directly rather than
feeding them to arm-soc.

[GIT PULL 1/5] ARM: imx: weim bus driver update for 3.12

[Kevin Hilman]

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

> The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
>
>   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
>
> are available in the git repository at:
>
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-weim-3.12
>
> for you to fetch changes up to 3f98b6baad63b181da4e859d81953e88ce8a50ec:
>
>   drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53 (2013-08-16 12:59:44 +0800)
>
> ----------------------------------------------------------------
> This is a patch series that updates imx-weim bus driver to have it
> support more i.MX SoCs.  Because there is no maintainer for
> drivers/bus so far, I'm forwarding it through IMX tree for 3.12 merge
> window.

Pulled into next/soc

Kevin

[GIT PULL 4/5] ARM: mxs: soc changes for 3.12

[Kevin Hilman]

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

> The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
>
>   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
>
> are available in the git repository at:
>
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-soc-3.12
>
> for you to fetch changes up to 7543360721cfdce687c4b53a03f08f5ba21d4745:
>
>   ARM: mxs: pm: Include "pm.h" (2013-08-18 16:34:57 +0800)
>
> ----------------------------------------------------------------
> It contains mxs soc changes for 3.12.
>
> - Run savedefconfig on mxs_defconfig to clean it up
> - Fix on mxs_restart() routine for interrupt context calling
> - A few other random updates and cleanups

Pulled into next/soc

Kevin

[GIT PULL 5/5] ARM: mxs: device tree changes for 3.12

[Kevin Hilman]

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

> The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
>
>   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
>
> are available in the git repository at:
>
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.12
>
> for you to fetch changes up to 23ad6f65748cd7fbaf03c1d36211bc1cbdf4ed45:
>
>   ARM: dts: mxs: add pin config for LCD sync and clock pins (2013-08-16 16:26:53 +0800)
>
> ----------------------------------------------------------------
> It contains mxs device tree changes for 3.12.
>
> - New board addition and hogpins cleanup for Crystalfontz
> - New pinctrl entry addition for lcd, ssp2 and saif0
> - Add alias and labels for various nodes
> - Enable devices like LRADC and USB for a couple of imx23 boards,
>   and backlight for M28EVK

Pulled into next/dt

Kevin