Skip to contentSkip to conversation

ARM: make DaVinci part of the ARM v5 multiplatform build

PATCH RESEND Superseded Bartosz Golaszewski 4 participants 11 messages Mar 18, 2019 – Apr 16, 2019

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover ARM: make DaVinci part of the ARM v5 multiplatform build

From: Bartosz Golaszewski <[email protected]>

Resending rebased on top of v5.1-rc1.

This series depends on the clocksource rework that's been earlier posted to LKML[1].

The first one adds necessary bits and pieces for davinci to support multiplatform build and the second one actually adds all davinci boards to multi_v5_defconfig.

[1] https://lkml.org/lkml/2019/3/18/546

Bartosz Golaszewski (2):
ARM: davinci: support multiplatform build for ARM v5
ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform
build

 arch/arm/Kconfig                       | 21 ---------------------
 arch/arm/configs/davinci_all_defconfig |  5 +++++
 arch/arm/configs/multi_v5_defconfig    | 12 ++++++++++++
 arch/arm/mach-davinci/Kconfig          | 16 ++++++++++++----
 arch/arm/mach-davinci/Makefile         |  2 ++
 5 files changed, 31 insertions(+), 25 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH RESEND 1/2 ARM: davinci: support multiplatform build for ARM v5

From: Bartosz Golaszewski <[email protected]>

Add modifications necessary to make davinci part of the ARM v5 multiplatform build.

