From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: Re: [PATCH v7 2/5] media: sun6i: Add A64 CSI block support Date: Fri, 25 Jan 2019 16:42:45 +0100 Message-ID: <20190125154245.5wx2mwhzsjeaahi3@flea> References: <20190124180736.28408-1-jagan@amarulasolutions.com> <20190124180736.28408-3-jagan@amarulasolutions.com> Reply-To: maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tnklj4wmwb3jn6kf" Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Content-Disposition: inline In-Reply-To: <20190124180736.28408-3-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Jagan Teki Cc: Yong Deng , Mauro Carvalho Chehab , Chen-Yu Tsai , Rob Herring , Mark Rutland , linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Michael Trimarchi , linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org List-Id: devicetree@vger.kernel.org --tnklj4wmwb3jn6kf Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline On Thu, Jan 24, 2019 at 11:37:33PM +0530, Jagan Teki wrote: > CSI block in Allwinner A64 has similar features as like in H3, > but the default CSI_SCLK rate cannot work properly to drive the > connected sensor interface. > > The tested mod cock rate is 300 MHz and BSP vfe media driver is also > using the same rate. Unfortunately there is no valid information about > clock rate in manual or any other sources except the BSP driver. so more > faith on BSP code, because same has tested in mainline. > > So, add support for A64 CSI block by setting updated mod clock rate. > > Signed-off-by: Jagan Teki > --- > drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > index ee882b66a5ea..cd2d33242c17 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -154,6 +155,7 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi, > int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable) > { > struct sun6i_csi_dev *sdev = sun6i_csi_to_dev(csi); > + struct device *dev = sdev->dev; > struct regmap *regmap = sdev->regmap; > int ret; > > @@ -161,15 +163,20 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable) > regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, 0); > > clk_disable_unprepare(sdev->clk_ram); > + if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi")) > + clk_rate_exclusive_put(sdev->clk_mod); > clk_disable_unprepare(sdev->clk_mod); > reset_control_assert(sdev->rstc_bus); > return 0; > } > > + if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi")) > + clk_set_rate_exclusive(sdev->clk_mod, 300000000); > + > ret = clk_prepare_enable(sdev->clk_mod); > if (ret) { > dev_err(sdev->dev, "Enable csi clk err %d\n", ret); > - return ret; > + goto clk_mod_put; > } > > ret = clk_prepare_enable(sdev->clk_ram); > @@ -192,6 +199,9 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable) > clk_disable_unprepare(sdev->clk_ram); > clk_mod_disable: > clk_disable_unprepare(sdev->clk_mod); > +clk_mod_put: > + if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi")) > + clk_rate_exclusive_put(sdev->clk_mod); > return ret; The sequence in the error path and in the disable path aren't the same, why? Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com --tnklj4wmwb3jn6kf--