Patchwork [GIT,PULL] mx5 merge

login
register
mail settings
Submitter Sascha Hauer
Date Nov. 16, 2011, 7:50 a.m.
Message ID <20111116075053.GG27267@pengutronix.de>
Download mbox
Permalink /patch/125944/
State New
Headers show

Pull-request

git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge

Comments

Sascha Hauer - Nov. 16, 2011, 7:50 a.m.
Hi Arnd,

Please pull the following branch which merges the mx5 architecture into
mach-imx. As said before, I'd love to get this into this -rc cycle
because we would get unnecessary merge conflicts later. Anyway, if you
think that this is a really bad idea please pull it for next.

Sascha

The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:

  Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)

are available in the git repository at:
  git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge

Sascha Hauer (3):
      ARM i.MX5: remove unnecessary includes from board files
      ARM i.MX: Merge i.MX5 support into mach-imx
      ARM i.MX: Update defconfig

 arch/arm/Makefile                                  |    1 -
 .../configs/{mx5_defconfig => imx_v6_v7_defconfig} |   61 +++--
 arch/arm/configs/mx3_defconfig                     |  144 ------------
 arch/arm/mach-imx/Kconfig                          |  239 +++++++++++++++++++
 arch/arm/mach-imx/Makefile                         |   21 ++
 arch/arm/mach-imx/Makefile.boot                    |   12 +
 arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c  |    2 +-
 arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c}   |    0
 arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c      |    0
 arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h      |    0
 .../crm_regs.h => mach-imx/crm-regs-imx5.h}        |    0
 arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h    |    0
 arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h    |    0
 arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h    |    0
 arch/arm/{mach-mx5 => mach-imx}/efika.h            |    0
 arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} |    0
 .../eukrea_mbimx51-baseboard.c                     |    0
 .../eukrea_mbimxsd-baseboard.c                     |    0
 arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c         |    0
 arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c         |    0
 .../board-cpuimx51.c => mach-imx/mach-cpuimx51.c}  |    0
 .../mach-cpuimx51sd.c}                             |    0
 .../board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c}  |    0
 .../board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c}  |    0
 .../mach-mx51_babbage.c}                           |    0
 .../mach-mx51_efikamx.c}                           |    0
 .../mach-mx51_efikasb.c}                           |    0
 .../board-mx53_ard.c => mach-imx/mach-mx53_ard.c}  |    1 -
 .../board-mx53_evk.c => mach-imx/mach-mx53_evk.c}  |    1 -
 .../mach-mx53_loco.c}                              |    1 -
 .../board-mx53_smd.c => mach-imx/mach-mx53_smd.c}  |    1 -
 arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c}     |    0
 arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c       |    0
 arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} |   89 +++++++-
 arch/arm/mach-mx5/Kconfig                          |  244 --------------------
 arch/arm/mach-mx5/Makefile                         |   26 --
 arch/arm/mach-mx5/Makefile.boot                    |    9 -
 arch/arm/mach-mx5/pm-imx5.c                        |   83 -------
 arch/arm/plat-mxc/Kconfig                          |   15 +-
 39 files changed, 391 insertions(+), 559 deletions(-)
 rename arch/arm/configs/{mx5_defconfig => imx_v6_v7_defconfig} (80%)
 delete mode 100644 arch/arm/configs/mx3_defconfig
 rename arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c (99%)
 rename arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h (100%)
 rename arch/arm/{mach-mx5/crm_regs.h => mach-imx/crm-regs-imx5.h} (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/efika.h (100%)
 rename arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimx51-baseboard.c (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimxsd-baseboard.c (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c (100%)
 rename arch/arm/{mach-mx5/board-cpuimx51.c => mach-imx/mach-cpuimx51.c} (100%)
 rename arch/arm/{mach-mx5/board-cpuimx51sd.c => mach-imx/mach-cpuimx51sd.c} (100%)
 rename arch/arm/{mach-mx5/board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} (100%)
 rename arch/arm/{mach-mx5/board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} (100%)
 rename arch/arm/{mach-mx5/board-mx51_babbage.c => mach-imx/mach-mx51_babbage.c} (100%)
 rename arch/arm/{mach-mx5/board-mx51_efikamx.c => mach-imx/mach-mx51_efikamx.c} (100%)
 rename arch/arm/{mach-mx5/board-mx51_efikasb.c => mach-imx/mach-mx51_efikasb.c} (100%)
 rename arch/arm/{mach-mx5/board-mx53_ard.c => mach-imx/mach-mx53_ard.c} (99%)
 rename arch/arm/{mach-mx5/board-mx53_evk.c => mach-imx/mach-mx53_evk.c} (99%)
 rename arch/arm/{mach-mx5/board-mx53_loco.c => mach-imx/mach-mx53_loco.c} (99%)
 rename arch/arm/{mach-mx5/board-mx53_smd.c => mach-imx/mach-mx53_smd.c} (99%)
 rename arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} (100%)
 rename arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c (100%)
 rename arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} (58%)
 delete mode 100644 arch/arm/mach-mx5/Kconfig
 delete mode 100644 arch/arm/mach-mx5/Makefile
 delete mode 100644 arch/arm/mach-mx5/Makefile.boot
 delete mode 100644 arch/arm/mach-mx5/pm-imx5.c
Arnd Bergmann - Nov. 23, 2011, 9:15 p.m.
On Wednesday 16 November 2011, Sascha Hauer wrote:
> Please pull the following branch which merges the mx5 architecture into
> mach-imx. As said before, I'd love to get this into this -rc cycle
> because we would get unnecessary merge conflicts later. Anyway, if you
> think that this is a really bad idea please pull it for next.
> 
> Sascha
> 
> The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:
> 
>   Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)
> 
> are available in the git repository at:
>   git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge

