Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Michael Riesch <michael.riesch@wolfvision.net>
To:     linux-phy@lists.infradead.org, devicetree@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     Kishon Vijay Abraham I <kishon@ti.com>,
        Vinod Koul <vkoul@kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Heiko Stuebner <heiko@sntech.de>,
        Peter Geis <pgwipeout@gmail.com>,
        Michael Riesch <michael.riesch@wolfvision.net>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Nicolas Frattaroli <frattaroli.nicolas@gmail.com>,
        Liang Chen <cl@rock-chips.com>
Subject: [PATCH 2/3] phy: rockchip: add support for the rk356x variant to rockchip-inno-csidphy
Date:   Wed, 20 Jul 2022 11:15:26 +0200
Message-Id: <20220720091527.1270365-3-michael.riesch@wolfvision.net>
In-Reply-To: <20220720091527.1270365-1-michael.riesch@wolfvision.net>
References: <20220720091527.1270365-1-michael.riesch@wolfvision.net>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+hU/suxb/OrI6V18m1Ag5LVUpw9AfXw5mX1bVCCwaCacvmL+0op1TF17ueXr?=
 =?us-ascii?Q?0d8YyDyFYHttDooDXbEVabLsAbu1CRA/8rv9Em/uSBoT4lMG8Hd5sj0ku3sm?=
 =?us-ascii?Q?7lmyHh9ilgK9aaIq9H0AJsiLiPJ6vj97Knb3zcl3s1hNKuwed+LSRax6x+0T?=
 =?us-ascii?Q?zyI4sneV4sMUftgPcBpACaFwShx8wwS5XEdUz1jjMGszuIk8vSh+dNKuTyrg?=
 =?us-ascii?Q?SqhhUylz6BAC1qhVmDfLxz9e+KO0GyLoHrIOjonHtzJ/gvja3964xfuWcr+e?=
 =?us-ascii?Q?5XkTTTX9FjSLHb6795u7A/pxwynKCrOwA60PKM4KVGNcEEfwsttyHxpH3fwL?=
 =?us-ascii?Q?iirNQejtEq3E3NJ2OxA0OcWgSMJP98oM38PVWBfp4qpnPBH3gYHj53fGcQSL?=
 =?us-ascii?Q?J9nb8KPEnlWZzctxJb92MZS1KEvxokO1OydhBpg1hoNlNxw65MU7HpCwInTj?=
 =?us-ascii?Q?4wJgvdTWDMN/p9wyppVqNpsMq1dzpzZGtOeJ4qdsXdx+0K+p7bRK+53S+YqK?=
 =?us-ascii?Q?huWRNYNOUbZ69PagyK79nhcuRRY76Pwp2VCJdrIBUDVnGBColz5Veltou04l?=
 =?us-ascii?Q?EfqVFyvyZ5j1jAK63Oa9Io5SfjJCWuDB8k2YHZH+8e52cGsjCZ85e44aXNA7?=
 =?us-ascii?Q?v4SeR+z+EWz4FVsD8sPu8sn2hX34J4UiF4odyG92+UQSON2tafUzCa8d9wkR?=
 =?us-ascii?Q?J70hoxOATy9hbJK8hOAaInctJu8THY3jKkFS1OK3cgzxhF3XumYQjswhbwNU?=
 =?us-ascii?Q?d8LgG9ZzjYmPQkCM1lVoAdHwV/ehxmAvn+87U8IXtr7sTwR13ZD+chmFhSyG?=
 =?us-ascii?Q?MErACKFze3EgLEXf+TD039sejIef1a0ejltE+vAUeEzNwHFX4w3BYA3yqSzf?=
 =?us-ascii?Q?9IvbGH18v1yuCzclboN9MgQ2hm2y/JsjLJ/P2tEsUHfCadEHbhwfMAq7himg?=
 =?us-ascii?Q?DbrhA0yAx/3dxdD5TlVQM56sZSjlRutJcMMY/ea16+rr6MyjbmyyJy6pTKlO?=
 =?us-ascii?Q?9TnX/2/2SLCOxkIc+bxD+G2eIx9s3aFEYM/wewFUZv9zkN4tbgm+dKBgUCMu?=
 =?us-ascii?Q?BCtCCJK71cMGYCBy4tD7YNrupAvcfLrGhgvJuH+0WOEW6Omc/7lsc32L/gdn?=
 =?us-ascii?Q?ifHeSdbMkZM7XASEqDprSO96tXmmwrj1aOianxgAI60AvGFnTAq1AhFCTnSK?=
 =?us-ascii?Q?4l/numj/U+YevsDrIBrH/v2Wds4jjpJe3ZsAqrRN/E8dhap+oW5Ri3bORexr?=
 =?us-ascii?Q?mG/TffMC+YIx8xf6dhUi2AUKpCMlgR2mk1EVTRfWjL+yZrR0tEgJG2/gqPDY?=
 =?us-ascii?Q?xZo3hQmfZiy0RCt9ts6Ak2ad+I6T9NTCFlO/+9s3wHesudACbqW4KLOeA4t3?=
 =?us-ascii?Q?MaSwUg93Z+a9g6si3sPF97/i+MGU147+wMkQM2qTeKxu1GKjnedtUgLTpS9g?=
 =?us-ascii?Q?V5GCqnhYtwWmIYClWtAarwvxURDiT4GgOcbGkfyTkn8/G/tpXRcbxnyET0Gb?=
 =?us-ascii?Q?POxP9BOrckzGGJzURgRb+hpMZz8yXog48tDGyNn+S4X3klyaPOnYgB3oxKLm?=
 =?us-ascii?Q?IAqHml/dMXW6JkoZov0eeJdx+3i/twicmmzIwdXjsLghv95LLKqDV3BiVRdr?=
 =?us-ascii?Q?iMuAh8zYuzxinRiqZWgcX9fxi8+z8ZR0g3MG9EHCR59rOFjewnc96S6fEozu?=
 =?us-ascii?Q?lrjAGg=3D=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: c72e7a37-670f-4590-608b-08da6a306e19
