* [PATCH] [media] Remove references to non-existent PLAT_S5P symbol
@ 2014-10-06 15:39 Sylwester Nawrocki
2014-10-06 15:52 ` Tomasz Figa
0 siblings, 1 reply; 3+ messages in thread
From: Sylwester Nawrocki @ 2014-10-06 15:39 UTC (permalink / raw)
To: linux-arm-kernel
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 <pebolle@tiscali.nl>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
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(-)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index bee9074..3aac88f 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -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
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index 77c9512..b3b270a 100644
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -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
diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig
index a9d56f8..beb180e 100644
--- a/drivers/media/platform/s5p-tv/Kconfig
+++ b/drivers/media/platform/s5p-tv/Kconfig
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] [media] Remove references to non-existent PLAT_S5P symbol
2014-10-06 15:39 [PATCH] [media] Remove references to non-existent PLAT_S5P symbol Sylwester Nawrocki
@ 2014-10-06 15:52 ` Tomasz Figa
2014-10-06 16:06 ` Sylwester Nawrocki
0 siblings, 1 reply; 3+ messages in thread
From: Tomasz Figa @ 2014-10-06 15:52 UTC (permalink / raw)
To: linux-arm-kernel
On 06.10.2014 17:39, Sylwester Nawrocki wrote:
> diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
> index 77c9512..b3b270a 100644
> --- a/drivers/media/platform/exynos4-is/Kconfig
> +++ b/drivers/media/platform/exynos4-is/Kconfig
> @@ -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
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] [media] Remove references to non-existent PLAT_S5P symbol
2014-10-06 15:52 ` Tomasz Figa
@ 2014-10-06 16:06 ` Sylwester Nawrocki
0 siblings, 0 replies; 3+ messages in thread
From: Sylwester Nawrocki @ 2014-10-06 16:06 UTC (permalink / raw)
To: linux-arm-kernel
On 06/10/14 17:52, Tomasz Figa wrote:
> On 06.10.2014 17:39, Sylwester Nawrocki wrote:
>> diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
>> index 77c9512..b3b270a 100644
>> --- a/drivers/media/platform/exynos4-is/Kconfig
>> +++ b/drivers/media/platform/exynos4-is/Kconfig
>> @@ -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
>
> 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.
Sorry, I missed S5PV210 supports ARCH_MULTIPLATFORM, let me resend
with that line removed. Thanks for pointing out.
--
Regards,
Sylwester
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-06 16:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-06 15:39 [PATCH] [media] Remove references to non-existent PLAT_S5P symbol Sylwester Nawrocki
2014-10-06 15:52 ` Tomasz Figa
2014-10-06 16:06 ` Sylwester Nawrocki
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).