* [PULL] i.MX
@ 2011-10-04 9:20 Sascha Hauer
2011-10-07 20:30 ` Arnd Bergmann
2011-10-10 6:36 ` Uwe Kleine-König
0 siblings, 2 replies; 13+ messages in thread
From: Sascha Hauer @ 2011-10-04 9:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull the following for next. There are merge conflicts between
the cleanup and the features branch, so I decided to merge them together
so you don't have to handle the conflicts yourself. Please let me know
if this is ok for you or if we have to find another solution.
Sascha
The following changes since commit dfa690cd787c72468f8d633c0be81330e4466c08:
Merge branch 'next/dmtimer' into for-next (2011-10-01 18:51:54 +0200)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git for-arnd
Arnaud Patard (2):
Fix pata imx resource
efika: Configure esdhc cd/wp on efika mx/sb
Fabio Estevam (3):
ARM: mach-qong: Add watchdog support
ARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeeded
ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file
Hui Wang (1):
ARM i.MX avic: convert to use generic irq chip
Jason Liu (4):
ARM: mx5/mm: move i.MX50 mm stuff into mm.c
ARM: mx5/mm: Remove MX51_DEBUG related mapping
ARM: mx5/mm: consolidate TZIC map code
ARM: mx25: Add the missing IIM base definition
Philippe R?tornaz (1):
mx31moboard: Add poweroff support
Sascha Hauer (8):
Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
ARM i.MX avic: add handle_irq function
ARM i.MX tzic: add handle_irq function
ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
ARM i.MX entry-macro.S: remove now unused code
Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features
Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup
Merge branch 'imx-features' into for-arnd
Shawn Guo (5):
arm/imx: merge mm-imx35.c into mm-imx31.c
arm/imx: rename mm-imx31.c to mm-imx3.c
arm/imx: change mxc_init_l2x0() to an imx31/35 specific call
arm/imx: remove cpu_is_xxx() from arch_idle()
arm/imx: remove cpu_is_xxx() check from __imx_ioremap()
arch/arm/Kconfig | 1 +
arch/arm/mach-imx/Kconfig | 1 +
arch/arm/mach-imx/Makefile | 15 +-
arch/arm/mach-imx/cache-l2x0.c | 56 -
arch/arm/mach-imx/mach-apf9328.c | 1 +
arch/arm/mach-imx/mach-armadillo5x0.c | 19 +-
arch/arm/mach-imx/mach-bug.c | 1 +
arch/arm/mach-imx/mach-cpuimx27.c | 1 +
arch/arm/mach-imx/mach-cpuimx35.c | 3 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 +
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 +
arch/arm/mach-imx/mach-imx27ipcam.c | 1 +
arch/arm/mach-imx/mach-imx27lite.c | 1 +
arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 +
arch/arm/mach-imx/mach-mx1ads.c | 17 +-
arch/arm/mach-imx/mach-mx21ads.c | 1 +
arch/arm/mach-imx/mach-mx25_3ds.c | 1 +
arch/arm/mach-imx/mach-mx27_3ds.c | 3 +-
arch/arm/mach-imx/mach-mx27ads.c | 1 +
arch/arm/mach-imx/mach-mx31_3ds.c | 1 +
arch/arm/mach-imx/mach-mx31ads.c | 1 +
arch/arm/mach-imx/mach-mx31lilly.c | 1 +
arch/arm/mach-imx/mach-mx31lite.c | 1 +
arch/arm/mach-imx/mach-mx31moboard.c | 18 +
arch/arm/mach-imx/mach-mx35_3ds.c | 1 +
arch/arm/mach-imx/mach-mxt_td60.c | 1 +
arch/arm/mach-imx/mach-pca100.c | 1 +
arch/arm/mach-imx/mach-pcm037.c | 1 +
arch/arm/mach-imx/mach-pcm038.c | 1 +
arch/arm/mach-imx/mach-pcm043.c | 1 +
arch/arm/mach-imx/mach-qong.c | 2 +
arch/arm/mach-imx/mach-scb9328.c | 1 +
arch/arm/mach-imx/mach-vpr200.c | 3 +-
arch/arm/mach-imx/mm-imx3.c | 256 ++
arch/arm/mach-imx/mm-imx31.c | 91 -
arch/arm/mach-imx/mm-imx35.c | 109 -
arch/arm/mach-imx/pm-imx27.c | 2 +-
arch/arm/mach-mx5/Kconfig | 10 +-
arch/arm/mach-mx5/Makefile | 3 +-
arch/arm/mach-mx5/board-cpuimx51.c | 28 +-
arch/arm/mach-mx5/board-cpuimx51sd.c | 26 +-
arch/arm/mach-mx5/board-mx50_rdp.c | 1 +
arch/arm/mach-mx5/board-mx51_3ds.c | 2 +-
arch/arm/mach-mx5/board-mx51_babbage.c | 27 +-
arch/arm/mach-mx5/board-mx51_efikamx.c | 14 +-
arch/arm/mach-mx5/board-mx51_efikasb.c | 25 +-
arch/arm/mach-mx5/board-mx53_ard.c | 5 +-
arch/arm/mach-mx5/board-mx53_evk.c | 1 +
arch/arm/mach-mx5/board-mx53_loco.c | 1 +
arch/arm/mach-mx5/board-mx53_smd.c | 1 +
arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +-
arch/arm/mach-mx5/devices-imx51.h | 13 +
arch/arm/mach-mx5/devices.c | 120 -
arch/arm/mach-mx5/devices.h | 5 -
arch/arm/mach-mx5/ehci.c | 2 +-
arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 3 +-
arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 6 +-
arch/arm/mach-mx5/mm-mx50.c | 72 -
arch/arm/mach-mx5/mm.c | 90 +-
arch/arm/mach-mx5/mx51_efika.c | 18 +-
arch/arm/mach-mx5/pm-imx5.c | 3 +-
arch/arm/mach-mx5/system.c | 1 +
arch/arm/mach-mxs/Makefile | 6 +-
arch/arm/mach-mxs/include/mach/gpio.h | 4 -
arch/arm/mach-mxs/include/mach/mxs.h | 2 +
arch/arm/mach-mxs/mach-mx23evk.c | 1 -
arch/arm/mach-mxs/mach-mx28evk.c | 24 +-
arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 -
arch/arm/mach-mxs/mm-mx28.c | 44 -
arch/arm/mach-mxs/{mm-mx23.c => mm.c} | 19 +
arch/arm/plat-mxc/audmux-v2.c | 18 +-
arch/arm/plat-mxc/avic.c | 91 +-
arch/arm/plat-mxc/devices.c | 14 -
arch/arm/plat-mxc/devices/Kconfig | 2 +-
arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 5 +
arch/arm/plat-mxc/devices/platform-imx-i2c.c | 6 +
arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 9 +
arch/arm/plat-mxc/devices/platform-pata_imx.c | 2 +-
arch/arm/plat-mxc/include/mach/common.h | 26 +-
arch/arm/plat-mxc/include/mach/entry-macro.S | 58 +-
arch/arm/plat-mxc/include/mach/gpio.h | 9 +-
arch/arm/plat-mxc/include/mach/hardware.h | 13 +-
arch/arm/plat-mxc/include/mach/io.h | 22 +-
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 1 +
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2270 +++++---------
arch/arm/plat-mxc/include/mach/iomux-mx53.h | 3530 +++++++--------------
arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 +
arch/arm/plat-mxc/include/mach/mx25.h | 1 +
arch/arm/plat-mxc/include/mach/mx51.h | 183 +-
arch/arm/plat-mxc/include/mach/mx53.h | 1 +
arch/arm/plat-mxc/include/mach/mxc.h | 7 -
arch/arm/plat-mxc/include/mach/system.h | 35 +-
arch/arm/plat-mxc/irq-common.c | 21 +-
arch/arm/plat-mxc/irq-common.h | 3 +-
arch/arm/plat-mxc/system.c | 3 +
arch/arm/plat-mxc/tzic.c | 32 +-
drivers/gpio/gpio-mxc.c | 12 +
drivers/gpio/gpio-mxs.c | 2 +
98 files changed, 2768 insertions(+), 4807 deletions(-)
delete mode 100644 arch/arm/mach-imx/cache-l2x0.c
create mode 100644 arch/arm/mach-imx/mm-imx3.c
delete mode 100644 arch/arm/mach-imx/mm-imx31.c
delete mode 100644 arch/arm/mach-imx/mm-imx35.c
delete mode 100644 arch/arm/mach-mx5/devices.c
delete mode 100644 arch/arm/mach-mx5/devices.h
delete mode 100644 arch/arm/mach-mx5/mm-mx50.c
delete mode 100644 arch/arm/mach-mxs/mm-mx28.c
rename arch/arm/mach-mxs/{mm-mx23.c => mm.c} (75%)
--
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] 13+ messages in thread* [PULL] i.MX 2011-10-04 9:20 [PULL] i.MX Sascha Hauer @ 2011-10-07 20:30 ` Arnd Bergmann 2011-10-08 10:13 ` Sascha Hauer 2011-10-10 6:36 ` Uwe Kleine-König 1 sibling, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2011-10-07 20:30 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 04 October 2011, Sascha Hauer wrote: > Please pull the following for next. There are merge conflicts between > the cleanup and the features branch, so I decided to merge them together > so you don't have to handle the conflicts yourself. Please let me know > if this is ok for you or if we have to find another solution. Hi Sascha, it took me a while to figure out what you are doing here, but I think I've made it in the end. I recreated the imx/cleanup and imx/devel branches from the commit you sent me and made sure everything was still there, then did the merge again and took the conflict resolution that you had provided. I also recreated the next/devel branch to have a cleaner history with the same contents after that. I also took out the ata stuff into a separate branch, and will decide later if I submit that before the rest or as part of the devel branch. Please check if the branch contents are ok for you now and if the for-next branch work for you. I've been thinking about these dependencies a bit more in general. I think a good solution is how Tony does it for the omap branches: There are lots of feature branches and he sends the bigger ones individually to me instead of one big 'devel' branch, so I can decide how to group them with other stuff (e.g. your ata changes can go into a driver branch). Any significant cleanups go *first* in each branch in order to avoid having to do a merge between feature and cleanup branches for the conflict resolution. There are (at least) two ways to get there, I don't mind which one you prefer: 1. Apply all cleanups into one branch, then start each feature branch from the latest (at that time) version of the cleanup branch. 2. Keep the cleanups local to the feature branches, but have them first in each branch. Then create the global cleanup branch by merging the cleanup parts of each branch together. In the end, the thing I'm interested in is being able to reasonably argue stuff like: a) This branch contains only cleanups. The number of lines changed may be huge, but you can easily tell from each commit that the code quality is improving throughout the branch. b) This is a feature branch. We've tried our best to keep each feature as clean and small as possible and from the commits it is clear to see why these changes are necessary in order to make progress. When you get to a point where you have to do a manual merge between branches because there was no easier solution, I generally want to be the person to do the merge. If the merge is nontrivial, I certainly like to see a branch that contains the resolution that you ended up with, so I can do the same, but I also want to understand what you do, and that is easier if I get individual branches. I hope that explanation helps. Thanks, Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL] i.MX 2011-10-07 20:30 ` Arnd Bergmann @ 2011-10-08 10:13 ` Sascha Hauer 2011-10-08 15:14 ` Arnd Bergmann 0 siblings, 1 reply; 13+ messages in thread From: Sascha Hauer @ 2011-10-08 10:13 UTC (permalink / raw) To: linux-arm-kernel On Fri, Oct 07, 2011 at 10:30:18PM +0200, Arnd Bergmann wrote: > On Tuesday 04 October 2011, Sascha Hauer wrote: > > Please pull the following for next. There are merge conflicts between > > the cleanup and the features branch, so I decided to merge them together > > so you don't have to handle the conflicts yourself. Please let me know > > if this is ok for you or if we have to find another solution. > > Hi Sascha, > > it took me a while to figure out what you are doing here, but I think I've > made it in the end. I recreated the imx/cleanup and imx/devel branches > from the commit you sent me and made sure everything was still there, then > did the merge again and took the conflict resolution that you had > provided. Well it also took me a while to figure out what I should do ;) The problem I had started with the second pull request which partly depended on the first one, so I decided to use the commits of the first pull request as a base. > > I also recreated the next/devel branch to have a cleaner history with > the same contents after that. > > I also took out the ata stuff into a separate branch, and will decide > later if I submit that before the rest or as part of the devel branch. > > Please check if the branch contents are ok for you now and if the for-next > branch work for you. Compiles and works smoothly and everything seems to be there. Thanks. > > I've been thinking about these dependencies a bit more in general. I > think a good solution is how Tony does it for the omap branches: > There are lots of feature branches and he sends the bigger ones > individually to me instead of one big 'devel' branch, so I can decide > how to group them with other stuff (e.g. your ata changes can go > into a driver branch). Any significant cleanups go *first* in each > branch in order to avoid having to do a merge between feature and > cleanup branches for the conflict resolution. There are (at least) > two ways to get there, I don't mind which one you prefer: > > 1. Apply all cleanups into one branch, then start each feature branch > from the latest (at that time) version of the cleanup branch. > 2. Keep the cleanups local to the feature branches, but have them > first in each branch. Then create the global cleanup branch by > merging the cleanup parts of each branch together. > > In the end, the thing I'm interested in is being able to reasonably > argue stuff like: > a) This branch contains only cleanups. The number of lines changed > may be huge, but you can easily tell from each commit that the > code quality is improving throughout the branch. > b) This is a feature branch. We've tried our best to keep each > feature as clean and small as possible and from the commits > it is clear to see why these changes are necessary in order to > make progress. > > When you get to a point where you have to do a manual merge between > branches because there was no easier solution, I generally want > to be the person to do the merge. If the merge is nontrivial, > I certainly like to see a branch that contains the resolution > that you ended up with, so I can do the same, but I also want to > understand what you do, and that is easier if I get individual > branches. Ok, the last paragraph explains it for me. As you might have noticed I keep all branches seperated by topics anyway, so I have no problem letting you pull what you prefer, only I wanted to resolve the merge conflicts myself. What I'll do next time is that I leave resolving conflicts up to you but provide a second branch with all necessary merges as a hint for you. I think I still have to learn that merge conflicts are no bad thing at all. 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] 13+ messages in thread
* [PULL] i.MX 2011-10-08 10:13 ` Sascha Hauer @ 2011-10-08 15:14 ` Arnd Bergmann 2011-10-08 15:15 ` [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 Arnd Bergmann ` (3 more replies) 0 siblings, 4 replies; 13+ messages in thread From: Arnd Bergmann @ 2011-10-08 15:14 UTC (permalink / raw) To: linux-arm-kernel Hi Sascha, I've found a few new build errors using randconfig after pulling the i.MX tree, here are the patches I did to resolve them. If you agree with the patches, just send me an Ack and I'll add them on top. If you have a better solution for any of them, please send me another pull request. Arnd ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 2011-10-08 15:14 ` Arnd Bergmann @ 2011-10-08 15:15 ` Arnd Bergmann 2011-10-09 5:39 ` Shawn Guo 2011-10-08 15:16 ` [PATCH 2/3] ARM: imx: add missing include of linux/ftrace.h Arnd Bergmann ` (2 subsequent siblings) 3 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2011-10-08 15:15 UTC (permalink / raw) To: linux-arm-kernel The i.MX3 and i.MX35 files unconditionally call the l2x0_init function, so we should make sure that this is built into the kernel. arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0': mm-imx3.c:(.text+0x154): undefined reference to `l2x0_init' Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-imx/Kconfig | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6c12836..3de9ac9 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -64,6 +64,7 @@ config SOC_IMX31 select ARCH_MXC_AUDMUX_V2 select ARCH_MX31 select MXC_AVIC + select CACHE_L2X0 config SOC_IMX35 bool @@ -73,7 +74,7 @@ config SOC_IMX35 select HAVE_EPIT select ARCH_MX35 select MXC_AVIC - + select CACHE_L2X0 if ARCH_IMX_V4_V5 -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 2011-10-08 15:15 ` [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 Arnd Bergmann @ 2011-10-09 5:39 ` Shawn Guo 2011-10-09 5:44 ` Barry Song 0 siblings, 1 reply; 13+ messages in thread From: Shawn Guo @ 2011-10-09 5:39 UTC (permalink / raw) To: linux-arm-kernel On Sat, Oct 08, 2011 at 05:15:50PM +0200, Arnd Bergmann wrote: > The i.MX3 and i.MX35 files unconditionally call the l2x0_init > function, so we should make sure that this is built into the > kernel. > > arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0': > mm-imx3.c:(.text+0x154): undefined reference to `l2x0_init' > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- Acked-by: Shawn Guo <shawn.guo@linaro.org> However, this should also be fixed by the Rob Herring's patch below which I suppose it will be merged in the coming window. ARM: l2x0: add empty l2x0_of_init Anyway, your change makes sense to me, as the SoCs have L2 integrated and I see no reason that L2 can not be selected by default. I will do the same for my imx6q series to remove the dependency on Rob's patch. Regards, Shawn > arch/arm/mach-imx/Kconfig | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig > index 6c12836..3de9ac9 100644 > --- a/arch/arm/mach-imx/Kconfig > +++ b/arch/arm/mach-imx/Kconfig > @@ -64,6 +64,7 @@ config SOC_IMX31 > select ARCH_MXC_AUDMUX_V2 > select ARCH_MX31 > select MXC_AVIC > + select CACHE_L2X0 > > config SOC_IMX35 > bool > @@ -73,7 +74,7 @@ config SOC_IMX35 > select HAVE_EPIT > select ARCH_MX35 > select MXC_AVIC > - > + select CACHE_L2X0 > > if ARCH_IMX_V4_V5 > > -- > 1.7.5.4 > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 2011-10-09 5:39 ` Shawn Guo @ 2011-10-09 5:44 ` Barry Song 0 siblings, 0 replies; 13+ messages in thread From: Barry Song @ 2011-10-09 5:44 UTC (permalink / raw) To: linux-arm-kernel 2011/10/9 Shawn Guo <shawn.guo@freescale.com>: > On Sat, Oct 08, 2011 at 05:15:50PM +0200, Arnd Bergmann wrote: >> The i.MX3 and i.MX35 files unconditionally call the l2x0_init >> function, so we should make sure that this is built into the >> kernel. >> >> arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0': >> mm-imx3.c:(.text+0x154): undefined reference to `l2x0_init' >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- > > Acked-by: Shawn Guo <shawn.guo@linaro.org> > > However, this should also be fixed by the Rob Herring's patch below > which I suppose it will be merged in the coming window. > > ?ARM: l2x0: add empty l2x0_of_init > > Anyway, your change makes sense to me, as the SoCs have L2 integrated > and I see no reason that L2 can not be selected by default. ?I will > do the same for my imx6q series to remove the dependency on Rob's > patch. the only loss is that users have to change Kconfig if they don't want to open L2 for debugging purpose. > > Regards, > Shawn > >> ?arch/arm/mach-imx/Kconfig | ? ?3 ++- >> ?1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig >> index 6c12836..3de9ac9 100644 >> --- a/arch/arm/mach-imx/Kconfig >> +++ b/arch/arm/mach-imx/Kconfig >> @@ -64,6 +64,7 @@ config SOC_IMX31 >> ? ? ? select ARCH_MXC_AUDMUX_V2 >> ? ? ? select ARCH_MX31 >> ? ? ? select MXC_AVIC >> + ? ? select CACHE_L2X0 >> >> ?config SOC_IMX35 >> ? ? ? bool >> @@ -73,7 +74,7 @@ config SOC_IMX35 >> ? ? ? select HAVE_EPIT >> ? ? ? select ARCH_MX35 >> ? ? ? select MXC_AVIC >> - >> + ? ? select CACHE_L2X0 >> >> ?if ARCH_IMX_V4_V5 >> >> -- >> 1.7.5.4 -barry ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/3] ARM: imx: add missing include of linux/ftrace.h 2011-10-08 15:14 ` Arnd Bergmann 2011-10-08 15:15 ` [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 Arnd Bergmann @ 2011-10-08 15:16 ` Arnd Bergmann 2011-10-08 15:33 ` Jamie Iles 2011-10-08 15:16 ` [PATCH 3/7] ARM: imx: export imx_ioremap Arnd Bergmann 2011-10-09 9:33 ` [PULL] i.MX Sascha Hauer 3 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2011-10-08 15:16 UTC (permalink / raw) To: linux-arm-kernel Using the __exception_irq_entry symbol requires including this header file: arch/arm/plat-mxc/avic.c:154:39: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'avic_handle_irq' Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/plat-mxc/avic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c index 8875fb4..9bab263 100644 --- a/arch/arm/plat-mxc/avic.c +++ b/arch/arm/plat-mxc/avic.c @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/irq.h> #include <linux/io.h> +#include <linux/ftrace.h> #include <mach/common.h> #include <asm/mach/irq.h> #include <mach/hardware.h> -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/3] ARM: imx: add missing include of linux/ftrace.h 2011-10-08 15:16 ` [PATCH 2/3] ARM: imx: add missing include of linux/ftrace.h Arnd Bergmann @ 2011-10-08 15:33 ` Jamie Iles 0 siblings, 0 replies; 13+ messages in thread From: Jamie Iles @ 2011-10-08 15:33 UTC (permalink / raw) To: linux-arm-kernel Hi Arnd, Sascha, On Sat, Oct 08, 2011 at 05:16:26PM +0200, Arnd Bergmann wrote: > Using the __exception_irq_entry symbol requires including > this header file: > > arch/arm/plat-mxc/avic.c:154:39: error: expected '=', ',', ';', 'asm' > or '__attribute__' before 'avic_handle_irq' > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/plat-mxc/avic.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c > index 8875fb4..9bab263 100644 > --- a/arch/arm/plat-mxc/avic.c > +++ b/arch/arm/plat-mxc/avic.c > @@ -20,6 +20,7 @@ > #include <linux/module.h> > #include <linux/irq.h> > #include <linux/io.h> > +#include <linux/ftrace.h> Russell has applied a patch to move __exception_irq_entry into asm/exception.h (with the include of ftrace.h) into his for-next branch. So I think avic.c should be using this (as it's not explicitly using ftrace). Jamie ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/7] ARM: imx: export imx_ioremap 2011-10-08 15:14 ` Arnd Bergmann 2011-10-08 15:15 ` [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 Arnd Bergmann 2011-10-08 15:16 ` [PATCH 2/3] ARM: imx: add missing include of linux/ftrace.h Arnd Bergmann @ 2011-10-08 15:16 ` Arnd Bergmann 2011-10-09 5:49 ` Shawn Guo 2011-10-09 9:33 ` [PULL] i.MX Sascha Hauer 3 siblings, 1 reply; 13+ messages in thread From: Arnd Bergmann @ 2011-10-08 15:16 UTC (permalink / raw) To: linux-arm-kernel The arch_ioremap function on i.MX is now an indirect function pointer. In order to use it from any loadable module, the pointer itself has to be exported. ERROR: "imx_ioremap" [drivers/video/tmiofb.ko] undefined! ERROR: "imx_ioremap" [drivers/usb/host/sl811-hcd.ko] undefined! ERROR: "imx_ioremap" [drivers/usb/host/r8a66597-hcd.ko] undefined! ERROR: "imx_ioremap" [drivers/usb/host/oxu210hp-hcd.ko] undefined! ERROR: "imx_ioremap" [drivers/usb/gadget/r8a66597-udc.ko] undefined! Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/plat-mxc/system.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 9dad8dc..45e1b5f 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -21,6 +21,7 @@ #include <linux/io.h> #include <linux/err.h> #include <linux/delay.h> +#include <linux/module.h> #include <mach/hardware.h> #include <mach/common.h> @@ -30,6 +31,7 @@ void (*imx_idle)(void) = NULL; void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL; +EXPORT_SYMBOL_GPL(imx_ioremap); static void __iomem *wdog_base; -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/7] ARM: imx: export imx_ioremap 2011-10-08 15:16 ` [PATCH 3/7] ARM: imx: export imx_ioremap Arnd Bergmann @ 2011-10-09 5:49 ` Shawn Guo 0 siblings, 0 replies; 13+ messages in thread From: Shawn Guo @ 2011-10-09 5:49 UTC (permalink / raw) To: linux-arm-kernel On Sat, Oct 08, 2011 at 05:16:49PM +0200, Arnd Bergmann wrote: > The arch_ioremap function on i.MX is now an indirect function pointer. > In order to use it from any loadable module, the pointer itself > has to be exported. > > ERROR: "imx_ioremap" [drivers/video/tmiofb.ko] undefined! > ERROR: "imx_ioremap" [drivers/usb/host/sl811-hcd.ko] undefined! > ERROR: "imx_ioremap" [drivers/usb/host/r8a66597-hcd.ko] undefined! > ERROR: "imx_ioremap" [drivers/usb/host/oxu210hp-hcd.ko] undefined! > ERROR: "imx_ioremap" [drivers/usb/gadget/r8a66597-udc.ko] undefined! > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- Acked-by: Shawn Guo <shawn.guo@linaro.org> Regards, Shawn > arch/arm/plat-mxc/system.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c > index 9dad8dc..45e1b5f 100644 > --- a/arch/arm/plat-mxc/system.c > +++ b/arch/arm/plat-mxc/system.c > @@ -21,6 +21,7 @@ > #include <linux/io.h> > #include <linux/err.h> > #include <linux/delay.h> > +#include <linux/module.h> > > #include <mach/hardware.h> > #include <mach/common.h> > @@ -30,6 +31,7 @@ > > void (*imx_idle)(void) = NULL; > void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL; > +EXPORT_SYMBOL_GPL(imx_ioremap); > > static void __iomem *wdog_base; > > -- > 1.7.5.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL] i.MX 2011-10-08 15:14 ` Arnd Bergmann ` (2 preceding siblings ...) 2011-10-08 15:16 ` [PATCH 3/7] ARM: imx: export imx_ioremap Arnd Bergmann @ 2011-10-09 9:33 ` Sascha Hauer 3 siblings, 0 replies; 13+ messages in thread From: Sascha Hauer @ 2011-10-09 9:33 UTC (permalink / raw) To: linux-arm-kernel On Sat, Oct 08, 2011 at 05:14:39PM +0200, Arnd Bergmann wrote: > Hi Sascha, > > I've found a few new build errors using randconfig after pulling the > i.MX tree, here are the patches I did to resolve them. If you agree > with the patches, just send me an Ack and I'll add them on top. All acked-by: Sascha Hauer <s.hauer@pengutronix.de> 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] 13+ messages in thread
* [PULL] i.MX 2011-10-04 9:20 [PULL] i.MX Sascha Hauer 2011-10-07 20:30 ` Arnd Bergmann @ 2011-10-10 6:36 ` Uwe Kleine-König 1 sibling, 0 replies; 13+ messages in thread From: Uwe Kleine-König @ 2011-10-10 6:36 UTC (permalink / raw) To: linux-arm-kernel Hi Arnd, Sascha, On Tue, Oct 04, 2011 at 11:20:15AM +0200, Sascha Hauer wrote: > Arnaud Patard (2): > Fix pata imx resource when Sascha was on vacation I already let Arnd pull that commit squashed into the originating commit (Message-ID: <20110906192229.GK28816@pengutronix.de>). Now he got it back eventually breaking bisection :-( > efika: Configure esdhc cd/wp on efika mx/sb > > Fabio Estevam (3): > ARM: mach-qong: Add watchdog support > ARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeeded > ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file > > Hui Wang (1): > ARM i.MX avic: convert to use generic irq chip > > Jason Liu (4): > ARM: mx5/mm: move i.MX50 mm stuff into mm.c > ARM: mx5/mm: Remove MX51_DEBUG related mapping > ARM: mx5/mm: consolidate TZIC map code > ARM: mx25: Add the missing IIM base definition Same here, I squashed that commit into d27536c (ARM: mx25: Print silicon revision on boot) If you care I can help you to resolve these issues via irc. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-10-10 6:36 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-10-04 9:20 [PULL] i.MX Sascha Hauer 2011-10-07 20:30 ` Arnd Bergmann 2011-10-08 10:13 ` Sascha Hauer 2011-10-08 15:14 ` Arnd Bergmann 2011-10-08 15:15 ` [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 Arnd Bergmann 2011-10-09 5:39 ` Shawn Guo 2011-10-09 5:44 ` Barry Song 2011-10-08 15:16 ` [PATCH 2/3] ARM: imx: add missing include of linux/ftrace.h Arnd Bergmann 2011-10-08 15:33 ` Jamie Iles 2011-10-08 15:16 ` [PATCH 3/7] ARM: imx: export imx_ioremap Arnd Bergmann 2011-10-09 5:49 ` Shawn Guo 2011-10-09 9:33 ` [PULL] i.MX Sascha Hauer 2011-10-10 6:36 ` Uwe Kleine-König
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).