From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4E62C2D0DC for ; Thu, 2 Jan 2020 11:33:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D78B21655 for ; Thu, 2 Jan 2020 11:33:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728213AbgABLdZ (ORCPT ); Thu, 2 Jan 2020 06:33:25 -0500 Received: from mga04.intel.com ([192.55.52.120]:22863 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726647AbgABLdY (ORCPT ); Thu, 2 Jan 2020 06:33:24 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jan 2020 03:33:24 -0800 X-IronPort-AV: E=Sophos;i="5.69,386,1571727600"; d="scan'208";a="421110783" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jan 2020 03:33:20 -0800 Received: by paasikivi.fi.intel.com (Postfix, from userid 1000) id D5A6720705; Thu, 2 Jan 2020 13:33:19 +0200 (EET) Date: Thu, 2 Jan 2020 13:33:19 +0200 From: Sakari Ailus To: Chen-Yu Tsai Cc: Maxime Ripard , Mauro Carvalho Chehab , Rob Herring , Mark Rutland , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chen-Yu Tsai Subject: Re: [PATCH 06/14] media: sun4i-csi: Add support for A10 CSI1 camera sensor interface Message-ID: <20200102113319.GJ19828@paasikivi.fi.intel.com> References: <20191215165924.28314-1-wens@kernel.org> <20191215165924.28314-7-wens@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191215165924.28314-7-wens@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Chen-Yu, Thanks for the patchset. On Mon, Dec 16, 2019 at 12:59:16AM +0800, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai > > The A10/A20 Allwinner SoCs have two camera sensor interface blocks, > named CSI0 and CSI1. The two have the same register layouts with > slightly different features: > > - CSI0 has an image signal processor (ISP); CSI1 doesn't > > - CSI0 can support up to four separate channels under CCIR656; > CSI1 can only support one > > - CSI0 can support up to 16-bit wide bus with YUV422; > CSI1 can support up to 24-bit wide bus with YUV444 > > For now the driver doesn't support wide busses, nor CCIR656. So the > only relevant difference is whether a clock needs to be taken and > enabled for the ISP. > > Add structs to record the differences, tie them to the compatible > strings, and deal with the ISP clock. Support for the new CSI1 > hardware block is added as well. > > Signed-off-by: Chen-Yu Tsai > --- > .../platform/sunxi/sun4i-csi/sun4i_csi.c | 35 ++++++++++++++++--- > .../platform/sunxi/sun4i-csi/sun4i_csi.h | 2 ++ > 2 files changed, 32 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c > index b8b07c1de2a8..be2466930a49 100644 > --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c > +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c > @@ -29,6 +29,12 @@ > > #include "sun4i_csi.h" > > +struct sun4i_csi_traits { > + unsigned int channels; > + unsigned int max_width; > + bool has_isp; > +}; > + > static const struct media_entity_operations sun4i_csi_video_entity_ops = { > .link_validate = v4l2_subdev_link_validate, > }; > @@ -156,6 +162,10 @@ static int sun4i_csi_probe(struct platform_device *pdev) > subdev = &csi->subdev; > vdev = &csi->vdev; > > + csi->traits = of_device_get_match_data(&pdev->dev); > + if (!csi->traits) > + return -EINVAL; > + > /* > * On Allwinner SoCs, some high memory bandwidth devices do DMA > * directly over the memory bus (called MBUS), instead of the > @@ -199,10 +209,12 @@ static int sun4i_csi_probe(struct platform_device *pdev) > return PTR_ERR(csi->bus_clk); > } > > - csi->isp_clk = devm_clk_get(&pdev->dev, "isp"); > - if (IS_ERR(csi->isp_clk)) { > - dev_err(&pdev->dev, "Couldn't get our ISP clock\n"); > - return PTR_ERR(csi->isp_clk); > + if (csi->traits->has_isp) { > + csi->isp_clk = devm_clk_get(&pdev->dev, "isp"); > + if (IS_ERR(csi->isp_clk)) { > + dev_err(&pdev->dev, "Couldn't get our ISP clock\n"); > + return PTR_ERR(csi->isp_clk); > + } > } > > csi->ram_clk = devm_clk_get(&pdev->dev, "ram"); > @@ -280,8 +292,21 @@ static int sun4i_csi_remove(struct platform_device *pdev) > return 0; > } > > +struct sun4i_csi_traits sun4i_a10_csi1_traits = { > + .channels = 1, > + .max_width = 24, > + .has_isp = false, > +}; > + > +struct sun4i_csi_traits sun7i_a20_csi0_traits = { These two should be static const, right? > + .channels = 4, > + .max_width = 16, > + .has_isp = true, > +}; > + > static const struct of_device_id sun4i_csi_of_match[] = { > - { .compatible = "allwinner,sun7i-a20-csi0" }, > + { .compatible = "allwinner,sun4i-a10-csi1", .data = &sun4i_a10_csi1_traits }, > + { .compatible = "allwinner,sun7i-a20-csi0", .data = &sun7i_a20_csi0_traits }, > { /* Sentinel */ } > }; > MODULE_DEVICE_TABLE(of, sun4i_csi_of_match); > diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h > index 88d39b3554c4..0f67ff652c2e 100644 > --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h > +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h > @@ -108,6 +108,8 @@ struct sun4i_csi { > /* Device resources */ > struct device *dev; > > + const struct sun4i_csi_traits *traits; > + > void __iomem *regs; > struct clk *bus_clk; > struct clk *isp_clk; -- Kind regards, Sakari Ailus