Move the arch-specific configuration out of arch/arm/Kconfig and into mach-davinci/Kconfig. Remove the sub-menu for DaVinci implementations (they'll be visible directly under the system type. Select all necessary options not already selected by ARCH_MULTI_V5. Update davinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.

---
 arch/arm/Kconfig                       | 21 ---------------------
 arch/arm/configs/davinci_all_defconfig |  5 +++++
 arch/arm/mach-davinci/Kconfig          | 16 ++++++++++++----
 arch/arm/mach-davinci/Makefile         |  2 ++
 4 files changed, 19 insertions(+), 25 deletions(-)
arch/arm/Kconfig +0 -21
index f893798e13d3..01be980ee5d0 100644
@@ -583,27 +583,6 @@ config ARCH_S3C24XX
 	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
 	  Samsung SMDK2410 development board (and derivatives).
 
-config ARCH_DAVINCI
-	bool "TI DaVinci"
-	select ARCH_HAS_HOLES_MEMORYMODEL
-	select COMMON_CLK
-	select CPU_ARM926T
-	select DAVINCI_TIMER
-	select GENERIC_ALLOCATOR
-	select GENERIC_CLOCKEVENTS
-	select GENERIC_IRQ_CHIP
-	select GENERIC_IRQ_MULTI_HANDLER
-	select GPIOLIB
-	select HAVE_IDE
-	select PM_GENERIC_DOMAINS if PM
-	select PM_GENERIC_DOMAINS_OF if PM && OF
-	select RESET_CONTROLLER
-	select SPARSE_IRQ
-	select USE_OF
-	select ZONE_DMA
-	help
-	  Support for TI's DaVinci platform.
-
 config ARCH_OMAP1
 	bool "TI OMAP1"
 	depends on MMU
arch/arm/configs/davinci_all_defconfig +5 -0
index 207962a656a2..bbf285dd63e4 100644
@@ -17,6 +17,9 @@ CONFIG_MODVERSIONS=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_V7=n
+CONFIG_ARCH_MULTI_V5=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_ARCH_DAVINCI_DM644x=y
 CONFIG_ARCH_DAVINCI_DM355=y
@@ -128,9 +131,11 @@ CONFIG_SPI=y
 CONFIG_SPI_DAVINCI=m
 CONFIG_PINCTRL_DA850_PUPD=m
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_RESET_CONTROLLER=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_SYSCON_REBOOT_MODE=m
arch/arm/mach-davinci/Kconfig +12 -4
index 5a59cebc7d0a..ba6d55590b9d 100644
@@ -1,11 +1,21 @@
 # SPDX-License-Identifier: GPL-2.0
+
+menuconfig ARCH_DAVINCI
+	bool "TI DaVinci"
+	depends on ARCH_MULTI_V5
+	select DAVINCI_TIMER
+	select ZONE_DMA
+	select ARCH_HAS_HOLES_MEMORYMODEL
+	select PM_GENERIC_DOMAINS if PM
+	select PM_GENERIC_DOMAINS_OF if PM && OF
+	select HAVE_IDE
+	select PINCTRL_SINGLE
+
 if ARCH_DAVINCI
 
 config ARCH_DAVINCI_DMx
 	bool
 
-menu "TI DaVinci Implementations"
-
 comment "DaVinci Core Type"
 
 config ARCH_DAVINCI_DM644x
@@ -225,6 +235,4 @@ config DAVINCI_MUX_WARNINGS
 	  to change the pin multiplexing setup. When there are no warnings
 	  printed, it's safe to deselect DAVINCI_MUX for your product.
 
-endmenu
-
 endif
arch/arm/mach-davinci/Makefile +2 -0
index d9af8c0c0b87..58838a9de651 100644
@@ -4,6 +4,8 @@
 #
 #
 
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
+
 # Common objects
 obj-y 					:= serial.o usb.o common.o sram.o
 
Signature · 1 line
2.20.1
#10 lore raw

PATCH RESEND 2/2 ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Add all DaVinci boards to multi_v5_defconfig.

---
 arch/arm/configs/multi_v5_defconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm/configs/multi_v5_defconfig +12 -0
index 318b76fa26d1..d7b2dfe11b05 100644
@@ -14,6 +14,18 @@ CONFIG_ARCH_ASPEED=y
 CONFIG_MACH_ASPEED_G4=y
 CONFIG_ARCH_AT91=y
 CONFIG_SOC_AT91SAM9=y
+CONFIG_ARCH_DAVINCI=y
+CONFIG_ARCH_DAVINCI_DM644x=y
+CONFIG_ARCH_DAVINCI_DM355=y
+CONFIG_ARCH_DAVINCI_DM646x=y
+CONFIG_ARCH_DAVINCI_DA830=y
+CONFIG_ARCH_DAVINCI_DA850=y
+CONFIG_ARCH_DAVINCI_DM365=y
+CONFIG_MACH_SFFSDR=y
+CONFIG_MACH_NEUROS_OSD2=y
+CONFIG_MACH_DM355_LEOPARD=y
+CONFIG_MACH_MITYOMAPL138=y
+CONFIG_MACH_OMAPL138_HAWKBOARD=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_MX21ADS=y
 CONFIG_MACH_MX27ADS=y
Signature · 1 line
2.20.1
#2 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

In reply to Bartosz Golaszewski
Quoted 6 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Add modifications necessary to make davinci part of the ARM v5 multiplatform build.

Quoted 8 lines

Move the arch-specific configuration out of arch/arm/Kconfig and into mach-davinci/Kconfig. Remove the sub-menu for DaVinci implementations (they'll be visible directly under the system type. Select all necessary options not already selected by ARCH_MULTI_V5. Update davinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.

I like this a lot, it gives me some hope that we can eventually do the same for the remaining ARMv5 platforms that are not multiplatform yet (s3c24xx, ks8695, w90x900, lpc32xx, omap1, ep93xx, and maybe even the xscale based ones).

I have done a lot of randconfig testing with this patch appled now and not found any issues, great work!

Arnd

#3 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

Quoted 16 lines · Arnd Bergmann
Quoted 6 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Add modifications necessary to make davinci part of the ARM v5 multiplatform build.

Quoted 8 lines

Move the arch-specific configuration out of arch/arm/Kconfig and into mach-davinci/Kconfig. Remove the sub-menu for DaVinci implementations (they'll be visible directly under the system type. Select all necessary options not already selected by ARCH_MULTI_V5. Update davinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.

Quoted 7 lines

I like this a lot, it gives me some hope that we can eventually do the same for the remaining ARMv5 platforms that are not multiplatform yet (s3c24xx, ks8695, w90x900, lpc32xx, omap1, ep93xx, and maybe even the xscale based ones).

I have done a lot of randconfig testing with this patch appled now and not found any issues, great work!

Thanks Arnd. Will take this as your Acked-by:

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Regards,
Sekhar

#4 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

Quoted 23 lines · Sekhar Nori
Quoted 21 lines · Arnd Bergmann
Quoted 6 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Add modifications necessary to make davinci part of the ARM v5 multiplatform build.

Quoted 8 lines

Move the arch-specific configuration out of arch/arm/Kconfig and into mach-davinci/Kconfig. Remove the sub-menu for DaVinci implementations (they'll be visible directly under the system type. Select all necessary options not already selected by ARCH_MULTI_V5. Update davinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.

I like this a lot, it gives me some hope that we can eventually do the same for the remaining ARMv5 platforms that are not multiplatform yet (s3c24xx, ks8695, w90x900, lpc32xx, omap1, ep93xx, and maybe even the xscale based ones).

Quoted 7 lines
Quoted 2 lines

I have done a lot of randconfig testing with this patch appled now and not found any issues, great work!

Thanks Arnd. Will take this as your Acked-by:

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Unfortunately, after doing some more randconfig testing, I ended up with three build issues:

1. vpbe:
drivers/media/platform/davinci/vpbe_osd.c:29:10: fatal error:
'mach/cputype.h' file not found

#include <mach/cputype.h>
         ^~~~~~~~~~~~~~~~
drivers/media/platform/davinci/vpbe_venc.c:26:10: fatal error:
'mach/hardware.h' file not found
#include <mach/hardware.h>
         ^~~~~~~~~~~~~~~~~

drivers/media/platform/davinci/vpbe_display.c:31:10: fatal error:
'mach/cputype.h' file not found

2. staging/vpfe:
In file included from /git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:20:
drivers/staging/media/davinci_vpfe/dm365_isif.h:24:10: fatal error:
'mach/mux.h' file not found

3.
davinci: fix sleep.S build error on ARMv4

When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:

arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does
not support `blx ip' in ARM mode

Add a .arch statement in the sources to make this file build.

arch/arm/mach-davinci/sleep.S +1 -0
index cd350dee4df3..efcd400b2abb 100644
@@ -37,6 +37,7 @@
 #define DEEPSLEEP_SLEEPENABLE_BIT      BIT(31)
 
        .text
+       .arch   armv5te
 /*
  * Move DaVinci into deep sleep state
  *

Arnd

#5 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

pt., 12 kwi 2019 o 15:16 Arnd Bergmann <[email protected]> napisał(a):

Quoted 57 lines · Sekhar Nori
Quoted 23 lines · Arnd Bergmann
Quoted 21 lines · Bartosz Golaszewski
Quoted 6 lines

From: Bartosz Golaszewski <[email protected]>

Add modifications necessary to make davinci part of the ARM v5 multiplatform build.

Quoted 8 lines

Move the arch-specific configuration out of arch/arm/Kconfig and into mach-davinci/Kconfig. Remove the sub-menu for DaVinci implementations (they'll be visible directly under the system type. Select all necessary options not already selected by ARCH_MULTI_V5. Update davinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.

I like this a lot, it gives me some hope that we can eventually do the same for the remaining ARMv5 platforms that are not multiplatform yet (s3c24xx, ks8695, w90x900, lpc32xx, omap1, ep93xx, and maybe even the xscale based ones).

Quoted 7 lines
Quoted 2 lines

I have done a lot of randconfig testing with this patch appled now and not found any issues, great work!

Thanks Arnd. Will take this as your Acked-by:

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Unfortunately, after doing some more randconfig testing, I ended up with three build issues:

1. vpbe:
drivers/media/platform/davinci/vpbe_osd.c:29:10: fatal error:
'mach/cputype.h' file not found

#include <mach/cputype.h>
         ^~~~~~~~~~~~~~~~
drivers/media/platform/davinci/vpbe_venc.c:26:10: fatal error:
'mach/hardware.h' file not found
#include <mach/hardware.h>
         ^~~~~~~~~~~~~~~~~

drivers/media/platform/davinci/vpbe_display.c:31:10: fatal error:
'mach/cputype.h' file not found

2. staging/vpfe:
In file included from /git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:20:
drivers/staging/media/davinci_vpfe/dm365_isif.h:24:10: fatal error:
'mach/mux.h' file not found

3.
davinci: fix sleep.S build error on ARMv4

Quoted 8 lines

When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:

arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does
not support `blx ip' in ARM mode

Hi Arnd,

are the generated configs available somewhere for download?

Bart

Quoted 19 lines

Add a .arch statement in the sources to make this file build.

arch/arm/mach-davinci/sleep.S +1 -0
index cd350dee4df3..efcd400b2abb 100644
@@ -37,6 +37,7 @@
 #define DEEPSLEEP_SLEEPENABLE_BIT      BIT(31)
 
        .text
+       .arch   armv5te
 /*
  * Move DaVinci into deep sleep state
  *

Arnd

#6 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

Quoted 36 lines · Bartosz Golaszewski

pt., 12 kwi 2019 o 15:16 Arnd Bergmann <[email protected]> napisał(a):

Quoted 35 lines · Sekhar Nori
Quoted 5 lines · Arnd Bergmann
Quoted 1 line · Bartosz Golaszewski

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Unfortunately, after doing some more randconfig testing, I ended up with three build issues:

1. vpbe:
drivers/media/platform/davinci/vpbe_osd.c:29:10: fatal error:
'mach/cputype.h' file not found

#include <mach/cputype.h>
         ^~~~~~~~~~~~~~~~
drivers/media/platform/davinci/vpbe_venc.c:26:10: fatal error:
'mach/hardware.h' file not found
#include <mach/hardware.h>
         ^~~~~~~~~~~~~~~~~

drivers/media/platform/davinci/vpbe_display.c:31:10: fatal error:
'mach/cputype.h' file not found

2. staging/vpfe:
In file included from /git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:20:
drivers/staging/media/davinci_vpfe/dm365_isif.h:24:10: fatal error:
'mach/mux.h' file not found

3.
davinci: fix sleep.S build error on ARMv4

When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:

Quoted 8 lines
Quoted 4 lines

arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does
not support `blx ip' in ARM mode

Hi Arnd,

are the generated configs available somewhere for download?

No, I only keep them locally, but I would hope they are easy enough to reproduce. If you can't figure out the problem right away, I can send you the config files of course.

Just noticed another issue in my logs:

4. ARCH_DAVINCI no longer selects RESET_CONTROLLER drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
psc.c:(.text+0x3f8): undefined reference to devm_reset_controller_register' drivers/clk/davinci/psc-da850.o: In function da850_psc0_init':
psc-da850.c:(.text+0x14): undefined reference to `reset_controller_add_lookup'

Arnd

#7 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

pt., 12 kwi 2019 o 15:27 Arnd Bergmann <[email protected]> napisał(a):

Quoted 54 lines
Quoted 36 lines · Bartosz Golaszewski

pt., 12 kwi 2019 o 15:16 Arnd Bergmann <[email protected]> napisał(a):

Quoted 35 lines · Sekhar Nori
Quoted 5 lines · Arnd Bergmann
Quoted 1 line · Bartosz Golaszewski

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Unfortunately, after doing some more randconfig testing, I ended up with three build issues:

1. vpbe:
drivers/media/platform/davinci/vpbe_osd.c:29:10: fatal error:
'mach/cputype.h' file not found

#include <mach/cputype.h>
         ^~~~~~~~~~~~~~~~
drivers/media/platform/davinci/vpbe_venc.c:26:10: fatal error:
'mach/hardware.h' file not found
#include <mach/hardware.h>
         ^~~~~~~~~~~~~~~~~

drivers/media/platform/davinci/vpbe_display.c:31:10: fatal error:
'mach/cputype.h' file not found

2. staging/vpfe:
In file included from /git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:20:
drivers/staging/media/davinci_vpfe/dm365_isif.h:24:10: fatal error:
'mach/mux.h' file not found

3.
davinci: fix sleep.S build error on ARMv4

When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:

Quoted 8 lines
Quoted 4 lines

arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does
not support `blx ip' in ARM mode

Hi Arnd,

are the generated configs available somewhere for download?

No, I only keep them locally, but I would hope they are easy enough to reproduce. If you can't figure out the problem right away, I can send you the config files of course.

Just noticed another issue in my logs:

Quoted 7 lines

4. ARCH_DAVINCI no longer selects RESET_CONTROLLER drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
psc.c:(.text+0x3f8): undefined reference to devm_reset_controller_register' drivers/clk/davinci/psc-da850.o: In function da850_psc0_init':
psc-da850.c:(.text+0x14): undefined reference to `reset_controller_add_lookup'

Arnd

Thanks. Another issue that I already fixed locally is missing select for REGMAP_MMIO. Just FYI.

This series is blocked by the clocksource series anyway, but I'll work towards fixing it.

Bart

#8 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

Quoted 61 lines · Bartosz Golaszewski

pt., 12 kwi 2019 o 15:27 Arnd Bergmann <[email protected]> napisał(a):

Quoted 60 lines
Quoted 36 lines · Bartosz Golaszewski

pt., 12 kwi 2019 o 15:16 Arnd Bergmann <[email protected]> napisał(a):

Quoted 35 lines · Sekhar Nori
Quoted 5 lines · Arnd Bergmann
Quoted 1 line · Bartosz Golaszewski

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Unfortunately, after doing some more randconfig testing, I ended up with three build issues:

1. vpbe:
drivers/media/platform/davinci/vpbe_osd.c:29:10: fatal error:
'mach/cputype.h' file not found

#include <mach/cputype.h>
         ^~~~~~~~~~~~~~~~
drivers/media/platform/davinci/vpbe_venc.c:26:10: fatal error:
'mach/hardware.h' file not found
#include <mach/hardware.h>
         ^~~~~~~~~~~~~~~~~

drivers/media/platform/davinci/vpbe_display.c:31:10: fatal error:
'mach/cputype.h' file not found

2. staging/vpfe:
In file included from /git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:20:
drivers/staging/media/davinci_vpfe/dm365_isif.h:24:10: fatal error:
'mach/mux.h' file not found

3.
davinci: fix sleep.S build error on ARMv4

When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:

Quoted 8 lines
Quoted 4 lines

arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does
not support `blx ip' in ARM mode

Hi Arnd,

are the generated configs available somewhere for download?

No, I only keep them locally, but I would hope they are easy enough to reproduce. If you can't figure out the problem right away, I can send you the config files of course.

Just noticed another issue in my logs:

4. ARCH_DAVINCI no longer selects RESET_CONTROLLER drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
psc.c:(.text+0x3f8): undefined reference to devm_reset_controller_register' drivers/clk/davinci/psc-da850.o: In function da850_psc0_init':
psc-da850.c:(.text+0x14): undefined reference to `reset_controller_add_lookup'

Quoted 7 lines
Quoted 1 line

Arnd

Thanks. Another issue that I already fixed locally is missing select for REGMAP_MMIO. Just FYI.

This series is blocked by the clocksource series anyway, but I'll work towards fixing it.

Ok, sounds good. I have sent you whatever I had to work around the issue locally now, as private messages. See if you can use them, or ignore if you have a better fix.

Arnd

#9 lore raw

Re: [RESEND PATCH 1/2] ARM: davinci: support multiplatform build for ARM v5

pt., 12 kwi 2019 o 15:45 Arnd Bergmann <[email protected]> napisał(a):

Quoted 69 lines
Quoted 66 lines · Bartosz Golaszewski

pt., 12 kwi 2019 o 15:27 Arnd Bergmann <[email protected]> napisał(a):

Quoted 54 lines
Quoted 36 lines · Bartosz Golaszewski

pt., 12 kwi 2019 o 15:16 Arnd Bergmann <[email protected]> napisał(a):

Quoted 35 lines · Sekhar Nori
Quoted 5 lines · Arnd Bergmann
Quoted 1 line · Bartosz Golaszewski

The timer conversion patches are pending review/rework. Will queue once those are cleared.

Unfortunately, after doing some more randconfig testing, I ended up with three build issues:

1. vpbe:
drivers/media/platform/davinci/vpbe_osd.c:29:10: fatal error:
'mach/cputype.h' file not found

#include <mach/cputype.h>
         ^~~~~~~~~~~~~~~~
drivers/media/platform/davinci/vpbe_venc.c:26:10: fatal error:
'mach/hardware.h' file not found
#include <mach/hardware.h>
         ^~~~~~~~~~~~~~~~~

drivers/media/platform/davinci/vpbe_display.c:31:10: fatal error:
'mach/cputype.h' file not found

2. staging/vpfe:
In file included from /git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:20:
drivers/staging/media/davinci_vpfe/dm365_isif.h:24:10: fatal error:
'mach/mux.h' file not found

3.
davinci: fix sleep.S build error on ARMv4

When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:

Quoted 8 lines
Quoted 4 lines

arch/arm/mach-davinci/sleep.S: Assembler messages:
arch/arm/mach-davinci/sleep.S:56: Error: selected processor does
not support `blx ip' in ARM mode

Hi Arnd,

are the generated configs available somewhere for download?

No, I only keep them locally, but I would hope they are easy enough to reproduce. If you can't figure out the problem right away, I can send you the config files of course.

Just noticed another issue in my logs:

Quoted 7 lines

4. ARCH_DAVINCI no longer selects RESET_CONTROLLER drivers/clk/davinci/psc.o: In function `__davinci_psc_register_clocks':
psc.c:(.text+0x3f8): undefined reference to devm_reset_controller_register' drivers/clk/davinci/psc-da850.o: In function da850_psc0_init':
psc-da850.c:(.text+0x14): undefined reference to `reset_controller_add_lookup'

Arnd

Thanks. Another issue that I already fixed locally is missing select for REGMAP_MMIO. Just FYI.

Quoted 8 lines
Quoted 2 lines

This series is blocked by the clocksource series anyway, but I'll work towards fixing it.

Ok, sounds good. I have sent you whatever I had to work around the issue locally now, as private messages. See if you can use them, or ignore if you have a better fix.

Arnd

Will do, thanks!

Bart