* [GIT PULL] i.MX fixes
@ 2011-07-07 8:08 Sascha Hauer
0 siblings, 0 replies; 14+ messages in thread
From: Sascha Hauer @ 2011-07-07 8:08 UTC (permalink / raw)
To: linux-arm-kernel
Arnd,
Please pull the following i.MX fixes. I'd say it's not utterly important
to get these into 3.0.
The following changes since commit a2fa83faf47b514ab947cea916d3691b66525073:
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (2011-07-05 20:57:45 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git fixes
Axel Lin (1):
ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
Fabio Estevam (10):
mx51: Let USB Storage be built by default
ARM: mx53: Fix alternate modes for MX53_PAD_PATA_DATA6
ARM: mx53: Fix the chip select addresses
ARM: mach-imx/mx27_3ds: Use the standard i.MX macro for GPIO numbering
ARM: mach-imx/mx31_3ds: Fix IOMUX for SPI1 signals
mxc: iomuxv1: Do not use gpio_request when setting the pin as GPIO
ARM: mach-imx/mx27_3ds: Fix regulator support
ARM: mxc: iomux-v1: Fix build warning
ARM: mx51: Fix the address space length for SSI
ARM: mx53: Fix some interrupts marked as reserved.
Lothar Wa?mann (1):
mach-mx5: fix the I2C clock parents
Marc Kleine-Budde (1):
ARM: mx53: Fix the base addresses for the DDR memory regions
Sascha Hauer (1):
ARM i.MX dma: Fix burstsize settings
Shawn Guo (5):
ARM: mxs_defconfig: Change CONFIG_RTC_CLASS 'm' to 'y'
ARM: mxc: imx-sdma device gets 16K iosize than 4K
ARM: mxc: sdma on imx25 is a V2 block
ARM: mxc: change imx-dma default to_version to 1
ARM: mxc: imx-dma on imx25 has no other TO version but TO1
Troy Kisky (2):
MXC: iomux-v3: correct NO_PAD_CTRL definition
ARM: i.MX53: Fix IOMUX type o's
Uwe Kleine-K?nig (1):
ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
arch/arm/configs/mx51_defconfig | 3 +-
arch/arm/configs/mxs_defconfig | 2 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 29 ++++++++++++++++++----
arch/arm/mach-imx/mach-mx31_3ds.c | 10 ++++----
arch/arm/mach-mx5/clock-mx51-mx53.c | 4 +-
arch/arm/mach-mxs/devices/platform-mxsfb.c | 1 +
arch/arm/mach-mxs/mach-tx28.c | 8 ------
arch/arm/plat-mxc/devices/platform-imx-dma.c | 14 +++++-----
arch/arm/plat-mxc/devices/platform-imx-ssi.c | 2 +-
arch/arm/plat-mxc/include/mach/iomux-mx53.h | 14 +++++-----
arch/arm/plat-mxc/include/mach/iomux-v1.h | 1 -
arch/arm/plat-mxc/include/mach/iomux-v3.h | 2 +-
arch/arm/plat-mxc/include/mach/mx53.h | 26 ++++++++++----------
arch/arm/plat-mxc/iomux-v1.c | 34 +-------------------------
drivers/dma/imx-dma.c | 3 +-
drivers/mmc/host/mxcmmc.c | 8 +++---
sound/soc/imx/imx-pcm-dma-mx2.c | 4 +-
17 files changed, 73 insertions(+), 92 deletions(-)
--
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] 14+ messages in thread
* [GIT PULL] i.MX fixes
@ 2011-11-11 15:57 Sascha Hauer
2011-11-11 18:39 ` Olof Johansson
0 siblings, 1 reply; 14+ messages in thread
From: Sascha Hauer @ 2011-11-11 15:57 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Please pull the following. I don't know exactly when Arnd is back again,
so I have Olof still on Cc.
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 imx-fixes-for-arnd
Richard Zhao (1):
ARM: mx51/53: set pwm clock parent to ipg_perclk
Shawn Guo (3):
arm/imx: fix the references to ARCH_MX3
arm/imx: fix AUTO_ZRELADDR selection
arm/imx: fix imx6q mmc error when mounting rootfs
arch/arm/mach-imx/Makefile.boot | 34 +++++++++++++++++++---------------
arch/arm/mach-imx/clock-imx6q.c | 17 ++++++++++++++++-
arch/arm/mach-mx5/clock-mx51-mx53.c | 4 ++--
arch/arm/plat-mxc/Kconfig | 4 ++--
drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++++++++
5 files changed, 47 insertions(+), 20 deletions(-)
--
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] 14+ messages in thread
* [GIT PULL] i.MX fixes
2011-11-11 15:57 Sascha Hauer
@ 2011-11-11 18:39 ` Olof Johansson
0 siblings, 0 replies; 14+ messages in thread
From: Olof Johansson @ 2011-11-11 18:39 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 11, 2011 at 7:57 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Arnd, Olof,
>
> Please pull the following. I don't know exactly when Arnd is back again,
> so I have Olof still on Cc.
Thanks, pulled into arm-soc fixes.
Since Linus hasn't pulled anything since I sent the original request,
I'll re-send with this and the picoxcell fixes.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL] i.MX fixes
@ 2011-12-09 10:09 Sascha Hauer
2011-12-09 10:16 ` Sascha Hauer
2011-12-09 13:41 ` Arnd Bergmann
0 siblings, 2 replies; 14+ messages in thread
From: Sascha Hauer @ 2011-12-09 10:09 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull the following small fixes.
Sascha
The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes-for-arnd
Dong Aisheng (1):
ARM: mx5: add __initconst for fec pdata
Jason Chen (1):
MXC PWM: should active during DOZE/WAIT/DBG mode
Richard Zhao (1):
ARM: imx: fix cpufreq build errors
arch/arm/mach-mx5/board-mx53_evk.c | 2 +-
arch/arm/mach-mx5/board-mx53_loco.c | 2 +-
arch/arm/mach-mx5/board-mx53_smd.c | 2 +-
arch/arm/plat-mxc/cpufreq.c | 1 +
arch/arm/plat-mxc/pwm.c | 7 ++++++-
5 files changed, 10 insertions(+), 4 deletions(-)
--
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] 14+ messages in thread
* [GIT PULL] i.MX fixes
2011-12-09 10:09 Sascha Hauer
@ 2011-12-09 10:16 ` Sascha Hauer
2011-12-09 13:41 ` Arnd Bergmann
1 sibling, 0 replies; 14+ messages in thread
From: Sascha Hauer @ 2011-12-09 10:16 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Dec 09, 2011 at 11:09:26AM +0100, Sascha Hauer wrote:
> Hi Arnd,
>
> Please pull the following small fixes.
Added the following to it:
Shawn Guo (1):
arm/imx: fix power button on imx51 babbage board
--
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] 14+ messages in thread
* [GIT PULL] i.MX fixes
2011-12-09 10:09 Sascha Hauer
2011-12-09 10:16 ` Sascha Hauer
@ 2011-12-09 13:41 ` Arnd Bergmann
1 sibling, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2011-12-09 13:41 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 09 December 2011, Sascha Hauer wrote:
> Hi Arnd,
>
> Please pull the following small fixes.
>
> Sascha
>
> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
>
> Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
>
> are available in the git repository at:
> git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes-for-arnd
Pulled the second version. Thanks!
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL] i.MX fixes
@ 2012-02-27 9:33 Sascha Hauer
2012-02-27 13:39 ` Arnd Bergmann
0 siblings, 1 reply; 14+ messages in thread
From: Sascha Hauer @ 2012-02-27 9:33 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull the following for -rc. Note that this partly replaces the
previous i.MX branch you pulled as suggested.
Sascha
The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d:
Linux 3.3-rc3 (2012-02-08 19:21:53 -0800)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes
for you to fetch changes up to 9418ba306688c0b77a8548b3281ba3d130036516:
ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0() (2012-02-27 10:15:27 +0100)
----------------------------------------------------------------
Fabio Estevam (3):
ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct
ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board
ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/mach-imx/mach-pcm038.c | 2 +-
arch/arm/mach-imx/mm-imx3.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
--
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] 14+ messages in thread
* [GIT PULL] i.MX fixes
2012-02-27 9:33 [GIT PULL] i.MX fixes Sascha Hauer
@ 2012-02-27 13:39 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2012-02-27 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 27 February 2012, Sascha Hauer wrote:
>
> Hi Arnd,
>
> Please pull the following for -rc. Note that this partly replaces the
> previous i.MX branch you pulled as suggested.
>
> Sascha
>
> The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d:
>
> Linux 3.3-rc3 (2012-02-08 19:21:53 -0800)
>
> are available in the git repository at:
>
> git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes
>
> for you to fetch changes up to 9418ba306688c0b77a8548b3281ba3d130036516:
>
> ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0() (2012-02-27 10:15:27 +0100)
>
Applied to next/fixes-non-critical
Thanks for splitting the branches out,
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL] i.MX fixes
@ 2012-06-07 20:04 Sascha Hauer
2012-06-08 8:23 ` Olof Johansson
0 siblings, 1 reply; 14+ messages in thread
From: Sascha Hauer @ 2012-06-07 20:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Arnd,
Please pull the following i.MX fixes for -rc.
Sascha
The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc:
Linux 3.4 (2012-05-20 15:29:13 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx/fixes
for you to fetch changes up to 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a:
ARM i.MX imx21ads: Fix overlapping static i/o mappings (2012-06-07 21:34:22 +0200)
----------------------------------------------------------------
Fabio Estevam (1):
ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI
Jaccon Bastiaansen (1):
ARM i.MX imx21ads: Fix overlapping static i/o mappings
Javier Martin (1):
ARM i.MX27 Visstrim M10: fix gpio handling.
Uwe Kleine-K?nig (2):
ARM: imx: only specify i2c device type once
ARM: imx: only call l2x0_init if it's available
arch/arm/mach-imx/Kconfig | 1 +
arch/arm/mach-imx/mach-cpuimx35.c | 1 -
arch/arm/mach-imx/mach-cpuimx51sd.c | 1 -
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 36 +++++++++++++++++++--------
arch/arm/mach-imx/mach-mx21ads.c | 2 +-
arch/arm/mach-imx/mm-imx3.c | 2 ++
6 files changed, 29 insertions(+), 14 deletions(-)
--
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] 14+ messages in thread
* [GIT PULL] i.MX fixes
2012-06-07 20:04 [GIT PULL] i.MX fixes Sascha Hauer
@ 2012-06-08 8:23 ` Olof Johansson
2012-06-08 20:24 ` Fabio Estevam
2012-06-09 9:44 ` Sascha Hauer
0 siblings, 2 replies; 14+ messages in thread
From: Olof Johansson @ 2012-06-08 8:23 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jun 7, 2012 at 1:04 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Olof, Arnd,
>
> Please pull the following i.MX fixes for -rc.
>
> Sascha
>
> The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc:
>
> ?Linux 3.4 (2012-05-20 15:29:13 -0700)
>
> are available in the git repository at:
>
> ?git://git.pengutronix.de/git/imx/linux-2.6.git imx/fixes
Pulled, thanks. In the future, for fixes you can aggregate them in one
branch -- we normally just care about topics for merge window staging.
Also, have you noticed that imx_v4_v5_defconfig has a build failure in
mx2_camera.c?
drivers/media/video/mx2_camera.c: In function 'mx2_camera_set_bus_param':
drivers/media/video/mx2_camera.c:1032:42: error: 'pixfmt' undeclared
(first use in this function)
drivers/media/video/mx2_camera.c:1032:42: note: each undeclared
identifier is reported only once for each function it appears in
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL] i.MX fixes
2012-06-08 8:23 ` Olof Johansson
@ 2012-06-08 20:24 ` Fabio Estevam
2012-06-09 9:44 ` Sascha Hauer
1 sibling, 0 replies; 14+ messages in thread
From: Fabio Estevam @ 2012-06-08 20:24 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jun 8, 2012 at 5:23 AM, Olof Johansson <olof@lixom.net> wrote:
>
> Also, have you noticed that imx_v4_v5_defconfig has a build failure in
> mx2_camera.c?
>
> drivers/media/video/mx2_camera.c: In function 'mx2_camera_set_bus_param':
> drivers/media/video/mx2_camera.c:1032:42: error: 'pixfmt' undeclared
> (first use in this function)
> drivers/media/video/mx2_camera.c:1032:42: note: each undeclared
> identifier is reported only once for each function it appears in
ux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This has already been addressed by the following patch:
http://patchwork.linuxtv.org/patch/11504/
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL] i.MX fixes
2012-06-08 8:23 ` Olof Johansson
2012-06-08 20:24 ` Fabio Estevam
@ 2012-06-09 9:44 ` Sascha Hauer
1 sibling, 0 replies; 14+ messages in thread
From: Sascha Hauer @ 2012-06-09 9:44 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jun 08, 2012 at 01:23:19AM -0700, Olof Johansson wrote:
> On Thu, Jun 7, 2012 at 1:04 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > Hi Olof, Arnd,
> >
> > Please pull the following i.MX fixes for -rc.
> >
> > Sascha
> >
> > The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc:
> >
> > ?Linux 3.4 (2012-05-20 15:29:13 -0700)
> >
> > are available in the git repository at:
> >
> > ?git://git.pengutronix.de/git/imx/linux-2.6.git imx/fixes
>
> Pulled, thanks. In the future, for fixes you can aggregate them in one
> branch -- we normally just care about topics for merge window staging.
Ok, thanks
Sascha
--
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] 14+ messages in thread
* [GIT PULL] i.MX Fixes
@ 2012-09-11 9:55 Sascha Hauer
2012-09-13 5:03 ` Olof Johansson
0 siblings, 1 reply; 14+ messages in thread
From: Sascha Hauer @ 2012-09-11 9:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Please pull the following i.MX fixes for -rc
Thanks
Sascha
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes
for you to fetch changes up to 48540058612786d365602f3324ed97f9071092de:
ARM: clk-imx35: Fix SSI clock registration (2012-09-11 11:52:28 +0200)
----------------------------------------------------------------
ARM: i.MX: Fix SSI clock associations for i.MX25/i.MX35
----------------------------------------------------------------
Fabio Estevam (2):
ARM: clk-imx25: Fix SSI clock registration
ARM: clk-imx35: Fix SSI clock registration
arch/arm/mach-imx/clk-imx25.c | 6 ++----
arch/arm/mach-imx/clk-imx35.c | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
--
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] 14+ messages in thread
* [GIT PULL] i.MX Fixes
2012-09-11 9:55 [GIT PULL] i.MX Fixes Sascha Hauer
@ 2012-09-13 5:03 ` Olof Johansson
0 siblings, 0 replies; 14+ messages in thread
From: Olof Johansson @ 2012-09-13 5:03 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 11:55:09AM +0200, Sascha Hauer wrote:
> Hi Arnd, Olof,
>
> Please pull the following i.MX fixes for -rc
>
> Thanks
> Sascha
>
>
> The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
>
> Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
>
> are available in the git repository at:
>
> git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-09-13 5:03 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-27 9:33 [GIT PULL] i.MX fixes Sascha Hauer
2012-02-27 13:39 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2012-09-11 9:55 [GIT PULL] i.MX Fixes Sascha Hauer
2012-09-13 5:03 ` Olof Johansson
2012-06-07 20:04 [GIT PULL] i.MX fixes Sascha Hauer
2012-06-08 8:23 ` Olof Johansson
2012-06-08 20:24 ` Fabio Estevam
2012-06-09 9:44 ` Sascha Hauer
2011-12-09 10:09 Sascha Hauer
2011-12-09 10:16 ` Sascha Hauer
2011-12-09 13:41 ` Arnd Bergmann
2011-11-11 15:57 Sascha Hauer
2011-11-11 18:39 ` Olof Johansson
2011-07-07 8:08 Sascha Hauer
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).