* [GIT PULL 2/2] omap1 sparse irq support for v4.2 [not found] <80194352.chs4cqVdmg@wuerfel> @ 2015-05-21 14:58 ` Tony Lindgren 2015-05-21 15:40 ` Arnd Bergmann 0 siblings, 1 reply; 9+ messages in thread From: Tony Lindgren @ 2015-05-21 14:58 UTC (permalink / raw) To: linux-arm-kernel * Arnd Bergmann <arnd@arndb.de> [150521 05:13]: > On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > > to making omap1 support multiarch. After this series we still need to > > make omap1 use the common clock framework and fix up the drivers to not > > rely on includes from mach and plat directories. > > > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > > > > I'm getting lots of build errors in linux-next, which I think are > caused by this series. Hmm is this with make randconfig? What's the Kconfig option enabling these errors? Regards, Tony ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-21 14:58 ` [GIT PULL 2/2] omap1 sparse irq support for v4.2 Tony Lindgren @ 2015-05-21 15:40 ` Arnd Bergmann 2015-05-21 15:49 ` Tony Lindgren 0 siblings, 1 reply; 9+ messages in thread From: Arnd Bergmann @ 2015-05-21 15:40 UTC (permalink / raw) To: linux-arm-kernel On Thursday 21 May 2015 07:58:41 Tony Lindgren wrote: > * Arnd Bergmann <arnd@arndb.de> [150521 05:13]: > > On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > > > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > > > to making omap1 support multiarch. After this series we still need to > > > make omap1 use the common clock framework and fix up the drivers to not > > > rely on includes from mach and plat directories. > > > > > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > > > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > > > > > > > I'm getting lots of build errors in linux-next, which I think are > > caused by this series. > > Hmm is this with make randconfig? Yes, all sorts of randconfig builds hit different parts here > What's the Kconfig option enabling these errors? >From what I can tell, this is simply a result of enabling CONFIG_SPARSE_IRQ, which results in linux/irq.h no longer implicitly including mach/hardware.h through mach/irqs.h. You should be able to see these errors by just enabling the respective drivers. The errors manifest as a long list of undefined symbols like /git/arm-soc/arch/arm/mach-omap1/io.c:33:28: error: 'OMAP1_IO_OFFSET' undeclared here (not in a function) /git/arm-soc/arch/arm/mach-omap1/io.c:43:14: error: 'OMAP7XX_DSP_BASE' undeclared here (not in a function) /git/arm-soc/arch/arm/mach-omap1/serial.c:114:33: note: each undeclared identifier is reported only once for each function it appears in /git/arm-soc/arch/arm/mach-omap1/pm.c:217:23: error: 'ULPD_SOFT_DISABLE_REQ_REG' undeclared (first use in this function) /git/arm-soc/drivers/video/fbdev/omap/sossi.c:608:17: error: 'MOD_CONF_CTRL_1' undeclared (first use in this function) Then again, it is possible that I only see the errors because of an interaction with another patch from my randconfig fixes series. Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-21 15:40 ` Arnd Bergmann @ 2015-05-21 15:49 ` Tony Lindgren 2015-05-21 16:54 ` Tony Lindgren 0 siblings, 1 reply; 9+ messages in thread From: Tony Lindgren @ 2015-05-21 15:49 UTC (permalink / raw) To: linux-arm-kernel * Arnd Bergmann <arnd@arndb.de> [150521 08:41]: > On Thursday 21 May 2015 07:58:41 Tony Lindgren wrote: > > * Arnd Bergmann <arnd@arndb.de> [150521 05:13]: > > > On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > > > > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > > > > to making omap1 support multiarch. After this series we still need to > > > > make omap1 use the common clock framework and fix up the drivers to not > > > > rely on includes from mach and plat directories. > > > > > > > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > > > > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > > > > > > > > > > I'm getting lots of build errors in linux-next, which I think are > > > caused by this series. > > > > Hmm is this with make randconfig? > > Yes, all sorts of randconfig builds hit different parts here > > > What's the Kconfig option enabling these errors? > > From what I can tell, this is simply a result of enabling > CONFIG_SPARSE_IRQ, which results in linux/irq.h no longer > implicitly including mach/hardware.h through mach/irqs.h. Hmm not seeing that here, well at least not with what I've tried so far. > You should be able to see these errors by just enabling > the respective drivers. The errors manifest as a long list > of undefined symbols like > > /git/arm-soc/arch/arm/mach-omap1/io.c:33:28: error: 'OMAP1_IO_OFFSET' undeclared here (not in a function) > /git/arm-soc/arch/arm/mach-omap1/io.c:43:14: error: 'OMAP7XX_DSP_BASE' undeclared here (not in a function) > /git/arm-soc/arch/arm/mach-omap1/serial.c:114:33: note: each undeclared identifier is reported only once for each function it appears in > /git/arm-soc/arch/arm/mach-omap1/pm.c:217:23: error: 'ULPD_SOFT_DISABLE_REQ_REG' undeclared (first use in this function) > /git/arm-soc/drivers/video/fbdev/omap/sossi.c:608:17: error: 'MOD_CONF_CTRL_1' undeclared (first use in this function) > > Then again, it is possible that I only see the errors because of > an interaction with another patch from my randconfig fixes > series. I think there's something like that going on.. Maybe you're now enabling multiarch for omap1 in your branch? Regards, Tony ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-21 15:49 ` Tony Lindgren @ 2015-05-21 16:54 ` Tony Lindgren 2015-05-21 18:36 ` Tony Lindgren 0 siblings, 1 reply; 9+ messages in thread From: Tony Lindgren @ 2015-05-21 16:54 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [150521 08:52]: > * Arnd Bergmann <arnd@arndb.de> [150521 08:41]: > > On Thursday 21 May 2015 07:58:41 Tony Lindgren wrote: > > > * Arnd Bergmann <arnd@arndb.de> [150521 05:13]: > > > > On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > > > > > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > > > > > to making omap1 support multiarch. After this series we still need to > > > > > make omap1 use the common clock framework and fix up the drivers to not > > > > > rely on includes from mach and plat directories. > > > > > > > > > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > > > > > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > > > > > > > > > > > > > I'm getting lots of build errors in linux-next, which I think are > > > > caused by this series. > > > > > > Hmm is this with make randconfig? > > > > Yes, all sorts of randconfig builds hit different parts here > > > > > What's the Kconfig option enabling these errors? > > > > From what I can tell, this is simply a result of enabling > > CONFIG_SPARSE_IRQ, which results in linux/irq.h no longer > > implicitly including mach/hardware.h through mach/irqs.h. > > Hmm not seeing that here, well at least not with what I've > tried so far. > > > You should be able to see these errors by just enabling > > the respective drivers. The errors manifest as a long list > > of undefined symbols like > > > > /git/arm-soc/arch/arm/mach-omap1/io.c:33:28: error: 'OMAP1_IO_OFFSET' undeclared here (not in a function) > > /git/arm-soc/arch/arm/mach-omap1/io.c:43:14: error: 'OMAP7XX_DSP_BASE' undeclared here (not in a function) > > /git/arm-soc/arch/arm/mach-omap1/serial.c:114:33: note: each undeclared identifier is reported only once for each function it appears in > > /git/arm-soc/arch/arm/mach-omap1/pm.c:217:23: error: 'ULPD_SOFT_DISABLE_REQ_REG' undeclared (first use in this function) > > /git/arm-soc/drivers/video/fbdev/omap/sossi.c:608:17: error: 'MOD_CONF_CTRL_1' undeclared (first use in this function) > > > > Then again, it is possible that I only see the errors because of > > an interaction with another patch from my randconfig fixes > > series. > > I think there's something like that going on.. Maybe you're > now enabling multiarch for omap1 in your branch? OK got it triggered here too with randconfig builds now. This seems to be related to not selecting some omap1 SoCs or boards. I'll try to do a minimal fix for it today. It seems the include changes you posted would be better done by replacing the the dependencies to mach/irqs.h where possible rather than adding more includes? Regards, Tony ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-21 16:54 ` Tony Lindgren @ 2015-05-21 18:36 ` Tony Lindgren 2015-05-21 21:33 ` Arnd Bergmann 0 siblings, 1 reply; 9+ messages in thread From: Tony Lindgren @ 2015-05-21 18:36 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [150521 09:55]: > * Tony Lindgren <tony@atomide.com> [150521 08:52]: > > * Arnd Bergmann <arnd@arndb.de> [150521 08:41]: > > > On Thursday 21 May 2015 07:58:41 Tony Lindgren wrote: > > > > * Arnd Bergmann <arnd@arndb.de> [150521 05:13]: > > > > > On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > > > > > > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > > > > > > to making omap1 support multiarch. After this series we still need to > > > > > > make omap1 use the common clock framework and fix up the drivers to not > > > > > > rely on includes from mach and plat directories. > > > > > > > > > > > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > > > > > > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > > > > > > > > > > > > > > > > I'm getting lots of build errors in linux-next, which I think are > > > > > caused by this series. > > > > > > > > Hmm is this with make randconfig? > > > > > > Yes, all sorts of randconfig builds hit different parts here > > > > > > > What's the Kconfig option enabling these errors? > > > > > > From what I can tell, this is simply a result of enabling > > > CONFIG_SPARSE_IRQ, which results in linux/irq.h no longer > > > implicitly including mach/hardware.h through mach/irqs.h. > > > > Hmm not seeing that here, well at least not with what I've > > tried so far. > > > > > You should be able to see these errors by just enabling > > > the respective drivers. The errors manifest as a long list > > > of undefined symbols like > > > > > > /git/arm-soc/arch/arm/mach-omap1/io.c:33:28: error: 'OMAP1_IO_OFFSET' undeclared here (not in a function) > > > /git/arm-soc/arch/arm/mach-omap1/io.c:43:14: error: 'OMAP7XX_DSP_BASE' undeclared here (not in a function) > > > /git/arm-soc/arch/arm/mach-omap1/serial.c:114:33: note: each undeclared identifier is reported only once for each function it appears in > > > /git/arm-soc/arch/arm/mach-omap1/pm.c:217:23: error: 'ULPD_SOFT_DISABLE_REQ_REG' undeclared (first use in this function) > > > /git/arm-soc/drivers/video/fbdev/omap/sossi.c:608:17: error: 'MOD_CONF_CTRL_1' undeclared (first use in this function) > > > > > > Then again, it is possible that I only see the errors because of > > > an interaction with another patch from my randconfig fixes > > > series. > > > > I think there's something like that going on.. Maybe you're > > now enabling multiarch for omap1 in your branch? > > OK got it triggered here too with randconfig builds now. > This seems to be related to not selecting some omap1 SoCs or > boards. I'll try to do a minimal fix for it today. > > It seems the include changes you posted would be better done > by replacing the the dependencies to mach/irqs.h where possible > rather than adding more includes? OK figured it out. We now rely on an indirect include selected with ARCH_OMAP15XX. Here's what I suggest as a fix for this issue, obviously the real fix is to fix the legacy drivers to not #include <mach/*.h>. Regards, Tony 8< -------------------- From: Tony Lindgren <tony@atomide.com> Date: Thu, 21 May 2015 11:01:29 -0700 Subject: [PATCH] ARM: OMAP1: Fix randconfig builds if ARCH_OMAP15XX not selected With the omap1 SPARSE_IRQ changes mach/irqs.h is no longer automatically included. Turns out now we rely on ARCH_OMAP15XX including hardware.h from memory.h, so without ARCH_OMAP15XX we get build failures. As we have legacy drivers still relying on these indirect includes, let's not add more mach includes to the drivers. Those have to be removed anyways for multiplatform support. Let's fix up mach-omap1 to include soc.h where cpu_is_omap checks are done, and common.h for board-*.c files. But let's keep the indirect memory.h include for now to avoid unnecessary churn in the drivers. Signed-off-by: Tony Lindgren <tony@atomide.com> --- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c @@ -16,6 +16,7 @@ #include <linux/i2c/tps65010.h> +#include "common.h" #include "board-h3.h" #include "mmc.h" --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -36,6 +36,8 @@ #include <mach/irqs.h> +#include "soc.h" + #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) void omap7xx_map_io(void); #else --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -21,6 +21,8 @@ #include <mach/irqs.h> +#include "soc.h" + #define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO2_BASE 0xfffbec00 #define OMAP1610_GPIO3_BASE 0xfffbb400 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -21,6 +21,8 @@ #include <mach/irqs.h> +#include "soc.h" + #define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO2_BASE 0xfffbc800 #define OMAP7XX_GPIO3_BASE 0xfffbd000 --- a/arch/arm/mach-omap1/include/mach/memory.h +++ b/arch/arm/mach-omap1/include/mach/memory.h @@ -5,6 +5,9 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H +/* REVISIT: omap1 legacy drivers still rely on this */ +#include <mach/soc.h> + /* * Bus address is physical address, except for OMAP-1510 Local Bus. * OMAP-1510 bus address is translated into a Local Bus address if the @@ -14,7 +17,6 @@ * because of the strncmp(). */ #if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) -#include <mach/soc.h> /* * OMAP-1510 Local Bus address offset --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -62,6 +62,7 @@ #include "iomap.h" #include "clock.h" #include "pm.h" +#include "soc.h" #include "sram.h" static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -25,6 +25,7 @@ #include <mach/mux.h> #include "pm.h" +#include "soc.h" static struct clk * uart1_ck; static struct clk * uart2_ck; ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-21 18:36 ` Tony Lindgren @ 2015-05-21 21:33 ` Arnd Bergmann 2015-05-21 21:47 ` Tony Lindgren 0 siblings, 1 reply; 9+ messages in thread From: Arnd Bergmann @ 2015-05-21 21:33 UTC (permalink / raw) To: linux-arm-kernel On Thursday 21 May 2015 11:36:30 Tony Lindgren wrote: > > > > OK got it triggered here too with randconfig builds now. > > This seems to be related to not selecting some omap1 SoCs or > > boards. I'll try to do a minimal fix for it today. > > > > It seems the include changes you posted would be better done > > by replacing the the dependencies to mach/irqs.h where possible > > rather than adding more includes? Yes, I guess we can do that too. FWIW, almost all the problems were uses of cpu_is_omap*(), omap_read*() and omap_write*(). There are quite a lot of them overall, but at least they are easy to grep for, and there should be an obvious fix for each of them, following what you did on OMAP2 a couple of years ago. > OK figured it out. We now rely on an indirect include selected > with ARCH_OMAP15XX. Here's what I suggest as a fix for this > issue, obviously the real fix is to fix the legacy drivers to not > #include <mach/*.h>. Ok, I've put this patch in my randconfig build setup to replace my older patch, let's see if there are still some corner cases left. So far, everything looks good (50 random mach-omap1 builds done). Can you send an updated pull request with the fix folded in? Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-21 21:33 ` Arnd Bergmann @ 2015-05-21 21:47 ` Tony Lindgren 0 siblings, 0 replies; 9+ messages in thread From: Tony Lindgren @ 2015-05-21 21:47 UTC (permalink / raw) To: linux-arm-kernel * Arnd Bergmann <arnd@arndb.de> [150521 14:35]: > On Thursday 21 May 2015 11:36:30 Tony Lindgren wrote: > > > > > > OK got it triggered here too with randconfig builds now. > > > This seems to be related to not selecting some omap1 SoCs or > > > boards. I'll try to do a minimal fix for it today. > > > > > > It seems the include changes you posted would be better done > > > by replacing the the dependencies to mach/irqs.h where possible > > > rather than adding more includes? > > Yes, I guess we can do that too. FWIW, almost all the problems > were uses of cpu_is_omap*(), omap_read*() and omap_write*(). > > There are quite a lot of them overall, but at least they are > easy to grep for, and there should be an obvious fix for each > of them, following what you did on OMAP2 a couple of years ago. Yeah then that can be done one driver at a time. > > OK figured it out. We now rely on an indirect include selected > > with ARCH_OMAP15XX. Here's what I suggest as a fix for this > > issue, obviously the real fix is to fix the legacy drivers to not > > #include <mach/*.h>. > > Ok, I've put this patch in my randconfig build setup to replace > my older patch, let's see if there are still some corner cases > left. So far, everything looks good (50 random mach-omap1 builds > done). Can you send an updated pull request with the fix folded in? OK will do. I'll also include the secion warning I posted earlier today as that seems to get triggered with some randconfigs because of the __init_or_module. Regards, Tony ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <4094934.StqYY08vL5@wuerfel>]
* [GIT PULL 2/2] omap1 sparse irq support for v4.2 [not found] <4094934.StqYY08vL5@wuerfel> @ 2015-05-21 12:47 ` Arnd Bergmann 0 siblings, 0 replies; 9+ messages in thread From: Arnd Bergmann @ 2015-05-21 12:47 UTC (permalink / raw) To: linux-arm-kernel On Thursday 21 May 2015 14:14:12 Arnd Bergmann wrote: > On Wednesday 20 May 2015 15:36:05 Tony Lindgren wrote: > > Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer > > to making omap1 support multiarch. After this series we still need to > > make omap1 use the common clock framework and fix up the drivers to not > > rely on includes from mach and plat directories. > > > > Note that this branch depends on a GPIO driver fix in v4.1-rc3 > > d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). > > > > fwiw, I have another patch in my 'multiplatform' series that will add > another baby step. > > 8<--- > ARM: OMAP1: make header files local if possible > > A number of header files in mach-omap1 are never included from outside > of mach-omap1, so we can move them directly to that directory. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> and three more: diff --git a/arch/arm/mach-omap1/board-h3.h b/arch/arm/mach-omap1/board-h3.h index 78de535be3c5..f70c42801969 100644 --- a/arch/arm/mach-omap1/board-h3.h +++ b/arch/arm/mach-omap1/board-h3.h @@ -27,6 +27,8 @@ #ifndef __ASM_ARCH_OMAP_H3_H #define __ASM_ARCH_OMAP_H3_H +#include <mach/irqs.h> + #define H3_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) # define H3_TPS_GPIO_MMC_PWR_EN (H3_TPS_GPIO_BASE + 4) diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c index e2fcdb8e5596..8a3690b2acbd 100644 --- a/drivers/usb/gadget/udc/omap_udc.c +++ b/drivers/usb/gadget/udc/omap_udc.c @@ -45,6 +45,7 @@ #include <linux/omap-dma.h> +#include <mach/hardware.h> #include <mach/usb.h> #include "omap_udc.h" diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 6bb623a2a4df..1f6c8d91f738 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -34,6 +34,7 @@ #include <sound/omap-pcm.h> #ifdef CONFIG_ARCH_OMAP1 +#include <mach/soc.h> #define pcm_omap1510() cpu_is_omap1510() #else #define pcm_omap1510() 0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [GIT PULL 1/2] omap clean-up for v4.2
@ 2015-05-20 22:36 Tony Lindgren
2015-05-20 22:36 ` [GIT PULL 2/2] omap1 sparse irq support " Tony Lindgren
0 siblings, 1 reply; 9+ messages in thread
From: Tony Lindgren @ 2015-05-20 22:36 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:
Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.2/clean
for you to fetch changes up to fd0dbc83c6602ad57f34d1ec0b120fea25fcca56:
Merge branch 'omap-for-v4.2/legacy' into omap-for-v4.2/cleanup (2015-05-20 14:51:05 -0700)
----------------------------------------------------------------
Clean-up for omaps for v4.2 merge window:
Drop more omap3 legacy board-*.c files for v4.2. This time we're
dropping the board files for beagle, overo and cm-t35.
The reason for dropping these now rather than later is that now
we can simply revert the patches in case of unexpected issues as
we are not dropping any platform data at this point.
This leaves us with only the following board-*.c files:
BOARD REASON NEEDED
board-ldp.c Still used in RMKs boot test system
board-omap3logic.c Getting a .dts file for v4.2
board-omap3pandora.c Got a .dts file for v4.1
board-rx51-*.c Needs /proc/atags support for user space
I'm hoping we can drop the remaining board-*.c for v4.3 merge
window, then keep the platform data around for one more merge
window in case of reverting needed, then drop the platform data
too for v4.4 if no issues needing reverting are found.
Also, few patches to clean-up the usage of Linux generic
macros:
- Use define for console loglevel
- Use const for struct irq_domain_ops
- Use PTR_ERR_OR_ZERO instead of PTR_RET
----------------------------------------------------------------
Alexander Kuleshov (1):
ARM: OMAP2+: use symbolic defines for console loglevels instead of numbers
Krzysztof Kozlowski (1):
ARM: OMAP2+: Constify irq_domain_ops
Nicholas Krause (2):
ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c
Tony Lindgren (4):
ARM: OMAP2+: Remove legacy booting support for cm-t35
ARM: OMAP2+: Remove legacy booting support for Overo
ARM: OMAP2+: Remove legacy booting support for Beagleboards
Merge branch 'omap-for-v4.2/legacy' into omap-for-v4.2/cleanup
arch/arm/mach-omap2/Kconfig | 22 -
arch/arm/mach-omap2/Makefile | 3 -
arch/arm/mach-omap2/board-cm-t35.c | 769 --------------------------------
arch/arm/mach-omap2/board-omap3beagle.c | 595 ------------------------
arch/arm/mach-omap2/board-overo.c | 571 ------------------------
arch/arm/mach-omap2/devices.c | 4 +-
arch/arm/mach-omap2/fb.c | 2 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 2 +-
arch/arm/mach-omap2/pmu.c | 2 +-
arch/arm/mach-omap2/serial.c | 2 +-
10 files changed, 6 insertions(+), 1966 deletions(-)
delete mode 100644 arch/arm/mach-omap2/board-cm-t35.c
delete mode 100644 arch/arm/mach-omap2/board-omap3beagle.c
delete mode 100644 arch/arm/mach-omap2/board-overo.c
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 2/2] omap1 sparse irq support for v4.2 2015-05-20 22:36 [GIT PULL 1/2] omap clean-up " Tony Lindgren @ 2015-05-20 22:36 ` Tony Lindgren 0 siblings, 0 replies; 9+ messages in thread From: Tony Lindgren @ 2015-05-20 22:36 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit 030bbdbf4c833bc69f502eae58498bc5572db736: Linux 4.1-rc3 (2015-05-10 15:12:29 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.2/omap1 for you to fetch changes up to 685e2d08c54b1a1bf31bbe6562f06db089d31c7b: ARM: OMAP1: Change interrupt numbering for sparse IRQ (2015-05-20 09:01:21 -0700) ---------------------------------------------------------------- Add support for CONFIG_SPARSE_IRQ for omap1. This takes us a bit closer to making omap1 support multiarch. After this series we still need to make omap1 use the common clock framework and fix up the drivers to not rely on includes from mach and plat directories. Note that this branch depends on a GPIO driver fix in v4.1-rc3 d2d05c65c40e ("gpio: omap: Fix regression for MPUIO interrupts"). ---------------------------------------------------------------- Tony Lindgren (4): ARM: OMAP1: Move UART defines to prepare for sparse IRQ ARM: OMAP1: Switch to use generic irqchip in preparation for sparse IRQ ARM: omap1: Switch to use MULTI_IRQ ARM: OMAP1: Change interrupt numbering for sparse IRQ arch/arm/Kconfig | 2 + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- arch/arm/mach-omap1/board-ams-delta.c | 1 + arch/arm/mach-omap1/board-fsample.c | 1 + arch/arm/mach-omap1/board-generic.c | 1 + arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-h3.c | 1 + arch/arm/mach-omap1/board-htcherald.c | 1 + arch/arm/mach-omap1/board-innovator.c | 1 + arch/arm/mach-omap1/board-nokia770.c | 1 + arch/arm/mach-omap1/board-osk.c | 1 + arch/arm/mach-omap1/board-palmte.c | 1 + arch/arm/mach-omap1/board-palmtt.c | 1 + arch/arm/mach-omap1/board-palmz71.c | 1 + arch/arm/mach-omap1/board-perseus2.c | 1 + arch/arm/mach-omap1/board-sx1.c | 1 + arch/arm/mach-omap1/board-voiceblue.c | 1 + arch/arm/mach-omap1/common.h | 5 +- arch/arm/mach-omap1/dma.c | 2 +- arch/arm/mach-omap1/i2c.c | 3 +- arch/arm/mach-omap1/include/mach/entry-macro.S | 39 ------ arch/arm/mach-omap1/include/mach/irqs.h | 124 ++++++++++--------- arch/arm/mach-omap1/include/mach/serial.h | 5 - arch/arm/mach-omap1/include/mach/soc.h | 4 + arch/arm/mach-omap1/irq.c | 157 +++++++++++++++---------- arch/arm/mach-omap1/timer.c | 4 +- arch/arm/plat-omap/dma.c | 4 + include/uapi/linux/serial_reg.h | 3 + 28 files changed, 190 insertions(+), 180 deletions(-) delete mode 100644 arch/arm/mach-omap1/include/mach/entry-macro.S ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-05-21 21:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <80194352.chs4cqVdmg@wuerfel>
2015-05-21 14:58 ` [GIT PULL 2/2] omap1 sparse irq support for v4.2 Tony Lindgren
2015-05-21 15:40 ` Arnd Bergmann
2015-05-21 15:49 ` Tony Lindgren
2015-05-21 16:54 ` Tony Lindgren
2015-05-21 18:36 ` Tony Lindgren
2015-05-21 21:33 ` Arnd Bergmann
2015-05-21 21:47 ` Tony Lindgren
[not found] <4094934.StqYY08vL5@wuerfel>
2015-05-21 12:47 ` Arnd Bergmann
2015-05-20 22:36 [GIT PULL 1/2] omap clean-up " Tony Lindgren
2015-05-20 22:36 ` [GIT PULL 2/2] omap1 sparse irq support " Tony Lindgren
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).