Hi Sascha,

I've pulled it into the imx/move branch, to be merged through the next/move
branch in arm-soc now.

Sorry for not replying earlier. I think the best plan is to do it at the
end of a merge window, but I didn't feel comfortable at the end of the
3.2-rc1 because I had not seen the patches before.

Since almost all the files are trivially moved, I think we can best avoid
all merge conflicts by applying the move changeset last after all other
changes to mx5 code have gone in. I'll gladly take care of regenerating
the patch before I send it (and letting you double-check the result).

However, what I'd like you to do is minimize the changes that don't
just move entire files around by submitting them as a cleanup branch
that I can apply *before* all other patches. I think we should have
separate patches for these changes:

* merge mach-mx5/system.c into pm-imx5.c
* merge arch/arm/mach-mx5/Kconfig into arch/arm/mach-imx/Kconfig
* ARM i.MX5: remove unnecessary includes from board files

If we do these early, the remaining move will be even more trivial
than the current series.

	Arnd
Sascha Hauer - Nov. 24, 2011, 7:27 a.m.
Hi Arnd,

On Wed, Nov 23, 2011 at 09:15:45PM +0000, Arnd Bergmann wrote:
> On Wednesday 16 November 2011, Sascha Hauer wrote:
> > Please pull the following branch which merges the mx5 architecture into
> > mach-imx. As said before, I'd love to get this into this -rc cycle
> > because we would get unnecessary merge conflicts later. Anyway, if you
> > think that this is a really bad idea please pull it for next.
> > 
> > Sascha
> > 
> > The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:
> > 
> >   Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)
> > 
> > are available in the git repository at:
> >   git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge
> 
> Hi Sascha,
> 
> I've pulled it into the imx/move branch, to be merged through the next/move
> branch in arm-soc now.
> 
> Sorry for not replying earlier. I think the best plan is to do it at the
> end of a merge window, but I didn't feel comfortable at the end of the
> 3.2-rc1 because I had not seen the patches before.
> 
> Since almost all the files are trivially moved, I think we can best avoid
> all merge conflicts by applying the move changeset last after all other
> changes to mx5 code have gone in. I'll gladly take care of regenerating
> the patch before I send it (and letting you double-check the result).
> 
> However, what I'd like you to do is minimize the changes that don't
> just move entire files around by submitting them as a cleanup branch
> that I can apply *before* all other patches. I think we should have
> separate patches for these changes:
> 
> * merge mach-mx5/system.c into pm-imx5.c
> * merge arch/arm/mach-mx5/Kconfig into arch/arm/mach-imx/Kconfig
> * ARM i.MX5: remove unnecessary includes from board files
> 
> If we do these early, the remaining move will be even more trivial
> than the current series.

Ok, sounds like a plan

Thanks
 Sascha