From: Arnd Bergmann <[email protected]>
These are three fixes for mistakes I discovered during the preparation
of the boardfile removal. Robert noticed the accidental removal
of PXA310 and PXA320 support because of a misplaced Kconfig statement,
and the two OMAP patches were build failures that got introduced
earlier but that I found while testing the removal.
If these look fine, I'll queue them for 6.2 and for stable backports,
basing the boardfile removal patches on top.
Arnd Bergmann (3):
ARM: pxa: enable PXA310/PXA320 for DT-only build
ARM: omap1: fix !ARCH_OMAP1_ANY link failures
ARM: omap1: fix building gpio15xx
arch/arm/mach-omap1/Kconfig | 5 +----
arch/arm/mach-omap1/Makefile | 4 ----
arch/arm/mach-omap1/gpio15xx.c | 1 +
arch/arm/mach-omap1/io.c | 32 +++++++++++++++-----------------
arch/arm/mach-omap1/mcbsp.c | 21 ---------------------
arch/arm/mach-omap1/pm.h | 7 -------
arch/arm/mach-pxa/Kconfig | 2 ++
include/linux/soc/ti/omap1-io.h | 4 ++--
8 files changed, 21 insertions(+), 55 deletions(-)
--
2.39.0
From: Arnd Bergmann <[email protected]>
After commit b5aaaa666a85 ("ARM: pxa: add Kconfig dependencies for
ATAGS based boards"), the default PXA build no longer includes support
for the board files that are considered unused.
As a side-effect of this, the PXA310 and PXA320 support is not built
into the kernel any more, even though it should work in principle as
long as the symbols are enabled. As Robert points out, there are dts
files for zylonite and cm-x300, though those have not made it into the
mainline kernel.
Link: https://lore.kernel.org/linux-arm-kernel/[email protected]/
Reported-by: Robert Jarzmik <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/mach-pxa/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index b90d98bae68d..03e25af6f48c 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -45,6 +45,8 @@ config MACH_PXA27X_DT
config MACH_PXA3XX_DT
bool "Support PXA3xx platforms from device tree"
select CPU_PXA300
+ select CPU_PXA310
+ select CPU_PXA320
select PINCTRL
select POWER_SUPPLY
select PXA3xx
--
2.39.0
From: Arnd Bergmann <[email protected]>
In some randconfig builds, the asm/irq.h header is not included
in gpio15xx.c, so add an explicit include to avoid a build fialure:
In file included from arch/arm/mach-omap1/gpio15xx.c:15:
arch/arm/mach-omap1/irqs.h:99:34: error: 'NR_IRQS_LEGACY' undeclared here (not in a function)
99 | #define IH2_BASE (NR_IRQS_LEGACY + 32)
| ^~~~~~~~~~~~~~
arch/arm/mach-omap1/irqs.h:105:38: note: in expansion of macro 'IH2_BASE'
105 | #define INT_MPUIO (5 + IH2_BASE)
| ^~~~~~~~
arch/arm/mach-omap1/gpio15xx.c:28:27: note: in expansion of macro 'INT_MPUIO'
28 | .start = INT_MPUIO,
| ^~~~~~~~~
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/mach-omap1/gpio15xx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
index c675f11de99d..61fa26efd865 100644
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -11,6 +11,7 @@
#include <linux/gpio.h>
#include <linux/platform_data/gpio-omap.h>
#include <linux/soc/ti/omap1-soc.h>
+#include <asm/irq.h>
#include "irqs.h"
--
2.39.0
Hi,
On Mon, Jan 09, 2023 at 05:16:36PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> In some randconfig builds, the asm/irq.h header is not included
> in gpio15xx.c, so add an explicit include to avoid a build fialure:
>
> In file included from arch/arm/mach-omap1/gpio15xx.c:15:
> arch/arm/mach-omap1/irqs.h:99:34: error: 'NR_IRQS_LEGACY' undeclared here (not in a function)
> 99 | #define IH2_BASE (NR_IRQS_LEGACY + 32)
> | ^~~~~~~~~~~~~~
> arch/arm/mach-omap1/irqs.h:105:38: note: in expansion of macro 'IH2_BASE'
> 105 | #define INT_MPUIO (5 + IH2_BASE)
> | ^~~~~~~~
> arch/arm/mach-omap1/gpio15xx.c:28:27: note: in expansion of macro 'INT_MPUIO'
> 28 | .start = INT_MPUIO,
> | ^~~~~~~~~
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Aaro Koskinen <[email protected]>
A.
> ---
> arch/arm/mach-omap1/gpio15xx.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
> index c675f11de99d..61fa26efd865 100644
> --- a/arch/arm/mach-omap1/gpio15xx.c
> +++ b/arch/arm/mach-omap1/gpio15xx.c
> @@ -11,6 +11,7 @@
> #include <linux/gpio.h>
> #include <linux/platform_data/gpio-omap.h>
> #include <linux/soc/ti/omap1-soc.h>
> +#include <asm/irq.h>
>
> #include "irqs.h"
>
> --
> 2.39.0
>
Arnd Bergmann <[email protected]> writes:
> From: Arnd Bergmann <[email protected]>
>
> After commit b5aaaa666a85 ("ARM: pxa: add Kconfig dependencies
> for
> ATAGS based boards"), the default PXA build no longer includes
> support
> for the board files that are considered unused.
>
> As a side-effect of this, the PXA310 and PXA320 support is not
> built
> into the kernel any more, even though it should work in
> principle as
> long as the symbols are enabled. As Robert points out, there are
> dts
> files for zylonite and cm-x300, though those have not made it
> into the
> mainline kernel.
>
> Link:
> https://lore.kernel.org/linux-arm-kernel/[email protected]/
> Reported-by: Robert Jarzmik <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Robert Jarzmik <[email protected]>
Cheers.
--
Robert