ARM: make DaVinci part of the ARM v5 multiplatform build
Subsystems (5)
v2 cover ARM: make DaVinci part of the ARM v5 multiplatform build
From: Bartosz Golaszewski <[email protected]>
This series makes DaVinci part of the multiplatform build for ARM v5.
First three patches fix build errors spotted and fixed by Arnd with v1.
The fourth patch adds necessary bits and pieces for davinci to support multiplatform build and the last one actually adds all davinci boards to multi_v5_defconfig.
Tested on da850-lcdk with both multi_v5 as well as davinci_all defconfigs.
v1 -> v2:
- added patches from Arnd that fix build errors spotted when building random configurations (much appreciated)
- rebased on top of v5.3-rc1
Arnd Bergmann (3):
staging: media/davinci_vpfe: fix pinmux setup compilation
media: davinci-vpbe: remove obsolete includes
davinci: fix sleep.S build error on ARMv4
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 | 17 +++++++++++---- arch/arm/mach-davinci/Makefile | 2 ++ arch/arm/mach-davinci/sleep.S | 1 + drivers/media/platform/davinci/vpbe_display.c | 4 ---- drivers/media/platform/davinci/vpbe_osd.c | 5 ----- drivers/media/platform/davinci/vpbe_venc.c | 5 ----- drivers/staging/media/davinci_vpfe/Makefile | 5 ----- .../staging/media/davinci_vpfe/dm365_isif.c | 8 +++---- .../staging/media/davinci_vpfe/dm365_isif.h | 2 -- drivers/staging/media/davinci_vpfe/vpfe.h | 2 ++ 13 files changed, 38 insertions(+), 51 deletions(-)
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/5 staging: media/davinci_vpfe: fix pinmux setup compilation
From: Arnd Bergmann <[email protected]>
This fixes the following build error in davinci_vpfe.
/git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c: In function 'vpfe_isif_init':
/git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:2031:2: error: implicit declaration of function 'davinci_cfg_reg'; did you mean 'omap_cfg_reg'? [-Werror=implicit-function-declaration]
davinci_cfg_reg(DM365_VIN_CAM_WEN);
^~~~~~~~~~~~~~~
omap_cfg_reg
/git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:2031:18: error: 'DM365_VIN_CAM_WEN' undeclared (first use in this function); did you mean 'DM365_ISIF_MAX_CLDC'?
davinci_cfg_reg(DM365_VIN_CAM_WEN);
^~~~~~~~~~~~~~~~~--- drivers/staging/media/davinci_vpfe/Makefile | 5 ----- drivers/staging/media/davinci_vpfe/dm365_isif.c | 8 +++----- drivers/staging/media/davinci_vpfe/dm365_isif.h | 2 -- drivers/staging/media/davinci_vpfe/vpfe.h | 2 ++ 4 files changed, 5 insertions(+), 12 deletions(-)
drivers/staging/media/davinci_vpfe/Makefile +0 -5
@@ -4,8 +4,3 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci-vfpe.o davinci-vfpe-objs := \ dm365_isif.o dm365_ipipe_hw.o dm365_ipipe.o \ dm365_resizer.o dm365_ipipeif.o vpfe_mc_capture.o vpfe_video.o - -# Allow building it with COMPILE_TEST on other archs -ifndef CONFIG_ARCH_DAVINCI -ccflags-y += -I $(srctree)/arch/arm/mach-davinci/include/ -endif
drivers/staging/media/davinci_vpfe/dm365_isif.c +3 -5
@@ -17,6 +17,7 @@*/ #include <linux/delay.h> +#include "vpfe.h" #include "dm365_isif.h" #include "vpfe_mc_capture.h"
@@ -1983,6 +1984,7 @@ int vpfe_isif_init(struct vpfe_isif_device *isif, struct platform_device *pdev)struct v4l2_subdev *sd = &isif->subdev;struct media_pad *pads = &isif->pads[0 ];struct media_entity *me = &sd->entity; +struct vpfe_config *cfg = pdev->dev.platform_data;static resource_size_t res_len;struct resource *res;void __iomem *addr;
@@ -2023,11 +2025,7 @@ int vpfe_isif_init(struct vpfe_isif_device *isif, struct platform_device *pdev) } i++; } -davinci_cfg_reg (DM365_VIN_CAM_WEN ); -davinci_cfg_reg (DM365_VIN_CAM_VD ); -davinci_cfg_reg (DM365_VIN_CAM_HD ); -davinci_cfg_reg (DM365_VIN_YIN4_7_EN ); -davinci_cfg_reg (DM365_VIN_YIN0_3_EN ); + cfg->isif_setup_pinmux ();/* queue ops */ isif->video_out.ops = &isif_video_ops;
drivers/staging/media/davinci_vpfe/dm365_isif.h +0 -2
@@ -21,8 +21,6 @@#include <linux/platform_device.h> -#include <mach/mux.h> -#include <media/davinci/vpfe_types.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h>
drivers/staging/media/davinci_vpfe/vpfe.h +2 -0
@@ -74,6 +74,8 @@ struct vpfe_config {char *card_name;/* setup function for the input path */ int (*setup_input)(enum vpfe_subdev_id id); +/* point to dm365_isif_setup_pinmux() */ +void (*isif_setup_pinmux)(void );/* number of clocks */ int num_clocks;/* clocks used for vpfe capture */
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/5] staging: media/davinci_vpfe: fix pinmux setup compilation
Quoted 14 lines · Bartosz Golaszewski
From: Arnd Bergmann <[email protected]>
This fixes the following build error in
davinci_vpfe./git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c: In function '
vpfe_isif_init':
/git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:2031:2: error: implicit declaration of function 'davinci_cfg_reg'; did you mean 'omap_cfg_reg'? [-Werror=implicit-function-declaration]
davinci_cfg_reg(DM365_VIN_CAM_WEN);
^~~~~~~~~~~~~~~
omap_cfg_reg
/git/arm-soc/drivers/staging/media/davinci_vpfe/dm365_isif.c:2031:18: error: 'DM365_VIN_CAM_WEN' undeclared (first use in this function); did you mean 'DM365_ISIF_MAX_CLDC'?davinci_cfg_reg(DM365_VIN_CAM_WEN); ^~~~~~~~~~~~~~~~~
Quoted 8 lines
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/staging/media/davinci_vpfe/Makefile | 5 ----- drivers/staging/media/davinci_vpfe/dm365_isif.c | 8 +++----- drivers/staging/media/davinci_vpfe/dm365_isif.h | 2 -- drivers/staging/media/davinci_vpfe/vpfe.h | 2 ++ 4 files changed, 5 insertions(+), 12 deletions(-)
The driver has just been removed, so you can drop the patch now.
Arnd
PATCH v2 2/5 media: davinci-vpbe: remove obsolete includes
In reply to Bartosz GolaszewskiFrom: Arnd Bergmann <[email protected]>
The driver builds fine without these.
--- drivers/media/platform/davinci/vpbe_display.c | 4 ---- drivers/media/platform/davinci/vpbe_osd.c | 5 ----- drivers/media/platform/davinci/vpbe_venc.c | 5 ----- 3 files changed, 14 deletions(-)
drivers/media/platform/davinci/vpbe_display.c +0 -4
@@ -19,10 +19,6 @@#include <asm/pgtable.h> -#ifdef CONFIG_ARCH_DAVINCI -#include <mach/cputype.h> -#endif -#include <media/v4l2-dev.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h>
drivers/media/platform/davinci/vpbe_osd.c +0 -5
@@ -16,11 +16,6 @@#include <linux/clk.h> #include <linux/slab.h> -#ifdef CONFIG_ARCH_DAVINCI -#include <mach/cputype.h> -#include <mach/hardware.h> -#endif -#include <media/davinci/vpss.h> #include <media/v4l2-device.h> #include <media/davinci/vpbe_types.h>
drivers/media/platform/davinci/vpbe_venc.c +0 -5
@@ -14,11 +14,6 @@#include <linux/videodev2.h> #include <linux/slab.h> -#ifdef CONFIG_ARCH_DAVINCI -#include <mach/hardware.h> -#include <mach/mux.h> -#endif -#include <linux/platform_data/i2c-davinci.h> #include <linux/io.h>
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 2/5] media: davinci-vpbe: remove obsolete includes
Quoted 7 lines · Bartosz Golaszewski
From: Arnd Bergmann <[email protected]>
The driver builds fine without these.
Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>
This patch got merged into the linux-media tree earlier this week.
PATCH v2 3/5 davinci: fix sleep.S build error on ARMv4
In reply to Bartosz GolaszewskiFrom: Arnd Bergmann <[email protected]>
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 + 1 file changed, 1 insertion(+)
arch/arm/mach-davinci/sleep.S +1 -0
@@ -24,6 +24,7 @@ #define DEEPSLEEP_SLEEPENABLE_BIT BIT(31) .text + .arch armv5te /* * Move DaVinci into deep sleep state *
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 4/5 ARM: davinci: support multiplatform build for ARM v5
In reply to Bartosz GolaszewskiFrom: 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 | 17 +++++++++++++---- arch/arm/mach-davinci/Makefile | 2 ++ 4 files changed, 20 insertions(+), 25 deletions(-)
arch/arm/Kconfig +0 -21
@@ -578,27 +578,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 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 REGMAP_MMIO - 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
@@ -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
@@ -129,9 +132,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 +13 -4
@@ -1,11 +1,22 @@ # 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 REGMAP_MMIO + 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 +236,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
@@ -4,6 +4,8 @@ # # +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include + # Common objects obj-y := time.o serial.o usb.o \ common.o sram.o
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 4/5] ARM: davinci: support multiplatform build for ARM v5
Quoted 5 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/Kconfigand 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 byARCH_MULTI_V5. Updatedavinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.Signed-off-by Bartosz Golaszewski <[email protected]>
Thanks,
Sekhar
Re: [PATCH v2 4/5] ARM: davinci: support multiplatform build for ARM v5
Quoted 14 lines · Sekhar Nori
Quoted 12 lines · Bartosz Golaszewski
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/Kconfigand 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 byARCH_MULTI_V5. Updatedavinci_all_defconfig. Explicitly include the mach-specific headers in mach-davinci/Makefile.
Quoted 3 lines
Quoted 1 line
Signed-off-by Bartosz Golaszewski <[email protected]>Acked-by Sekhar Nori <[email protected]>
Ok, pulled both into arm/soc.
Arnd
PATCH v2 5/5 ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build
In reply to Bartosz GolaszewskiFrom: 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
@@ -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 · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build
Quoted 5 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Add all DaVinci boards to
multi_v5_defconfig.Signed-off-by Bartosz Golaszewski <[email protected]>
Thanks,
Sekhar
Quoted 18 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
This series makes DaVinci part of the multiplatform build for ARM v5.
First three patches fix build errors spotted and fixed by Arnd with v1.
The fourth patch adds necessary bits and pieces for davinci to support multiplatform build and the last one actually adds all davinci boards to
multi_v5_defconfig.Tested on da850-lcdk with both
multi_v5as well asdavinci_alldefconfigs.v1 -> v2:
- added patches from Arnd that fix build errors spotted when building random configurations (much appreciated)
- rebased on top of v5.3-rc1
Quoted 8 lines
Arnd Bergmann (3):
staging: media/davinci_vpfe: fix pinmux setup compilation
media: davinci-vpbe: remove obsolete includes
davinci: fixsleep.Sbuild error on ARMv4Bartosz Golaszewski (2):
ARM: davinci: support multiplatform build for ARM v5
ARM:multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build
Thanks a lot for reposting the series!
I wonder how we shoud deal with the dependencies now that the two media patches got merged in the linux-media tree.
It would be tempting to just merge the arch/arm/ changes, but that creates a bisection problem when the vpbe driver is enabled. I don't care about the staging driver really as that one is broken anyway, but including the "media: davinci-vpbe: remove obsolete includes" fix would be better here.
Mauro, any idea for how to handle that? Should we apply an identical patch to the davinci tree, or maybe only have it the ARM tree and you drop it from your tree (I don't know if you have a rule against rebasing). Sorry for not coordinating with Bartosz before I sent the patch again earlier this week.
Arnd
czw., 25 lip 2019 o 16:57 Arnd Bergmann <[email protected]> napisał(a):
Quoted 41 lines · Bartosz Golaszewski
Quoted 18 lines
From: Bartosz Golaszewski <[email protected]>
This series makes DaVinci part of the multiplatform build for ARM v5.
First three patches fix build errors spotted and fixed by Arnd with v1.
The fourth patch adds necessary bits and pieces for davinci to support multiplatform build and the last one actually adds all davinci boards to
multi_v5_defconfig.Tested on da850-lcdk with both
multi_v5as well asdavinci_alldefconfigs.v1 -> v2:
- added patches from Arnd that fix build errors spotted when building random configurations (much appreciated)
- rebased on top of v5.3-rc1Quoted 8 lines
Arnd Bergmann (3):
staging: media/davinci_vpfe: fix pinmux setup compilation
media: davinci-vpbe: remove obsolete includes
davinci: fixsleep.Sbuild error on ARMv4Bartosz Golaszewski (2):
ARM: davinci: support multiplatform build for ARM v5
ARM:multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform buildThanks a lot for reposting the series!
I wonder how we shoud deal with the dependencies now that the two media patches got merged in the linux-media tree.
It would be tempting to just merge the
arch/arm/changes, but that creates a bisection problem when the vpbe driver is enabled. I don't care about the staging driver really as that one is broken anyway, but including the "media: davinci-vpbe: remove obsolete includes" fix would be better here.
Quoted 8 lines
Mauro, any idea for how to handle that? Should we apply an identical patch to the davinci tree, or maybe only have it the ARM tree and you drop it from your tree (I don't know if you have a rule against rebasing). Sorry for not coordinating with Bartosz before I sent the patch again earlier this week.
Arnd
Hi Arnd,
is there any action required from me for this series?
Bart
pon., 5 sie 2019 o 10:31 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 50 lines
czw., 25 lip 2019 o 16:57 Arnd Bergmann <[email protected]> napisał(a):
Quoted 48 lines · Bartosz Golaszewski
Quoted 18 lines
From: Bartosz Golaszewski <[email protected]>
This series makes DaVinci part of the multiplatform build for ARM v5.
First three patches fix build errors spotted and fixed by Arnd with v1.
The fourth patch adds necessary bits and pieces for davinci to support multiplatform build and the last one actually adds all davinci boards to
multi_v5_defconfig.Tested on da850-lcdk with both
multi_v5as well asdavinci_alldefconfigs.v1 -> v2:
- added patches from Arnd that fix build errors spotted when building random configurations (much appreciated)
- rebased on top of v5.3-rc1Quoted 8 lines
Arnd Bergmann (3):
staging: media/davinci_vpfe: fix pinmux setup compilation
media: davinci-vpbe: remove obsolete includes
davinci: fixsleep.Sbuild error on ARMv4Bartosz Golaszewski (2):
ARM: davinci: support multiplatform build for ARM v5
ARM:multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform buildThanks a lot for reposting the series!
I wonder how we shoud deal with the dependencies now that the two media patches got merged in the linux-media tree.
It would be tempting to just merge the
arch/arm/changes, but that creates a bisection problem when the vpbe driver is enabled. I don't care about the staging driver really as that one is broken anyway, but including the "media: davinci-vpbe: remove obsolete includes" fix would be better here.Mauro, any idea for how to handle that? Should we apply an identical patch to the davinci tree, or maybe only have it the ARM tree and you drop it from your tree (I don't know if you have a rule against rebasing). Sorry for not coordinating with Bartosz before I sent the patch again earlier this week.
Quoted 7 lines
Quoted 1 line
Arnd
Hi Arnd,
is there any action required from me for this series?
Bart
Ping.
Quoted 53 lines · Bartosz Golaszewski
pon., 5 sie 2019 o 10:31 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 52 lines
czw., 25 lip 2019 o 16:57 Arnd Bergmann <[email protected]> napisał(a):
Quoted 49 lines · Bartosz Golaszewski
Quoted 18 lines
From: Bartosz Golaszewski <[email protected]>
This series makes DaVinci part of the multiplatform build for ARM v5.
First three patches fix build errors spotted and fixed by Arnd with v1.
The fourth patch adds necessary bits and pieces for davinci to support multiplatform build and the last one actually adds all davinci boards to
multi_v5_defconfig.Tested on da850-lcdk with both
multi_v5as well asdavinci_alldefconfigs.v1 -> v2:
- added patches from Arnd that fix build errors spotted when building random configurations (much appreciated)
- rebased on top of v5.3-rc1Quoted 8 lines
Arnd Bergmann (3):
staging: media/davinci_vpfe: fix pinmux setup compilation
media: davinci-vpbe: remove obsolete includes
davinci: fixsleep.Sbuild error on ARMv4Bartosz Golaszewski (2):
ARM: davinci: support multiplatform build for ARM v5
ARM:multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform buildThanks a lot for reposting the series!
I wonder how we shoud deal with the dependencies now that the two media patches got merged in the linux-media tree.
It would be tempting to just merge the
arch/arm/changes, but that creates a bisection problem when the vpbe driver is enabled. I don't care about the staging driver really as that one is broken anyway, but including the "media: davinci-vpbe: remove obsolete includes" fix would be better here.Mauro, any idea for how to handle that? Should we apply an identical patch to the davinci tree, or maybe only have it the ARM tree and you drop it from your tree (I don't know if you have a rule against rebasing). Sorry for not coordinating with Bartosz before I sent the patch again earlier this week.
Arnd
Quoted 7 lines
Quoted 5 lines
Hi Arnd,
is there any action required from me for this series?
Bart
Ping.
I dont think the multi-platform parts can be merged in v5.4 since we dont have DM365 converted successfully to use clocksource driver yet.
But other parts of the series can be merged and hopefully we resolve that pending issue for v5.5
Thanks,
Sekhar
śr., 28 sie 2019 o 09:44 Sekhar Nori <[email protected]> napisał(a):
Quoted 63 lines · Bartosz Golaszewski
Quoted 53 lines
pon., 5 sie 2019 o 10:31 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 52 lines
czw., 25 lip 2019 o 16:57 Arnd Bergmann <[email protected]> napisał(a):
Quoted 49 lines · Bartosz Golaszewski
Quoted 18 lines
From: Bartosz Golaszewski <[email protected]>
This series makes DaVinci part of the multiplatform build for ARM v5.
First three patches fix build errors spotted and fixed by Arnd with v1.
The fourth patch adds necessary bits and pieces for davinci to support multiplatform build and the last one actually adds all davinci boards to
multi_v5_defconfig.Tested on da850-lcdk with both
multi_v5as well asdavinci_alldefconfigs.v1 -> v2:
- added patches from Arnd that fix build errors spotted when building random configurations (much appreciated)
- rebased on top of v5.3-rc1Quoted 8 lines
Arnd Bergmann (3):
staging: media/davinci_vpfe: fix pinmux setup compilation
media: davinci-vpbe: remove obsolete includes
davinci: fixsleep.Sbuild error on ARMv4Bartosz Golaszewski (2):
ARM: davinci: support multiplatform build for ARM v5
ARM:multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform buildThanks a lot for reposting the series!
I wonder how we shoud deal with the dependencies now that the two media patches got merged in the linux-media tree.
It would be tempting to just merge the
arch/arm/changes, but that creates a bisection problem when the vpbe driver is enabled. I don't care about the staging driver really as that one is broken anyway, but including the "media: davinci-vpbe: remove obsolete includes" fix would be better here.Mauro, any idea for how to handle that? Should we apply an identical patch to the davinci tree, or maybe only have it the ARM tree and you drop it from your tree (I don't know if you have a rule against rebasing). Sorry for not coordinating with Bartosz before I sent the patch again earlier this week.
Arnd
Quoted 7 lines
Quoted 5 lines
Hi Arnd,
is there any action required from me for this series?
Bart
Ping.
Quoted 8 lines
I dont think the multi-platform parts can be merged in v5.4 since we dont have DM365 converted successfully to use clocksource driver yet.
But other parts of the series can be merged and hopefully we resolve that pending issue for v5.5
Thanks,
Sekhar
Actually I tested this without the clocksource conversion and it works
- the previous driver still selects relevant config options. But I think you're right - it's worth picking up all the bug fixes from this series and then merging the rest once dm365 issue is fixed.
Bart
Quoted 6 lines · Bartosz Golaszewski
śr., 28 sie 2019 o 09:44 Sekhar Nori <[email protected]> napisał(a):
Actually I tested this without the clocksource conversion and it works
- the previous driver still selects relevant config options. But I think you're right - it's worth picking up all the bug fixes from this series and then merging the rest once dm365 issue is fixed.
I just had another look at the series and found that the driver fixes (patches 1 and 2) are queued in linux-next, and patch 3 was merged.
If you like, I could put the remaining two patches into the arm/late branch and send that after the media and staging trees are merged into mainline.
Arnd
sob., 7 wrz 2019 o 10:21 Arnd Bergmann <[email protected]> napisał(a):
Quoted 10 lines
Quoted 6 lines · Bartosz Golaszewski
śr., 28 sie 2019 o 09:44 Sekhar Nori <[email protected]> napisał(a):
Actually I tested this without the clocksource conversion and it works
- the previous driver still selects relevant config options. But I think you're right - it's worth picking up all the bug fixes from this series and then merging the rest once dm365 issue is fixed.
Quoted 7 lines
I just had another look at the series and found that the driver fixes (patches 1 and 2) are queued in linux-next, and patch 3 was merged.
If you like, I could put the remaining two patches into the arm/late branch and send that after the media and staging trees are merged into mainline.
Arnd
Sure! Makes sense.
Sekhar: this series doesn't break current mainline (i.e. without the clocksource series) so I think we're safe even for dm365.
Bart
Quoted 17 lines · Bartosz Golaszewski
sob., 7 wrz 2019 o 10:21 Arnd Bergmann <[email protected]> napisał(a):
Quoted 16 lines
Quoted 6 lines · Bartosz Golaszewski
śr., 28 sie 2019 o 09:44 Sekhar Nori <[email protected]> napisał(a):
Actually I tested this without the clocksource conversion and it works
- the previous driver still selects relevant config options. But I think you're right - it's worth picking up all the bug fixes from this series and then merging the rest once dm365 issue is fixed.I just had another look at the series and found that the driver fixes (patches 1 and 2) are queued in linux-next, and patch 3 was merged.
If you like, I could put the remaining two patches into the arm/late branch and send that after the media and staging trees are merged into mainline.
Quoted 6 lines
Quoted 1 line
Arnd
Sure! Makes sense.
Sekhar: this series doesn't break current mainline (i.e. without the clocksource series) so I think we're safe even for dm365.
Yes, I boot/NFS tested the two patches applied on latest linux-next on on all 6 DaVinci SoCs.
I have acked the patches in case Arnd will apply them directly to ARM-SoC.
Thanks,
Sekhar