| Message ID | 20120217082426.GO3852@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 17, 2012 at 6:24 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > ---------------------------------------------------------------- > Fabio Estevam (7): > ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct This one fixes a build breakage in mainline, so it would be nice if this one could be pulled first. Thanks, Fabio Estevam
On Fri, Feb 17, 2012 at 09:10:30AM -0200, Fabio Estevam wrote: > On Fri, Feb 17, 2012 at 6:24 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > > ---------------------------------------------------------------- > > Fabio Estevam (7): > > ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct > > This one fixes a build breakage in mainline, so it would be nice if > this one could be pulled first. This breaks since regulator: Remove support for supplies specified by struct device currently sitting in next. Linus master builds fine. Sascha
On Fri, Feb 17, 2012 at 09:10:30AM -0200, Fabio Estevam wrote: > On Fri, Feb 17, 2012 at 6:24 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > ---------------------------------------------------------------- > > Fabio Estevam (7): > > ?? ?? ??ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct > This one fixes a build breakage in mainline, so it would be nice if > this one could be pulled first. The mainline change will only go in during the next merge window.
On Friday 17 February 2012, Sascha Hauer wrote: > Hi Olof, > > Please pull the following assorted updates for i.MX. > Hi Sascha, I've pulled it into a generic next/devel branch now, but I'd prefer avoiding such catch-all branches in the future. I'd be happier if you could send separate pull requests for independent parts of this: fixes: 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 drivers: ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31 ARM: mx27_3ds: Add camera support ARM: imx_v4_v5_defconfig: Update defconfig cleanup: ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's ARM: mx3: Let mx31 and mx35 share the same CCM header file I did not want to do that rebase myself because I don't know if the branch you sent me is used elsewhere, but if you send me replacements, I'd prefer removing this one branch from arm-soc and putting the three others in. Arnd
Hi Olof, Please pull the following assorted updates for i.MX. 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 features/assorted for you to fetch changes up to bc17b36704e051ec67eeaa6e10d7e20ce32c76cf: ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board (2012-02-17 09:20:31 +0100) ---------------------------------------------------------------- Fabio Estevam (7): ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31 ARM: mx27_3ds: Add camera support ARM: imx_v4_v5_defconfig: Update defconfig ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's ARM: mx3: Let mx31 and mx35 share the same CCM header file ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board arch/arm/configs/imx_v4_v5_defconfig | 17 ++ arch/arm/configs/imx_v6_v7_defconfig | 32 ++++ arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/clock-imx31.c | 2 +- arch/arm/mach-imx/clock-imx35.c | 166 +++++++++----------- .../mach-imx/{crmregs-imx31.h => crmregs-imx3.h} | 15 ++- arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 108 +++++++++++++ arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/plat-mxc/audmux-v1.c | 5 +- 10 files changed, 251 insertions(+), 99 deletions(-) rename arch/arm/mach-imx/{crmregs-imx31.h => crmregs-imx3.h} (94%)