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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B2159C433F5 for ; Tue, 15 Mar 2022 19:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zEEhJnpUoM+5Psi+/pug5jbSQBNP3rpPBF2VxOUfaDA=; b=Zekbepg9rLp6lt EKMW8nN1/I4grnEzzCOL5gA4brknGXZCHs5hRSne54vtphzDKnhzmhdpN9kfpYlPVaYHYYcazQSjI UZcUEWZcHh83dMZkmhxPmwRkVmzdsd2uSjCl2fgw2wSiBRX2Gb4Wug0bkcI8KjKNDeZatXQf72yJc IrpPFjV3yVkwKK8ue5vZ1QCeiUKW26qXMr385L7HU1woM15ORiPjikTYIVJ7XMf4LKjEfd7ifoqPc VHx0cH6PbLMD+FLgM9k7dG6OQ60fbqNtP6DQ8PEOpHujkoDH0taSV8TC05AwU9UV1AvOpp63pkz9p 5MCwuS3BJmRkzI4CqtqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUCt5-00AS8P-Tw; Tue, 15 Mar 2022 19:31:20 +0000 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUCt1-00AS7j-Ud for linux-arm-kernel@lists.infradead.org; Tue, 15 Mar 2022 19:31:17 +0000 Received: by mail-ej1-x636.google.com with SMTP id a8so43716688ejc.8 for ; Tue, 15 Mar 2022 12:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SF7IgGhp+9o85mKWfP8kscVz0pSLrrsqPcAQ8jalhmo=; b=WRpYLEGOnlkzefN2BJ6kRoYK5vLtDps1w7cAmdnQ2XhNc+I/yb6PAibQfQxE3nYR2C Xet5ex/Qp06CJoetB4NueLsEvLG7AIfT+T7tyifST8gPlBgixp5z1pO7ComuN7gMd6Vq 7YbPFkTYKDTmav4ThAte4typ32UhuO7TNUEYbUURaaT4ZYl2ghkGCzDUJE6q+s9n2I9m VynNMZcKhSL8rHhIMqPWbENJvY/8mDo1MGjE6g1cZMSwISbmX2CaJBndMLO3uc5c+iYf BaEoSruOBBGawn+H6iTUjXgArp8pkhWGRlKGeWryMXEawZOOp8Xsn5U9jGiP945nwuXN jRMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SF7IgGhp+9o85mKWfP8kscVz0pSLrrsqPcAQ8jalhmo=; b=WmafMgr+huj0CA1I83BYUkp+Kv7JQVjKPNbZIHoROktewMKCgfKD7gEn2iGatjMTnS 7PMjYySnn5sKc6tAAgTgE7VF37pcl/Hrxg+WYUIMd8aqFqfuWosxKcyhBUTcB6xkFCRr Wu+IT4ggHObkguIMN70oIPrThOsCSA9crUl+1FhY9qSRGtoHWytu7N5uyd912eHx06+G uJQYrrmu+ZgBzILQ90kchVo2KsAZb2ECGWZ3izj0ttFsDaTjtLeVtpUgII+co3D1/7n6 mMpPFJCVkVRqDnRTdmd26NmRVRAXaxJUKdd6/WaNtYA2YzGLiI1CxTD1ZuF+xv43LTLq VQ0w== X-Gm-Message-State: AOAM532zYf5k8UuKA1yKRFeaDYjLmxLWyFnYWcBKSYID8oTHVA/ZaRWF ViJl/gwvo4EJ4ugVGynjB3A= X-Google-Smtp-Source: ABdhPJxNjnwRnV6JCivFveTPgjxD+iRyjMCErU60znyaQ6x5BHWiiYu3hDzvwmfqsCb7mT4kodKOBQ== X-Received: by 2002:a17:906:3ec9:b0:6bb:2eb9:84f with SMTP id d9-20020a1709063ec900b006bb2eb9084fmr23892050ejj.86.1647372674681; Tue, 15 Mar 2022 12:31:14 -0700 (PDT) Received: from kista.localnet (cpe-86-58-32-107.static.triera.net. [86.58.32.107]) by smtp.gmail.com with ESMTPSA id q16-20020a170906145000b006bdaf981589sm8507976ejc.81.2022.03.15.12.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 12:31:14 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Paul Kocialkowski Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: Re: [PATCH v3 06/46] media: sun6i-csi: Define and use variant to get module clock rate Date: Tue, 15 Mar 2022 20:31:13 +0100 Message-ID: <2060330.OBFZWjSADL@kista> In-Reply-To: <20220311143532.265091-7-paul.kocialkowski@bootlin.com> References: <20220311143532.265091-1-paul.kocialkowski@bootlin.com> <20220311143532.265091-7-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220315_123116_039593_1572CFCE X-CRM114-Status: GOOD ( 24.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne petek, 11. marec 2022 ob 15:34:52 CET je Paul Kocialkowski napisal(a): > Introduce a proper variant structure with the module clock rate > instead of hardcoding it with a manual check on the compatible. > > Signed-off-by: Paul Kocialkowski > --- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 48 ++++++++++++++----- > .../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 ++ > 2 files changed, 40 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 2355088fdc37..4a0d08e0ac25 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -811,11 +811,17 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, > struct platform_device *platform_dev) > { > struct device *dev = csi_dev->dev; > - unsigned long clk_mod_rate; > + const struct sun6i_csi_variant *variant; Ideally, this should be sorted from longest to shortest. > void __iomem *io_base; > int ret; > int irq; > > + /* Variant */ I don't think this comment is very useful (nor one below for that matter.) Please remove it. With that: Reviewed-by: Jernej Skrabec Best regards, Jernej > + > + variant = of_device_get_match_data(dev); > + if (!variant) > + return -EINVAL; > + > /* Registers */ > > io_base = devm_platform_ioremap_resource(platform_dev, 0); > @@ -849,12 +855,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, > return PTR_ERR(csi_dev->clk_ram); > } > > - if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64- csi")) > - clk_mod_rate = 300000000; > - else > - clk_mod_rate = 297000000; > - > - ret = clk_set_rate_exclusive(csi_dev->clk_mod, clk_mod_rate); > + ret = clk_set_rate_exclusive(csi_dev->clk_mod, variant- >clk_mod_rate); > if (ret) { > dev_err(dev, "failed to set mod clock rate\n"); > return ret; > @@ -937,12 +938,35 @@ static int sun6i_csi_remove(struct platform_device *pdev) > return 0; > } > > +static const struct sun6i_csi_variant sun6i_a31_csi_variant = { > + .clk_mod_rate = 297000000, > +}; > + > +static const struct sun6i_csi_variant sun50i_a64_csi_variant = { > + .clk_mod_rate = 300000000, > +}; > + > static const struct of_device_id sun6i_csi_of_match[] = { > - { .compatible = "allwinner,sun6i-a31-csi", }, > - { .compatible = "allwinner,sun8i-a83t-csi", }, > - { .compatible = "allwinner,sun8i-h3-csi", }, > - { .compatible = "allwinner,sun8i-v3s-csi", }, > - { .compatible = "allwinner,sun50i-a64-csi", }, > + { > + .compatible = "allwinner,sun6i-a31-csi", > + .data = &sun6i_a31_csi_variant, > + }, > + { > + .compatible = "allwinner,sun8i-a83t-csi", > + .data = &sun6i_a31_csi_variant, > + }, > + { > + .compatible = "allwinner,sun8i-h3-csi", > + .data = &sun6i_a31_csi_variant, > + }, > + { > + .compatible = "allwinner,sun8i-v3s-csi", > + .data = &sun6i_a31_csi_variant, > + }, > + { > + .compatible = "allwinner,sun50i-a64-csi", > + .data = &sun50i_a64_csi_variant, > + }, > {}, > }; > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/ media/platform/sunxi/sun6i-csi/sun6i_csi.h > index 356661b413f8..3c4a3af6b897 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h > @@ -59,6 +59,10 @@ struct sun6i_csi_device { > int planar_offset[3]; > }; > > +struct sun6i_csi_variant { > + unsigned long clk_mod_rate; > +}; > + > /** > * sun6i_csi_is_format_supported() - check if the format supported by csi > * @csi: pointer to the csi > -- > 2.35.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel