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.
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 | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
--
2.26.0.rc2
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.
Signed-off-by: Ezequiel Garcia <[email protected]>
---
drivers/staging/media/rkisp1/rkisp1-dev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
index b1b3c058e957..5e7e797aad71 100644
--- a/drivers/staging/media/rkisp1/rkisp1-dev.c
+++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
@@ -454,7 +454,6 @@ 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;
@@ -463,7 +462,7 @@ static int rkisp1_probe(struct platform_device *pdev)
unsigned int i;
int ret, irq;
- match = of_match_node(rkisp1_of_match, node);
+ match = of_match_node(rkisp1_of_match, pdev->dev.of_node);
rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL);
if (!rkisp1)
return -ENOMEM;
--
2.26.0.rc2
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 <[email protected]>
---
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
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 <[email protected]>
---
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
On 2020-04-01 10:37 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.
>
> Signed-off-by: Ezequiel Garcia <[email protected]>
> ---
> drivers/staging/media/rkisp1/rkisp1-dev.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
> index b1b3c058e957..5e7e797aad71 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> @@ -454,7 +454,6 @@ 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;
> @@ -463,7 +462,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> unsigned int i;
> int ret, irq;
>
> - match = of_match_node(rkisp1_of_match, node);
> + match = of_match_node(rkisp1_of_match, pdev->dev.of_node);
FWIW you could clean up "match" too by using of_device_get_match_data().
Robin.
> rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL);
> if (!rkisp1)
> return -ENOMEM;
>
On 4/1/20 6:37 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.
>
> Signed-off-by: Ezequiel Garcia <[email protected]>
Acked-by: Helen Koike <[email protected]>
> ---
> drivers/staging/media/rkisp1/rkisp1-dev.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
> index b1b3c058e957..5e7e797aad71 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> @@ -454,7 +454,6 @@ 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;
> @@ -463,7 +462,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> unsigned int i;
> int ret, irq;
>
> - match = of_match_node(rkisp1_of_match, node);
> + match = of_match_node(rkisp1_of_match, pdev->dev.of_node);
> rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL);
> if (!rkisp1)
> return -ENOMEM;
>
On 4/1/20 6:37 PM, Ezequiel Garcia wrote:
> 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 <[email protected]>
Acked-by: Helen Koike <[email protected]>
> ---
> 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
>
On 4/1/20 6:37 PM, Ezequiel Garcia wrote:
> 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 <[email protected]>
Acked-by: Helen Koike <[email protected]>
> ---
> 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
>
On Thu, 2020-04-02 at 10:47 +0100, Robin Murphy wrote:
> On 2020-04-01 10:37 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.
> >
> > Signed-off-by: Ezequiel Garcia <[email protected]>
> > ---
> > drivers/staging/media/rkisp1/rkisp1-dev.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
> > index b1b3c058e957..5e7e797aad71 100644
> > --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> > +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> > @@ -454,7 +454,6 @@ 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;
> > @@ -463,7 +462,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> > unsigned int i;
> > int ret, irq;
> >
> > - match = of_match_node(rkisp1_of_match, node);
> > + match = of_match_node(rkisp1_of_match, pdev->dev.of_node);
>
> FWIW you could clean up "match" too by using of_device_get_match_data().
>
Ah, that's nicer.
Thanks,
Ezequiel
On Thu, 2020-04-02 at 10:59 -0300, Helen Koike wrote:
>
> On 4/1/20 6:37 PM, Ezequiel Garcia wrote:
> > 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 <[email protected]>
>
> Acked-by: Helen Koike <[email protected]>
>
> > ---
> > 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
After discussing other similar patches, I'm starting to
think this was a bad idea.
Instead, we want to do have (ARCH_ROCKCHIP && OF) || COMPILE_TEST
as the other Rockchip PHYs.
Thanks,
Ezequiel