* [GIT PULL] i.MX features for next
@ 2011-08-23 11:56 Sascha Hauer
2011-08-26 8:26 ` Sascha Hauer
0 siblings, 1 reply; 7+ messages in thread
From: Sascha Hauer @ 2011-08-23 11:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull the following feature patches for next.
Sascha
The following changes since commit 322a8b034003c0d46d39af85bf24fee27b902f48:
Linux 3.1-rc1 (2011-08-07 18:23:30 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd
Arnaud Patard (3):
imx51: add pata device
imx51: add pata clock
imx: efika: Enable pata.
Dong Aisheng (5):
ARM: mxs: add saif clock
ARM: mxs: add saif device
ARM: mxs: add sgtl5000 i2c device
ARM: mxs: add mxs-sgtl5000 device
ARM: mxs: correct the using of frac div for saif
Sascha Hauer (1):
Merge branches 'features/imx-pata' and 'features/mxs' into imx-features
Wolfram Sang (3):
arm: mxs: mx28evk: add fixed regulators for audio
arm: mach-mxs: add device for rtc
arm: mach-mxs: add rtc to all boards
arch/arm/mach-mx5/Kconfig | 1 +
arch/arm/mach-mx5/clock-mx51-mx53.c | 5 ++
arch/arm/mach-mx5/devices-imx51.h | 4 +
arch/arm/mach-mx5/mx51_efika.c | 2 +
arch/arm/mach-mxs/Kconfig | 6 ++
arch/arm/mach-mxs/clock-mx28.c | 8 ++-
arch/arm/mach-mxs/devices-mx23.h | 2 +
arch/arm/mach-mxs/devices-mx28.h | 5 ++
arch/arm/mach-mxs/devices/Kconfig | 6 ++
arch/arm/mach-mxs/devices/Makefile | 2 +
arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 ++++++++++++++++
arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 +++++++++++++
arch/arm/mach-mxs/include/mach/devices-common.h | 12 +++
arch/arm/mach-mxs/mach-mx23evk.c | 1 +
arch/arm/mach-mxs/mach-mx28evk.c | 78 +++++++++++++++++++++
arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 +
arch/arm/mach-mxs/mach-tx28.c | 1 +
arch/arm/plat-mxc/devices/Kconfig | 3 +
arch/arm/plat-mxc/devices/Makefile | 1 +
arch/arm/plat-mxc/devices/platform-pata_imx.c | 38 ++++++++++
arch/arm/plat-mxc/include/mach/devices-common.h | 7 ++
21 files changed, 292 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] i.MX features for next
2011-08-23 11:56 [GIT PULL] i.MX features for next Sascha Hauer
@ 2011-08-26 8:26 ` Sascha Hauer
2011-08-26 15:53 ` Arnd Bergmann
2011-09-06 19:22 ` Uwe Kleine-König
0 siblings, 2 replies; 7+ messages in thread
From: Sascha Hauer @ 2011-08-26 8:26 UTC (permalink / raw)
To: linux-arm-kernel
Also updated:
The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd
Arnaud Patard (3):
imx51: add pata device
imx51: add pata clock
imx: efika: Enable pata.
Dong Aisheng (5):
ARM: mxs: add saif clock
ARM: mxs: add saif device
ARM: mxs: add sgtl5000 i2c device
ARM: mxs: add mxs-sgtl5000 device
ARM: mxs: correct the using of frac div for saif
Fabio Estevam (7):
ARM: imx: pwm: Add support for MX53
ARM: imx: Add PATA resources for other i.MX processors
ARM: imx: Add PATA clock support
ARM: imx: Define functions for registering PATA
ARM: mx53_loco: Add support for the accelerometer
ARM: imx: Introduce generic function for displaying silicon revision
ARM: mach-imx/mx25_3ds: Add FlexCAN support
Jason Liu (6):
ARM: mx25: Print silicon revision on boot
ARM: mx27: Print silicon revision on boot
ARM: mx31: use generic function for displaying silicon revision
ARM: mx35: use generic function for displaying silicon revision
ARM: mx5: use generic function for displaying silicon revision
ARM: i.MX: initialize l2x0 at early_init time
Sascha Hauer (5):
ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs
ARM i.MX: allow to compile together all i.MX5 based SoCs
ARM i.MX5: update defconfig
ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs
Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd
Wolfram Sang (3):
arm: mxs: mx28evk: add fixed regulators for audio
arm: mach-mxs: add device for rtc
arm: mach-mxs: add rtc to all boards
arch/arm/Makefile | 4 +-
.../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +++++++++++---
arch/arm/configs/mx1_defconfig | 91 ------------------
arch/arm/configs/mx21_defconfig | 97 --------------------
arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 ++++++++-----
arch/arm/mach-imx/Kconfig | 51 ++++-------
arch/arm/mach-imx/Makefile | 2 +-
arch/arm/mach-imx/cache-l2x0.c | 2 +-
arch/arm/mach-imx/clock-imx25.c | 6 +
arch/arm/mach-imx/clock-imx27.c | 6 +-
arch/arm/mach-imx/clock-imx31.c | 8 +-
arch/arm/mach-imx/clock-imx35.c | 7 +-
arch/arm/mach-imx/cpu-imx25.c | 41 ++++++++
arch/arm/mach-imx/cpu-imx27.c | 28 +++---
arch/arm/mach-imx/cpu-imx31.c | 49 ++++++-----
arch/arm/mach-imx/cpu-imx35.c | 30 +++---
arch/arm/mach-imx/devices-imx27.h | 4 +
arch/arm/mach-imx/devices-imx31.h | 4 +
arch/arm/mach-imx/devices-imx35.h | 4 +
arch/arm/mach-imx/mach-mx25_3ds.c | 10 ++
arch/arm/mach-mx5/Kconfig | 19 +---
arch/arm/mach-mx5/board-mx53_loco.c | 20 ++++
arch/arm/mach-mx5/clock-mx51-mx53.c | 12 ++-
arch/arm/mach-mx5/cpu.c | 74 ++++------------
arch/arm/mach-mx5/devices-imx51.h | 4 +
arch/arm/mach-mx5/devices-imx53.h | 4 +
arch/arm/mach-mx5/mx51_efika.c | 2 +
arch/arm/mach-mxs/Kconfig | 6 +
arch/arm/mach-mxs/clock-mx28.c | 8 +-
arch/arm/mach-mxs/devices-mx23.h | 2 +
arch/arm/mach-mxs/devices-mx28.h | 5 +
arch/arm/mach-mxs/devices/Kconfig | 6 +
arch/arm/mach-mxs/devices/Makefile | 2 +
arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 ++++++++++++
arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 ++++++++++
arch/arm/mach-mxs/include/mach/devices-common.h | 12 +++
arch/arm/mach-mxs/mach-mx23evk.c | 1 +
arch/arm/mach-mxs/mach-mx28evk.c | 78 ++++++++++++++++
arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 +
arch/arm/mach-mxs/mach-tx28.c | 1 +
arch/arm/plat-mxc/Kconfig | 39 ++------
arch/arm/plat-mxc/cpu.c | 9 ++
arch/arm/plat-mxc/devices/Kconfig | 3 +
arch/arm/plat-mxc/devices/Makefile | 1 +
arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 ++++++++++++
arch/arm/plat-mxc/include/mach/common.h | 1 +
arch/arm/plat-mxc/include/mach/devices-common.h | 8 ++
arch/arm/plat-mxc/include/mach/memory.h | 16 +---
arch/arm/plat-mxc/include/mach/mx25.h | 4 +
arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
arch/arm/plat-mxc/include/mach/mx3x.h | 18 +---
arch/arm/plat-mxc/pwm.c | 2 +-
52 files changed, 638 insertions(+), 464 deletions(-)
rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
delete mode 100644 arch/arm/configs/mx1_defconfig
delete mode 100644 arch/arm/configs/mx21_defconfig
rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
create mode 100644 arch/arm/mach-imx/cpu-imx25.c
create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] i.MX features for next
2011-08-26 8:26 ` Sascha Hauer
@ 2011-08-26 15:53 ` Arnd Bergmann
2011-09-06 19:22 ` Uwe Kleine-König
1 sibling, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2011-08-26 15:53 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 26 August 2011, Sascha Hauer wrote:
> The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
>
> Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)
>
> are available in the git repository at:
> git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd
>
Pulled as well.
Excellent work on the multisoc support, I'm very happy to see that!
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] i.MX features for next
2011-08-26 8:26 ` Sascha Hauer
2011-08-26 15:53 ` Arnd Bergmann
@ 2011-09-06 19:22 ` Uwe Kleine-König
2011-09-08 15:20 ` Arnd Bergmann
1 sibling, 1 reply; 7+ messages in thread
From: Uwe Kleine-König @ 2011-09-06 19:22 UTC (permalink / raw)
To: linux-arm-kernel
Hello Arnd,
if I remember correctly you don't mind non-fast-forward updates?! If I'm
wrong just tell me.
Compared to Sascha's pull request this mail is a reply to, the following
changed:
- squash a patch by Jason Liu <jason.hui@linaro.org> into
d27536c6619221528114746317def345467a3e80 fixing a build failure for
mx25 (1314623624-9999-1-git-send-email-jason.hui at linaro.org)
- squash a patch by Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
into 236c4e8be436380b5354fe0d7facf94688e024ec fixing the resource
size for pata_imx devices (20110827131911.571434313 at rtp-net.org)
- two new patches:
"ARM: mx51/efika: Configure esdhc cd/wp on efika mx/sb" and "ARM: mx5: fix clock
usage for suspend" both by Arnaud Patard.
I choosed to squash the two fixes to ease bisection.
Though the 2nd patch by Arnaud fixes suspend, I think it's not necessary
to go in before v3.1.
So please drop e93aabb and take this instead:
The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-features
Arnaud Patard (5):
imx51: add pata device
imx51: add pata clock
imx: efika: Enable pata.
ARM: mx51/efika: Configure esdhc cd/wp on efika mx/sb
ARM: mx5: fix clock usage for suspend
Dong Aisheng (5):
ARM: mxs: add saif clock
ARM: mxs: add saif device
ARM: mxs: add sgtl5000 i2c device
ARM: mxs: add mxs-sgtl5000 device
ARM: mxs: correct the using of frac div for saif
Fabio Estevam (7):
ARM: imx: pwm: Add support for MX53
ARM: mx53_loco: Add support for the accelerometer
ARM: imx: Introduce generic function for displaying silicon revision
ARM: mach-imx/mx25_3ds: Add FlexCAN support
ARM: imx: Add PATA resources for other i.MX processors
ARM: imx: Add PATA clock support
ARM: imx: Define functions for registering PATA
Jason Liu (6):
ARM: i.MX: initialize l2x0 at early_init time
ARM: mx25: Print silicon revision on boot
ARM: mx27: Print silicon revision on boot
ARM: mx31: use generic function for displaying silicon revision
ARM: mx35: use generic function for displaying silicon revision
ARM: mx5: use generic function for displaying silicon revision
Sascha Hauer (4):
ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs
ARM i.MX: allow to compile together all i.MX5 based SoCs
ARM i.MX5: update defconfig
ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs
Uwe Kleine-K?nig (1):
Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features
Wolfram Sang (3):
arm: mxs: mx28evk: add fixed regulators for audio
arm: mach-mxs: add device for rtc
arm: mach-mxs: add rtc to all boards
arch/arm/Makefile | 4 +-
.../{mx27_defconfig => imx_v4_v5_defconfig} | 68 +++++++++++---
arch/arm/configs/mx1_defconfig | 91 ------------------
arch/arm/configs/mx21_defconfig | 97 --------------------
arch/arm/configs/{mx51_defconfig => mx5_defconfig} | 60 ++++++++-----
arch/arm/mach-imx/Kconfig | 51 ++++-------
arch/arm/mach-imx/Makefile | 2 +-
arch/arm/mach-imx/cache-l2x0.c | 2 +-
arch/arm/mach-imx/clock-imx25.c | 6 +
arch/arm/mach-imx/clock-imx27.c | 6 +-
arch/arm/mach-imx/clock-imx31.c | 8 +-
arch/arm/mach-imx/clock-imx35.c | 7 +-
arch/arm/mach-imx/cpu-imx25.c | 41 ++++++++
arch/arm/mach-imx/cpu-imx27.c | 28 +++---
arch/arm/mach-imx/cpu-imx31.c | 49 ++++++-----
arch/arm/mach-imx/cpu-imx35.c | 30 +++---
arch/arm/mach-imx/devices-imx27.h | 4 +
arch/arm/mach-imx/devices-imx31.h | 4 +
arch/arm/mach-imx/devices-imx35.h | 4 +
arch/arm/mach-imx/mach-mx25_3ds.c | 10 ++
arch/arm/mach-mx5/Kconfig | 19 +---
arch/arm/mach-mx5/board-mx51_efikamx.c | 11 ++-
arch/arm/mach-mx5/board-mx51_efikasb.c | 18 ++++-
arch/arm/mach-mx5/board-mx53_loco.c | 20 ++++
arch/arm/mach-mx5/clock-mx51-mx53.c | 12 ++-
arch/arm/mach-mx5/cpu.c | 74 ++++------------
arch/arm/mach-mx5/devices-imx51.h | 4 +
arch/arm/mach-mx5/devices-imx53.h | 4 +
arch/arm/mach-mx5/mx51_efika.c | 3 +-
arch/arm/mach-mx5/pm-imx5.c | 15 +++-
arch/arm/mach-mxs/Kconfig | 6 +
arch/arm/mach-mxs/clock-mx28.c | 8 +-
arch/arm/mach-mxs/devices-mx23.h | 2 +
arch/arm/mach-mxs/devices-mx28.h | 5 +
arch/arm/mach-mxs/devices/Kconfig | 6 +
arch/arm/mach-mxs/devices/Makefile | 2 +
arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 ++++++++++++
arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 ++++++++++
arch/arm/mach-mxs/include/mach/devices-common.h | 12 +++
arch/arm/mach-mxs/mach-mx23evk.c | 1 +
arch/arm/mach-mxs/mach-mx28evk.c | 78 ++++++++++++++++
arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 +
arch/arm/mach-mxs/mach-tx28.c | 1 +
arch/arm/plat-mxc/Kconfig | 39 ++------
arch/arm/plat-mxc/cpu.c | 9 ++
arch/arm/plat-mxc/devices/Kconfig | 3 +
arch/arm/plat-mxc/devices/Makefile | 1 +
arch/arm/plat-mxc/devices/platform-pata_imx.c | 59 ++++++++++++
arch/arm/plat-mxc/include/mach/common.h | 1 +
arch/arm/plat-mxc/include/mach/devices-common.h | 8 ++
arch/arm/plat-mxc/include/mach/memory.h | 16 +---
arch/arm/plat-mxc/include/mach/mx25.h | 5 +
arch/arm/plat-mxc/include/mach/mx35.h | 2 +-
arch/arm/plat-mxc/include/mach/mx3x.h | 18 +---
arch/arm/plat-mxc/pwm.c | 2 +-
55 files changed, 677 insertions(+), 471 deletions(-)
rename arch/arm/configs/{mx27_defconfig => imx_v4_v5_defconfig} (69%)
delete mode 100644 arch/arm/configs/mx1_defconfig
delete mode 100644 arch/arm/configs/mx21_defconfig
rename arch/arm/configs/{mx51_defconfig => mx5_defconfig} (82%)
create mode 100644 arch/arm/mach-imx/cpu-imx25.c
create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
create mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
create mode 100644 arch/arm/plat-mxc/devices/platform-pata_imx.c
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] i.MX features for next
2011-09-06 19:22 ` Uwe Kleine-König
@ 2011-09-08 15:20 ` Arnd Bergmann
2011-09-08 18:17 ` Nicolas Pitre
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2011-09-08 15:20 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 06 September 2011, Uwe Kleine-K?nig wrote:
> if I remember correctly you don't mind non-fast-forward updates?! If I'm
> wrong just tell me.
Right, I can take a limited number of those at least. I want a reasonable
git history, not a stainless one ;-)
> Compared to Sascha's pull request this mail is a reply to, the following
> changed:
>
> - squash a patch by Jason Liu <jason.hui@linaro.org> into
> d27536c6619221528114746317def345467a3e80 fixing a build failure for
> mx25 (1314623624-9999-1-git-send-email-jason.hui at linaro.org)
> - squash a patch by Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
> into 236c4e8be436380b5354fe0d7facf94688e024ec fixing the resource
> size for pata_imx devices (20110827131911.571434313 at rtp-net.org)
> - two new patches:
> "ARM: mx51/efika: Configure esdhc cd/wp on efika mx/sb" and "ARM: mx5: fix clock
> usage for suspend" both by Arnaud Patard.
>
> I choosed to squash the two fixes to ease bisection.
> Though the 2nd patch by Arnaud fixes suspend, I think it's not necessary
> to go in before v3.1.
There were a few other pull requests that I haven't taken yet since
master.kernel.org is down. If the general feeling is that I should take
at least the bug fixes, I can start a branch on the linaro server for that.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] i.MX features for next
2011-09-08 15:20 ` Arnd Bergmann
@ 2011-09-08 18:17 ` Nicolas Pitre
2011-09-10 21:13 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Nicolas Pitre @ 2011-09-08 18:17 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 8 Sep 2011, Arnd Bergmann wrote:
> There were a few other pull requests that I haven't taken yet since
> master.kernel.org is down. If the general feeling is that I should take
> at least the bug fixes, I can start a branch on the linaro server for that.
My feeling is that you should take them all on git.linaro.org (or
anywhere for that matter) just as if master.kernel.org was alive. The
nice property of Git is that the actual location of a repository
shouldn't matter. Bringing it back to master.kernel.org later on would
be a no brainer. I do have write access to that repository on
master.kernel.org, but I practically never exercised that privilege so
far, hence this doesn't have to be transferred as well.
Nicolas
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] i.MX features for next
2011-09-08 18:17 ` Nicolas Pitre
@ 2011-09-10 21:13 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2011-09-10 21:13 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 08 September 2011, Nicolas Pitre wrote:
> On Thu, 8 Sep 2011, Arnd Bergmann wrote:
>
> > There were a few other pull requests that I haven't taken yet since
> > master.kernel.org is down. If the general feeling is that I should take
> > at least the bug fixes, I can start a branch on the linaro server for that.
>
> My feeling is that you should take them all on git.linaro.org (or
> anywhere for that matter) just as if master.kernel.org was alive. The
> nice property of Git is that the actual location of a repository
> shouldn't matter. Bringing it back to master.kernel.org later on would
> be a no brainer. I do have write access to that repository on
> master.kernel.org, but I practically never exercised that privilege so
> far, hence this doesn't have to be transferred as well.
Ok, pulled into imx/devel and next/devel now. Please check that everything
still works.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-09-10 21:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-23 11:56 [GIT PULL] i.MX features for next Sascha Hauer
2011-08-26 8:26 ` Sascha Hauer
2011-08-26 15:53 ` Arnd Bergmann
2011-09-06 19:22 ` Uwe Kleine-König
2011-09-08 15:20 ` Arnd Bergmann
2011-09-08 18:17 ` Nicolas Pitre
2011-09-10 21:13 ` Arnd Bergmann
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).