2020-08-28 13:20:23

by Kévin L'hôpital

Subject: [PATCH v2 2/4] media: sunxi: sun6i-csi: Move the sun6i_csi_dev structure to the common header

Access to the sun6i_csi_dev structure is needed to add the
MIPI CSI2 support.

Signed-off-by: Kévin L'hôpital <[email protected]>
---
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 12 ------------
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 12 ++++++++++++
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index 055eb0b8e396..680fa31f380a 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -29,18 +29,6 @@

#define MODULE_NAME "sun6i-csi"

-struct sun6i_csi_dev {
- struct sun6i_csi csi;
- struct device *dev;
-
- struct regmap *regmap;
- struct clk *clk_mod;
- struct clk *clk_ram;
- struct reset_control *rstc_bus;
-
- int planar_offset[3];
-};
-
static inline struct sun6i_csi_dev *sun6i_csi_to_dev(struct sun6i_csi *csi)
{
return container_of(csi, struct sun6i_csi_dev, csi);
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
index 8b83d15de0d0..c4a87bdab8c3 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
@@ -48,6 +48,18 @@ struct sun6i_csi {
struct sun6i_video video;
};

+struct sun6i_csi_dev {
+ struct sun6i_csi csi;
+ struct device *dev;
+ struct regmap *regmap;
+ struct clk *clk_mod;
+ struct clk *clk_ram;
+ struct clk *clk_mipi;
+ struct clk *clk_misc;
+ struct reset_control *rstc_bus;
+ int planar_offset[3];
+};
+
/**
* sun6i_csi_is_format_supported() - check if the format supported by csi
* @csi: pointer to the csi
--
2.17.1

2020-08-31 10:52:37

by Sakari Ailus

Subject: Re: [PATCH v2 2/4] media: sunxi: sun6i-csi: Move the sun6i_csi_dev structure to the common header

Hi K?vin,

On Fri, Aug 28, 2020 at 03:17:34PM +0200, K?vin L'h?pital wrote:
> Access to the sun6i_csi_dev structure is needed to add the
> MIPI CSI2 support.
>
> Signed-off-by: K?vin L'h?pital <[email protected]>
> ---
> drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 12 ------------
> drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 12 ++++++++++++
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> index 055eb0b8e396..680fa31f380a 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> @@ -29,18 +29,6 @@
>
> #define MODULE_NAME "sun6i-csi"
>
> -struct sun6i_csi_dev {
> - struct sun6i_csi csi;
> - struct device *dev;
> -
> - struct regmap *regmap;
> - struct clk *clk_mod;
> - struct clk *clk_ram;
> - struct reset_control *rstc_bus;
> -
> - int planar_offset[3];
> -};
> -
> static inline struct sun6i_csi_dev *sun6i_csi_to_dev(struct sun6i_csi *csi)
> {
> return container_of(csi, struct sun6i_csi_dev, csi);
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> index 8b83d15de0d0..c4a87bdab8c3 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> @@ -48,6 +48,18 @@ struct sun6i_csi {
> struct sun6i_video video;
> };
>
> +struct sun6i_csi_dev {
> + struct sun6i_csi csi;
> + struct device *dev;
> + struct regmap *regmap;
> + struct clk *clk_mod;
> + struct clk *clk_ram;
> + struct clk *clk_mipi;
> + struct clk *clk_misc;

This patch adds two more clocks, please add them when you need them. I
think you could also squash the patch to another one that requires the
struct in the header.

> + struct reset_control *rstc_bus;
> + int planar_offset[3];
> +};
> +
> /**
> * sun6i_csi_is_format_supported() - check if the format supported by csi
> * @csi: pointer to the csi

--
Sakari Ailus