Skip to contentSkip to conversation

Remove references to non-existent PLAT_S5P symbol

PATCH New Sylwester Nawrocki 2 participants 3 messages Oct 6, 2014

Subsystems (2)
Media (V4L/DVB) Arm Samsung Exynos
lore
Share & tools
lore

Sylwester Nawrocki

author
#0 lore raw

PATCH 1/1 Remove references to non-existent PLAT_S5P symbol

The PLAT_S5P Kconfig symbol was removed in commit d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code"). However, there are still some references to that symbol left, fix that by substituting them with ARCH_S5PV210.

Reported-by Paul Bolle <[email protected]>
Signed-off-by Sylwester Nawrocki <[email protected]>
---
 drivers/media/platform/Kconfig            |    6 +++---
 drivers/media/platform/exynos4-is/Kconfig |    4 ++--
 drivers/media/platform/s5p-tv/Kconfig     |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/media/platform/Kconfig +3 -3
index bee9074..3aac88f 100644
@@ -166,7 +166,7 @@ config VIDEO_MEM2MEM_DEINTERLACE
 config VIDEO_SAMSUNG_S5P_G2D
 	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
 	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV

@@ -178,7 +178,7 @@ config VIDEO_SAMSUNG_S5P_G2D
 config VIDEO_SAMSUNG_S5P_JPEG
 	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
 	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV

@@ -189,7 +189,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
 config VIDEO_SAMSUNG_S5P_MFC
 	tristate "Samsung S5P MFC Video Codec"
 	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG
 	default n
drivers/media/platform/exynos4-is/Kconfig +2 -2
index 77c9512..b3b270a 100644
@@ -2,7 +2,7 @@
 config VIDEO_SAMSUNG_EXYNOS4_IS
 	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
 	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-	depends on (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on OF && COMMON_CLK
 	help
 	  Say Y here to enable camera host interface devices for

@@ -57,7 +57,7 @@ endif
 
 config VIDEO_EXYNOS4_FIMC_IS
 	tristate "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver"
-	depends on HAS_DMA
+	depends on HAS_DMA && !ARCH_S5PV210
 	select VIDEOBUF2_DMA_CONTIG
 	depends on OF
 	select FW_LOADER
drivers/media/platform/s5p-tv/Kconfig +1 -1
index a9d56f8..beb180e 100644
@@ -9,7 +9,7 @@
 config VIDEO_SAMSUNG_S5P_TV
 	bool "Samsung TV driver for S5P platform"
 	depends on PM_RUNTIME
-	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	default n
 	---help---
 	  Say Y here to enable selecting the TV output devices for
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 Remove references to non-existent PLAT_S5P symbol

Quoted 14 lines · Sylwester Nawrocki
drivers/media/platform/exynos4-is/Kconfig +1 -1
index 77c9512..b3b270a 100644
@@ -2,7 +2,7 @@
 config VIDEO_SAMSUNG_EXYNOS4_IS
 	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
 	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-	depends on (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on OF && COMMON_CLK
 	help
 	  Say Y here to enable camera host interface devices for

drivers/media/platform/exynos4-is/Kconfig endif · line 60

Quoted 5 lines
drivers/media/platform/exynos4-is/Kconfig +1 -1
@@ -57,7 +57,7 @@ endif
 
 config VIDEO_EXYNOS4_FIMC_IS
 	tristate "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver"
-	depends on HAS_DMA
+	depends on HAS_DMA && !ARCH_S5PV210

Hmm, does this change really do the intended thing?

Since both S5PV210 and Exynos are multiplatform-aware, now whenever ARCH_S5PV210 is enabled, it isn't possible to enable VIDEO_EXYNOS4_FIMC_IS, even though ARCH_EXYNOS can be enabled as well at the same time.

Best regards,
Tomasz

author
#2 lore raw

PATCH 1/1 Remove references to non-existent PLAT_S5P symbol

Quoted 23 lines · Tomasz Figa
Quoted 14 lines · Sylwester Nawrocki
drivers/media/platform/exynos4-is/Kconfig +1 -1
index 77c9512..b3b270a 100644
@@ -2,7 +2,7 @@
 config VIDEO_SAMSUNG_EXYNOS4_IS
 	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
 	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-	depends on (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on OF && COMMON_CLK
 	help
 	  Say Y here to enable camera host interface devices for

drivers/media/platform/exynos4-is/Kconfig endif · line 60

Quoted 5 lines
drivers/media/platform/exynos4-is/Kconfig +1 -1
@@ -57,7 +57,7 @@ endif
 
 config VIDEO_EXYNOS4_FIMC_IS
 	tristate "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver"
-	depends on HAS_DMA
+	depends on HAS_DMA && !ARCH_S5PV210

Hmm, does this change really do the intended thing?

Quoted 4 lines

Since both S5PV210 and Exynos are multiplatform-aware, now whenever ARCH_S5PV210 is enabled, it isn't possible to enable VIDEO_EXYNOS4_FIMC_IS, even though ARCH_EXYNOS can be enabled as well at the same time.

Sorry, I missed S5PV210 supports ARCH_MULTIPLATFORM, let me resend with that line removed. Thanks for pointing out.

--
Regards,
Sylwester