X-MS-Exchange-CrossTenant-AuthSource: AM4PR0802MB2131.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 09:15:46.5259
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oB0Fg1zjZeRASUGUhMLeIhAq0UU5JLKv+CQUPdnHjXtOExPs/xuPiBy9hPvVHlcnPucmRNHO28dQu4MwDhtCz+Bk5Gonc2G08wscTk7zJIY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3934
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This adds support for variant found in Rockchip RK356x SoCs. Note that
only the basic operating mode is supported, in which all four CSI lines
are controlled by the Rockchip ISP.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 .../phy/rockchip/phy-rockchip-inno-csidphy.c  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
index ca13a604ab4f..75f948bdea6a 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
@@ -27,6 +27,9 @@
 
 #define RK3368_GRF_SOC_CON6_OFFSET	0x0418
 
+#define RK3568_GRF_VI_CON0		0x0340
+#define RK3568_GRF_VI_CON1		0x0344
+
 /* PHY */
 #define CSIDPHY_CTRL_LANE_ENABLE		0x00
 #define CSIDPHY_CTRL_LANE_ENABLE_CK		BIT(6)
@@ -58,9 +61,11 @@
 #define RK1808_CSIDPHY_CLK_WR_THS_SETTLE	0x160
 #define RK3326_CSIDPHY_CLK_WR_THS_SETTLE	0x100
 #define RK3368_CSIDPHY_CLK_WR_THS_SETTLE	0x100
+#define RK3568_CSIDPHY_CLK_WR_THS_SETTLE	0x160
 
 /* Calibration reception enable */
 #define RK1808_CSIDPHY_CLK_CALIB_EN		0x168
+#define RK3568_CSIDPHY_CLK_CALIB_EN		0x168
 
 /*
  * The higher 16-bit of this register is used for write protection
@@ -103,6 +108,12 @@ static const struct dphy_reg rk3368_grf_dphy_regs[] = {
 	[GRF_DPHY_CSIPHY_FORCERXMODE] = PHY_REG(RK3368_GRF_SOC_CON6_OFFSET, 4, 8),
 };
 
+static const struct dphy_reg rk3568_grf_dphy_regs[] = {
+	[GRF_DPHY_CSIPHY_FORCERXMODE] = PHY_REG(RK3568_GRF_VI_CON0, 4, 0),
+	[GRF_DPHY_CSIPHY_DATALANE_EN] = PHY_REG(RK3568_GRF_VI_CON0, 4, 4),
+	[GRF_DPHY_CSIPHY_CLKLANE_EN] = PHY_REG(RK3568_GRF_VI_CON0, 1, 8),
+};
+
 struct hsfreq_range {
 	u32 range_h;
 	u8 cfg_bit;
@@ -352,6 +363,15 @@ static const struct dphy_drv_data rk3368_mipidphy_drv_data = {
 	.grf_regs = rk3368_grf_dphy_regs,
 };
 
+static const struct dphy_drv_data rk3568_mipidphy_drv_data = {
+	.pwrctl_offset = -1,
+	.ths_settle_offset = RK3568_CSIDPHY_CLK_WR_THS_SETTLE,
+	.calib_offset = RK3568_CSIDPHY_CLK_CALIB_EN,
+	.hsfreq_ranges = rk1808_mipidphy_hsfreq_ranges,
+	.num_hsfreq_ranges = ARRAY_SIZE(rk1808_mipidphy_hsfreq_ranges),
+	.grf_regs = rk3568_grf_dphy_regs,
+};
+
 static const struct of_device_id rockchip_inno_csidphy_match_id[] = {
 	{
 		.compatible = "rockchip,px30-csi-dphy",
@@ -369,6 +389,10 @@ static const struct of_device_id rockchip_inno_csidphy_match_id[] = {
 		.compatible = "rockchip,rk3368-csi-dphy",
 		.data = &rk3368_mipidphy_drv_data,
 	},
+	{
+		.compatible = "rockchip,rk3568-csi-dphy",
+		.data = &rk3568_mipidphy_drv_data,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, rockchip_inno_csidphy_match_id);
-- 
2.30.2