* [PATCH v2 0/3] Rockchip ISP1 minor fixes
@ 2020-04-02 19:45 Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 1/3] rkisp1: Get rid of unused variable warning Ezequiel Garcia
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ezequiel Garcia @ 2020-04-02 19:45 UTC (permalink / raw)
To: linux-media, linux-rockchip, linux-kernel
Cc: kernel, Hans Verkuil, Helen Koike, Robin Murphy, Ezequiel Garcia
A small series of minor fixes I stumbled upon while
doing compile testing.
Patch 1 gets rid of an 'unused variable' warning, triggered
by building without CONFIG_OF.
Patches 2 and 3 cleanup the dependency of phy-rockchip-dphy-rx0
and rkisp1 drivers.
Compile-tested only.
v2:
* Use of_device_get_match_data as suggested by Robin.
Ezequiel Garcia (3):
rkisp1: Get rid of unused variable warning
phy-rockchip-dphy-rx0: Drop unneeded CONFIG_OF dependency
rkisp1: Fix wrong PHY config dependency
drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig | 2 +-
drivers/staging/media/rkisp1/Kconfig | 2 +-
drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
--
2.26.0.rc2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/3] rkisp1: Get rid of unused variable warning
2020-04-02 19:45 [PATCH v2 0/3] Rockchip ISP1 minor fixes Ezequiel Garcia
@ 2020-04-02 19:45 ` Ezequiel Garcia
2020-04-02 19:51 ` Helen Koike
2020-04-02 19:45 ` [PATCH v2 2/3] phy-rockchip-dphy-rx0: Drop unneeded CONFIG_OF dependency Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 3/3] rkisp1: Fix wrong PHY config dependency Ezequiel Garcia
2 siblings, 1 reply; 5+ messages in thread
From: Ezequiel Garcia @ 2020-04-02 19:45 UTC (permalink / raw)
To: linux-media, linux-rockchip, linux-kernel
Cc: kernel, Hans Verkuil, Helen Koike, Robin Murphy, Ezequiel Garcia
If CONFIG_OF is not selected, the compiler will complain:
drivers/staging/media/rkisp1/rkisp1-dev.c: In function ‘rkisp1_probe’:
drivers/staging/media/rkisp1/rkisp1-dev.c:457:22: warning: unused variable ‘node’ [-Wunused-variable]
457 | struct device_node *node = pdev->dev.of_node;
Rework the code slightly and make the compiler happy.
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
index b1b3c058e957..3f6285709352 100644
--- a/drivers/staging/media/rkisp1/rkisp1-dev.c
+++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
@@ -454,16 +454,17 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
static int rkisp1_probe(struct platform_device *pdev)
{
- struct device_node *node = pdev->dev.of_node;
const struct rkisp1_match_data *clk_data;
- const struct of_device_id *match;
struct device *dev = &pdev->dev;
struct rkisp1_device *rkisp1;
struct v4l2_device *v4l2_dev;
unsigned int i;
int ret, irq;
- match = of_match_node(rkisp1_of_match, node);
+ clk_data = of_device_get_match_data(&pdev->dev);
+ if (!clk_data)
+ return -ENODEV;
+
rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL);
if (!rkisp1)
return -ENOMEM;
@@ -487,7 +488,6 @@ static int rkisp1_probe(struct platform_device *pdev)
}
rkisp1->irq = irq;
- clk_data = match->data;
for (i = 0; i < clk_data->size; i++)
rkisp1->clks[i].id = clk_data->clks[i];
--
2.26.0.rc2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/3] phy-rockchip-dphy-rx0: Drop unneeded CONFIG_OF dependency
2020-04-02 19:45 [PATCH v2 0/3] Rockchip ISP1 minor fixes Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 1/3] rkisp1: Get rid of unused variable warning Ezequiel Garcia
@ 2020-04-02 19:45 ` Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 3/3] rkisp1: Fix wrong PHY config dependency Ezequiel Garcia
2 siblings, 0 replies; 5+ messages in thread
From: Ezequiel Garcia @ 2020-04-02 19:45 UTC (permalink / raw)
To: linux-media, linux-rockchip, linux-kernel
Cc: kernel, Hans Verkuil, Helen Koike, Robin Murphy, Ezequiel Garcia
The driver is perfectly capable of being built without CONFIG_OF.
Remove this dependency, which is useful for compile-only tests.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
---
drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig b/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig
index bd0147624de1..fb74df829371 100644
--- a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig
+++ b/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig
@@ -2,7 +2,7 @@
config PHY_ROCKCHIP_DPHY_RX0
tristate "Rockchip MIPI Synopsys DPHY RX0 driver"
- depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
+ depends on ARCH_ROCKCHIP || COMPILE_TEST
select GENERIC_PHY_MIPI_DPHY
select GENERIC_PHY
help
--
2.26.0.rc2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/3] rkisp1: Fix wrong PHY config dependency
2020-04-02 19:45 [PATCH v2 0/3] Rockchip ISP1 minor fixes Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 1/3] rkisp1: Get rid of unused variable warning Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 2/3] phy-rockchip-dphy-rx0: Drop unneeded CONFIG_OF dependency Ezequiel Garcia
@ 2020-04-02 19:45 ` Ezequiel Garcia
2 siblings, 0 replies; 5+ messages in thread
From: Ezequiel Garcia @ 2020-04-02 19:45 UTC (permalink / raw)
To: linux-media, linux-rockchip, linux-kernel
Cc: kernel, Hans Verkuil, Helen Koike, Robin Murphy, Ezequiel Garcia
Instead of depending on the Rockchip PHY driver the ISP driver
should really depend on CONFIG_GENERIC_PHY_MIPI_DPHY,
given all it needs is the phy_mipi_dphy_get_default_config() symbol.
Fix it.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
---
drivers/staging/media/rkisp1/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/rkisp1/Kconfig b/drivers/staging/media/rkisp1/Kconfig
index b859a493caba..e3ba6826fbb0 100644
--- a/drivers/staging/media/rkisp1/Kconfig
+++ b/drivers/staging/media/rkisp1/Kconfig
@@ -7,7 +7,7 @@ config VIDEO_ROCKCHIP_ISP1
select VIDEOBUF2_DMA_CONTIG
select VIDEOBUF2_VMALLOC
select V4L2_FWNODE
- select PHY_ROCKCHIP_DPHY_RX0
+ select GENERIC_PHY_MIPI_DPHY
default n
help
Enable this to support the Image Signal Processing (ISP) module
--
2.26.0.rc2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] rkisp1: Get rid of unused variable warning
2020-04-02 19:45 ` [PATCH v2 1/3] rkisp1: Get rid of unused variable warning Ezequiel Garcia
@ 2020-04-02 19:51 ` Helen Koike
0 siblings, 0 replies; 5+ messages in thread
From: Helen Koike @ 2020-04-02 19:51 UTC (permalink / raw)
To: Ezequiel Garcia, linux-media, linux-rockchip, linux-kernel
Cc: kernel, Hans Verkuil, Robin Murphy
On 4/2/20 4:45 PM, Ezequiel Garcia wrote:
> If CONFIG_OF is not selected, the compiler will complain:
>
> drivers/staging/media/rkisp1/rkisp1-dev.c: In function ‘rkisp1_probe’:
> drivers/staging/media/rkisp1/rkisp1-dev.c:457:22: warning: unused variable ‘node’ [-Wunused-variable]
> 457 | struct device_node *node = pdev->dev.of_node;
>
> Rework the code slightly and make the compiler happy.
>
> Suggested-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
> index b1b3c058e957..3f6285709352 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> @@ -454,16 +454,17 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
>
> static int rkisp1_probe(struct platform_device *pdev)
> {
> - struct device_node *node = pdev->dev.of_node;
> const struct rkisp1_match_data *clk_data;
> - const struct of_device_id *match;
> struct device *dev = &pdev->dev;
> struct rkisp1_device *rkisp1;
> struct v4l2_device *v4l2_dev;
> unsigned int i;
> int ret, irq;
>
> - match = of_match_node(rkisp1_of_match, node);
> + clk_data = of_device_get_match_data(&pdev->dev);
> + if (!clk_data)
> + return -ENODEV;
> +
> rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL);
> if (!rkisp1)
> return -ENOMEM;
> @@ -487,7 +488,6 @@ static int rkisp1_probe(struct platform_device *pdev)
> }
>
> rkisp1->irq = irq;
> - clk_data = match->data;
>
> for (i = 0; i < clk_data->size; i++)
> rkisp1->clks[i].id = clk_data->clks[i];
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-02 19:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-02 19:45 [PATCH v2 0/3] Rockchip ISP1 minor fixes Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 1/3] rkisp1: Get rid of unused variable warning Ezequiel Garcia
2020-04-02 19:51 ` Helen Koike
2020-04-02 19:45 ` [PATCH v2 2/3] phy-rockchip-dphy-rx0: Drop unneeded CONFIG_OF dependency Ezequiel Garcia
2020-04-02 19:45 ` [PATCH v2 3/3] rkisp1: Fix wrong PHY config dependency Ezequiel Garcia
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).