From patchwork Thu Aug 29 02:12:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13782397 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 4E987C7115E for ; Thu, 29 Aug 2024 02:13:08 +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: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:In-Reply-To:References: List-Owner; bh=1bhfNHhni8Yes1q7PBDnRAT+Mxjz93V4ovjx+SYpR3A=; b=Lmzxc3L4J8UzPp RqctsOUi5LlAA1SGyyxrPy7pQUZG5Jnylu8XFwatYlnMkE8jpVaSES+if59UAZdzJ6uyGox2mUi1H mjdXTDBh73rmvJdhuwsVQW0V1Kic1VKgS/bqIIK0DlVaC63eAL74QyYI4tu1BTj4rOovYAB0R4pGi FYVFQvC4xFCAjJiBrxWO08G9jIrEsIoQBogibhJY5AvhcZHHr6eo9uAS1am1yZdeUDKwSJZ+LTfpJ 7NMv7N23kqKWZwbm2J1lBf83u0OjhSQqFeV4GGyy9AIBP2kuN/y3mRhAdYu+9nZhhgyJVnP1DPJJv LoV97n5pU51w0LCi99ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjUep-00000000CKk-3Wzh; Thu, 29 Aug 2024 02:13:07 +0000 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjUen-00000000CKG-0Jfm for linux-phy@lists.infradead.org; Thu, 29 Aug 2024 02:13:06 +0000 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-81f8f0197abso10371339f.2 for ; Wed, 28 Aug 2024 19:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724897583; x=1725502383; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IMUXRB0PCYmOizO9nlqx6R7KKS9cq+ndpmvAnug7G6o=; b=kIJogSN291VFsmNapgNpSSqGanJ/IRQm0CSbDaMuREviX7dpAwVpzdO5nDqeJu0Ekf zFDSuKlmJUFujCm6CEYTWf9q8HZNgf0KQYBpBIPTTD81Upd8X68tNN+Vj7RmUKvDXLGy PZjv7r2KPizg11S5mguWCUCxYs5VoyjeybBXInDLGkzTjBAIe0vsfoPWQnW/olZmo4Z1 kt8S/ncKQ3HLVM7N6pDZfExeOvEku7ad1VRyp5lmTVJLwMIH4fauI4+a0O+qSqLjDgH8 Nxnd4UYCeeZRiRlOXJFsoIyYbsCHTmYNVKHg7l3XG2jN5DK1XjSTet2dqLPqlwlhf9XU bMiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724897583; x=1725502383; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IMUXRB0PCYmOizO9nlqx6R7KKS9cq+ndpmvAnug7G6o=; b=bhpyFgGId4jtJX+h9kPfWitvuTz4earr/PO2fDNgBBNjdKeSFzRghls94ExmEv1ipx l+8ekFgTmYjnsswvSDSBClfZfn5kwyqBB9lEo2XgkVS879YQPoYq3i6Fbud00YsQKNBC iwDf0hUtZo4W117D3e16Fhm2C8rN9IwVPFWIYY/TpQsty06j324cGQ/Gc0wlwvq0gntA P8fJrEfeciKgacS0+EARU2ah/M6gdWbhnEXyNFTCyMM+Ck3Bdgmk/MI0Pm69RY/NVyEw 6Ep7ecFLhow1ve974Y5uWSo+eWjTjvuu8e9HGDb/OzRuEY17Qoo/uX+VJNRsWD36x3/2 M+jg== X-Gm-Message-State: AOJu0YxyOLtZuqjzd/Anbnzlpnuw8QhVxPT92MBQbZyYoTdDs+ZVuRYw RykH6LQyP532Q1eHfxQe4BU1UVFrkGu7m/GGZpqU4ucQEuiBk0xwwEPsgg== X-Google-Smtp-Source: AGHT+IHMYpDw5ipxzdT52nhzA41IB34hwORONOAO+dgzNgvJdcvKutcKRoM3Fzw5kcyo90Or9D7uag== X-Received: by 2002:a05:6602:6193:b0:82a:13ed:b758 with SMTP id ca18e2360f4ac-82a13edb7e3mr125128039f.12.1724897583182; Wed, 28 Aug 2024 19:13:03 -0700 (PDT) Received: from aford-System-Version.lan (c-75-72-166-104.hsd1.mn.comcast.net. [75.72.166.104]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4ced2ee8559sm46200173.174.2024.08.28.19.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2024 19:13:02 -0700 (PDT) From: Adam Ford To: linux-phy@lists.infradead.org Cc: dominique.martinet@atmark-techno.com, linux-imx@nxp.com, festevam@gmail.com, frieder.schrempf@kontron.de, aford@beaconembedded.com, Adam Ford , Vinod Koul , Kishon Vijay Abraham I , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Lucas Stach , Marco Felsch , linux-kernel@vger.kernel.org Subject: [RFC V2 1/2] phy: freescale: fsl-samsung-hdmi: Replace register defines with macro Date: Wed, 28 Aug 2024 21:12:44 -0500 Message-ID: <20240829021256.787615-1-aford173@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240828_191305_127865_6782DD12 X-CRM114-Status: GOOD ( 13.73 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org There are 47 registers defined as PHY_REG_xx were xx goes from 00 to 47. Simplify this by replacing them all with a macro which is passed the register number to return the proper register offset. Signed-off-by: Adam Ford diff --git a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c index 9048cdc760c2..bc5d3625ece6 100644 --- a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c +++ b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c @@ -14,76 +14,20 @@ #include #include -#define PHY_REG_00 0x00 -#define PHY_REG_01 0x04 -#define PHY_REG_02 0x08 -#define PHY_REG_08 0x20 -#define PHY_REG_09 0x24 -#define PHY_REG_10 0x28 -#define PHY_REG_11 0x2c - -#define PHY_REG_12 0x30 -#define REG12_CK_DIV_MASK GENMASK(5, 4) - -#define PHY_REG_13 0x34 -#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) - -#define PHY_REG_14 0x38 -#define REG14_TOL_MASK GENMASK(7, 4) -#define REG14_RP_CODE_MASK GENMASK(3, 1) -#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) - -#define PHY_REG_15 0x3c -#define PHY_REG_16 0x40 -#define PHY_REG_17 0x44 -#define PHY_REG_18 0x48 -#define PHY_REG_19 0x4c -#define PHY_REG_20 0x50 - -#define PHY_REG_21 0x54 -#define REG21_SEL_TX_CK_INV BIT(7) -#define REG21_PMS_S_MASK GENMASK(3, 0) - -#define PHY_REG_22 0x58 -#define PHY_REG_23 0x5c -#define PHY_REG_24 0x60 -#define PHY_REG_25 0x64 -#define PHY_REG_26 0x68 -#define PHY_REG_27 0x6c -#define PHY_REG_28 0x70 -#define PHY_REG_29 0x74 -#define PHY_REG_30 0x78 -#define PHY_REG_31 0x7c -#define PHY_REG_32 0x80 - -/* - * REG33 does not match the ref manual. According to Sandor Yu from NXP, - * "There is a doc issue on the i.MX8MP latest RM" - * REG33 is being used per guidance from Sandor - */ - -#define PHY_REG_33 0x84 -#define REG33_MODE_SET_DONE BIT(7) -#define REG33_FIX_DA BIT(1) - -#define PHY_REG_34 0x88 -#define REG34_PHY_READY BIT(7) -#define REG34_PLL_LOCK BIT(6) -#define REG34_PHY_CLK_READY BIT(5) - -#define PHY_REG_35 0x8c -#define PHY_REG_36 0x90 -#define PHY_REG_37 0x94 -#define PHY_REG_38 0x98 -#define PHY_REG_39 0x9c -#define PHY_REG_40 0xa0 -#define PHY_REG_41 0xa4 -#define PHY_REG_42 0xa8 -#define PHY_REG_43 0xac -#define PHY_REG_44 0xb0 -#define PHY_REG_45 0xb4 -#define PHY_REG_46 0xb8 -#define PHY_REG_47 0xbc +#define PHY_REG(reg) (reg * 4) + +#define REG12_CK_DIV_MASK GENMASK(5, 4) +#define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) +#define REG14_TOL_MASK GENMASK(7, 4) +#define REG14_RP_CODE_MASK GENMASK(3, 1) +#define REG14_TG_CODE_HIGH_MASK GENMASK(0, 0) +#define REG21_SEL_TX_CK_INV BIT(7) +#define REG21_PMS_S_MASK GENMASK(3, 0) +#define REG33_MODE_SET_DONE BIT(7) +#define REG33_FIX_DA BIT(1) +#define REG34_PHY_READY BIT(7) +#define REG34_PLL_LOCK BIT(6) +#define REG34_PHY_CLK_READY BIT(5) #define PHY_PLL_DIV_REGS_NUM 6 @@ -369,29 +313,29 @@ struct reg_settings { }; static const struct reg_settings common_phy_cfg[] = { - { PHY_REG_00, 0x00 }, { PHY_REG_01, 0xd1 }, - { PHY_REG_08, 0x4f }, { PHY_REG_09, 0x30 }, - { PHY_REG_10, 0x33 }, { PHY_REG_11, 0x65 }, + { PHY_REG(0), 0x00 }, { PHY_REG(1), 0xd1 }, + { PHY_REG(8), 0x4f }, { PHY_REG(9), 0x30 }, + { PHY_REG(10), 0x33 }, { PHY_REG(11), 0x65 }, /* REG12 pixclk specific */ /* REG13 pixclk specific */ /* REG14 pixclk specific */ - { PHY_REG_15, 0x80 }, { PHY_REG_16, 0x6c }, - { PHY_REG_17, 0xf2 }, { PHY_REG_18, 0x67 }, - { PHY_REG_19, 0x00 }, { PHY_REG_20, 0x10 }, + { PHY_REG(15), 0x80 }, { PHY_REG(16), 0x6c }, + { PHY_REG(17), 0xf2 }, { PHY_REG(18), 0x67 }, + { PHY_REG(19), 0x00 }, { PHY_REG(20), 0x10 }, /* REG21 pixclk specific */ - { PHY_REG_22, 0x30 }, { PHY_REG_23, 0x32 }, - { PHY_REG_24, 0x60 }, { PHY_REG_25, 0x8f }, - { PHY_REG_26, 0x00 }, { PHY_REG_27, 0x00 }, - { PHY_REG_28, 0x08 }, { PHY_REG_29, 0x00 }, - { PHY_REG_30, 0x00 }, { PHY_REG_31, 0x00 }, - { PHY_REG_32, 0x00 }, { PHY_REG_33, 0x80 }, - { PHY_REG_34, 0x00 }, { PHY_REG_35, 0x00 }, - { PHY_REG_36, 0x00 }, { PHY_REG_37, 0x00 }, - { PHY_REG_38, 0x00 }, { PHY_REG_39, 0x00 }, - { PHY_REG_40, 0x00 }, { PHY_REG_41, 0xe0 }, - { PHY_REG_42, 0x83 }, { PHY_REG_43, 0x0f }, - { PHY_REG_44, 0x3E }, { PHY_REG_45, 0xf8 }, - { PHY_REG_46, 0x00 }, { PHY_REG_47, 0x00 } + { PHY_REG(22), 0x30 }, { PHY_REG(23), 0x32 }, + { PHY_REG(24), 0x60 }, { PHY_REG(25), 0x8f }, + { PHY_REG(26), 0x00 }, { PHY_REG(27), 0x00 }, + { PHY_REG(28), 0x08 }, { PHY_REG(29), 0x00 }, + { PHY_REG(30), 0x00 }, { PHY_REG(31), 0x00 }, + { PHY_REG(32), 0x00 }, { PHY_REG(33), 0x80 }, + { PHY_REG(34), 0x00 }, { PHY_REG(35), 0x00 }, + { PHY_REG(36), 0x00 }, { PHY_REG(37), 0x00 }, + { PHY_REG(38), 0x00 }, { PHY_REG(39), 0x00 }, + { PHY_REG(40), 0x00 }, { PHY_REG(41), 0xe0 }, + { PHY_REG(42), 0x83 }, { PHY_REG(43), 0x0f }, + { PHY_REG(44), 0x3E }, { PHY_REG(45), 0xf8 }, + { PHY_REG(46), 0x00 }, { PHY_REG(47), 0x00 } }; struct fsl_samsung_hdmi_phy { @@ -442,7 +386,7 @@ fsl_samsung_hdmi_phy_configure_pixclk(struct fsl_samsung_hdmi_phy *phy, } writeb(REG21_SEL_TX_CK_INV | FIELD_PREP(REG21_PMS_S_MASK, div), - phy->regs + PHY_REG_21); + phy->regs + PHY_REG(21)); } static void @@ -469,7 +413,7 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, break; } - writeb(FIELD_PREP(REG12_CK_DIV_MASK, ilog2(div)), phy->regs + PHY_REG_12); + writeb(FIELD_PREP(REG12_CK_DIV_MASK, ilog2(div)), phy->regs + PHY_REG(12)); /* * Calculation for the frequency lock detector target code (fld_tg_code) @@ -489,11 +433,11 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, /* FLD_TOL and FLD_RP_CODE taken from downstream driver */ writeb(FIELD_PREP(REG13_TG_CODE_LOW_MASK, fld_tg_code), - phy->regs + PHY_REG_13); + phy->regs + PHY_REG(13)); writeb(FIELD_PREP(REG14_TOL_MASK, 2) | FIELD_PREP(REG14_RP_CODE_MASK, 2) | FIELD_PREP(REG14_TG_CODE_HIGH_MASK, fld_tg_code >> 8), - phy->regs + PHY_REG_14); + phy->regs + PHY_REG(14)); } static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy, @@ -503,7 +447,7 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy, u8 val; /* HDMI PHY init */ - writeb(REG33_FIX_DA, phy->regs + PHY_REG_33); + writeb(REG33_FIX_DA, phy->regs + PHY_REG(33)); /* common PHY registers */ for (i = 0; i < ARRAY_SIZE(common_phy_cfg); i++) @@ -511,14 +455,14 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy, /* set individual PLL registers PHY_REG2 ... PHY_REG7 */ for (i = 0; i < PHY_PLL_DIV_REGS_NUM; i++) - writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG_02 + i * 4); + writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG(2) + i * 4); fsl_samsung_hdmi_phy_configure_pixclk(phy, cfg); fsl_samsung_hdmi_phy_configure_pll_lock_det(phy, cfg); - writeb(REG33_FIX_DA | REG33_MODE_SET_DONE, phy->regs + PHY_REG_33); + writeb(REG33_FIX_DA | REG33_MODE_SET_DONE, phy->regs + PHY_REG(33)); - ret = readb_poll_timeout(phy->regs + PHY_REG_34, val, + ret = readb_poll_timeout(phy->regs + PHY_REG(34), val, val & REG34_PLL_LOCK, 50, 20000); if (ret) dev_err(phy->dev, "PLL failed to lock\n"); From patchwork Thu Aug 29 02:12:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13782398 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 B7541C7115E for ; Thu, 29 Aug 2024 02:13:12 +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=f9YuBVBeL65jOncACdxuDh4ySwfI69BcUsEF/sXheZY=; b=NmAa6NpqxRWY7T M+rfynJczAYq6dGn5552RGaDYVF7caWufpDAi+nxpQLvMsQL6NvivZdNOb2RaWb0kWuE/0vheq0HD UJHGAiuL+JIbDWnZLwZvNZ2qXCotC1Ot42txBrR2inbCu7Pf6uNnuLUAVnCGBTYZeFxBveKvWfBwe Wo85auiAOVW+BzoucUwgvbzPEkSfD+0lDmKfnR7Ww23pHIwCKoUziVLEzLMUh8JrOt81mktJQ7fBU dsoU0SnlxM7kXlqZI41p0Igqcjwh/VH7PKYOTthn9ea+vyhj4bpU6m9yIVmPUhU2fQrJREwSMmNEu idoQF5jagG/bZm2tVWmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjUeu-00000000CLa-1Dgf; Thu, 29 Aug 2024 02:13:12 +0000 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjUer-00000000CL0-2CPF for linux-phy@lists.infradead.org; Thu, 29 Aug 2024 02:13:10 +0000 Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-82521c46feaso7795039f.2 for ; Wed, 28 Aug 2024 19:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724897588; x=1725502388; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RsjhY5XZ0vnEndVhLYw930ASTyeg4yncLyqMDgVzQMw=; b=mvN7UlJ5KurVJdo1OML3GYjfAtui0i+3mDrEiroilnvIMm6ubnDTncdVRIQIIVohha QRxDpvyu0Le7Qo4wkv3ITeYZkgH3K7kNKAOjsYK5ZBgVopocfC6hQYmhcn1oIAFlaQYv EenzRwqNsbo3eXdatAIWvVc5heVplXZutHL2vyA56aFbTCsYkBUkp6ALm/wmZBZ/yzgo 7DafzFGlaOoDThspf6+Ur4MWCI/dGiIi8N8xrN3G5ACzB9lzcYiCMTee+fBoDfZ/3ZdV V/Jf9gUG/vxv+XfcqX3YeOoXhYGS1xdeBG52OtIKtv8z9tXyZtwlZdoZendDdjt1h7Au i43g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724897588; x=1725502388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RsjhY5XZ0vnEndVhLYw930ASTyeg4yncLyqMDgVzQMw=; b=Y+wt2W1hbI/mUAr/06jiz5y74kOpkBwS9uwQGZ6Qe1Ifabi/wZvG2GQn4b4+yiXQtb K1oFLeYSxYJIt8GwizJk5+DfYRVNUEmARubl8CjCX9+J6143Qhc1NJtLRGHBO/Wxooun 9KriZgs0sffMn4mj1+Iikl6uBRTEdB7GQGhR2CP7bSR3gNWMrIeCtrQqQuTueDzrAC2Z 3Ec83ZjMF4G+GiG8dLwdCdWjW288FTF5Ng0w053bvCorkVWEA8hx0oNrPLafT8qEAntb Cl2e+GOG9c7W4ywI3kPHLEN8vJ61IIaUgVldwFT64M5Oc3AnVVi41VwXixlYkQVR+vD5 bFYw== X-Gm-Message-State: AOJu0YzrF6rRi8kWoGnw3RN5c9+8D6sm+3WsXz6x8bRw9AwH6ZdPd0Q9 WJnsKEjOX8uwmiwSdfNbw416Ba3lMEgKqfqjviw/YSE3mxPSZ/s/NGu62A== X-Google-Smtp-Source: AGHT+IEtHJTmpOM1GYaMvoBooLQufKeyrDlS3bodVB3yDcAXfAxOJ4AvzBJENGNR3R7isPhfifUIuQ== X-Received: by 2002:a05:6602:15c6:b0:81e:4ef0:3a81 with SMTP id ca18e2360f4ac-82a1109c87cmr179544039f.16.1724897587851; Wed, 28 Aug 2024 19:13:07 -0700 (PDT) Received: from aford-System-Version.lan (c-75-72-166-104.hsd1.mn.comcast.net. [75.72.166.104]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4ced2ee8559sm46200173.174.2024.08.28.19.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2024 19:13:07 -0700 (PDT) From: Adam Ford To: linux-phy@lists.infradead.org Cc: dominique.martinet@atmark-techno.com, linux-imx@nxp.com, festevam@gmail.com, frieder.schrempf@kontron.de, aford@beaconembedded.com, Adam Ford , Vinod Koul , Kishon Vijay Abraham I , Lucas Stach , Marco Felsch , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [RFC V2 2/2] phy: freescale: fsl-samsung-hdmi: Support dynamic integer divider Date: Wed, 28 Aug 2024 21:12:45 -0500 Message-ID: <20240829021256.787615-2-aford173@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240829021256.787615-1-aford173@gmail.com> References: <20240829021256.787615-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240828_191309_589252_3F838271 X-CRM114-Status: GOOD ( 23.35 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org There is currently a look-up table for a variety of resolutions. Since the phy has the ability to dynamically calculate the values necessary to use the intger divider which should allow more resolutions without having to update the look-up-table. If the integer calculator cannot get an exact frequency, it falls back to the look-up-table. Because the LUT algorithm does some rounding, I did not remove integer entries from the LUT. Signed-off-by: Adam Ford diff --git a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c index bc5d3625ece6..76e0899c6006 100644 --- a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c +++ b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c @@ -16,6 +16,8 @@ #define PHY_REG(reg) (reg * 4) +#define REG01_PMS_P_MASK GENMASK(3, 0) +#define REG03_PMS_S_MASK GENMASK(7, 4) #define REG12_CK_DIV_MASK GENMASK(5, 4) #define REG13_TG_CODE_LOW_MASK GENMASK(7, 0) #define REG14_TOL_MASK GENMASK(7, 4) @@ -31,11 +33,17 @@ #define PHY_PLL_DIV_REGS_NUM 6 +#ifndef MHZ +#define MHZ (1000UL * 1000UL) +#endif + struct phy_config { u32 pixclk; u8 pll_div_regs[PHY_PLL_DIV_REGS_NUM]; }; +static struct phy_config custom_phy_pll_cfg; + static const struct phy_config phy_pll_cfg[] = { { .pixclk = 22250000, @@ -440,10 +448,83 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy, phy->regs + PHY_REG(14)); } +static unsigned long fsl_samsung_hdmi_phy_find_pms(unsigned long fout, u8 *p, u16 *m, u8 *s) +{ + unsigned long best_freq = 0; + u32 min_delta = 0xffffffff; + u8 _p, best_p; + u16 _m, best_m; + u8 _s, best_s; + + for (_p = 1; _p <= 11; ++_p) { + for (_s = 1; _s <= 16; ++_s) { + u64 tmp; + u32 delta; + + /* s must be even */ + if (_s > 1 && (_s & 0x01) == 1) + _s++; + + /* _s cannot be 14 per the TRM */ + if (_s == 14) + continue; + + /* + * TODO: Ref Manual doesn't state the range of _m + * so this should be further refined if possible. + * This range was set based on the original values + * in the look-up table + */ + tmp = (u64)fout * (_p * _s); + do_div(tmp, 24 * MHZ); + _m = tmp; + if (_m < 0x30 || _m > 0x7b) + continue; + + /* + * Rev 2 of the Ref Manual states the + * VCO can range between 750MHz and + * 3GHz. The VCO is assumed to be _m x + * the reference frequency of 24MHz divided + * by the prescaler, _p + */ + tmp = (u64)_m * 24 * MHZ; + do_div(tmp, _p); + if (tmp < 750 * MHZ || + tmp > 3000 * MHZ) + continue; + + tmp = (u64)_m * 24 * MHZ; + do_div(tmp, _p * _s); + + delta = abs(fout - tmp); + if (delta < min_delta) { + best_p = _p; + best_s = _s; + best_m = _m; + min_delta = delta; + best_freq = tmp; + } + } + } + + if (best_freq) { + *p = best_p; + *m = best_m; + *s = best_s; + } + + return best_freq; +} + static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy, const struct phy_config *cfg) { + u32 desired_clock = cfg->pixclk * 5; + u32 close_freq; int i, ret; + u16 m; + u8 p, s; u8 val; /* HDMI PHY init */ @@ -453,11 +534,38 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy, for (i = 0; i < ARRAY_SIZE(common_phy_cfg); i++) writeb(common_phy_cfg[i].val, phy->regs + common_phy_cfg[i].reg); - /* set individual PLL registers PHY_REG2 ... PHY_REG7 */ - for (i = 0; i < PHY_PLL_DIV_REGS_NUM; i++) - writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG(2) + i * 4); + /* Using the PMS calculator alone, determine if can use integer divider */ + close_freq = fsl_samsung_hdmi_phy_find_pms(desired_clock, &p, &m, &s); + + /* If the clock cannot be configured with integer divder, use the fractional divider */ + if (close_freq != desired_clock) { + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: use fractional divider\n"); + /* set individual PLL registers PHY_REG2 ... PHY_REG7 */ + for (i = 0; i < PHY_PLL_DIV_REGS_NUM; i++) + writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG(2) + i * 4); + fsl_samsung_hdmi_phy_configure_pixclk(phy, cfg); + } else { + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: use integer divider\n"); + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: P = %d\n", p); + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: M = %d\n", m); + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: S = %d\n", s); + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: frequency = %u\n", close_freq); + + /* Write integer divder values for PMS */ + writeb(FIELD_PREP(REG01_PMS_P_MASK, p), phy->regs + PHY_REG(1)); + writeb(m, phy->regs + PHY_REG(2)); + writeb(FIELD_PREP(REG03_PMS_S_MASK, s-1), phy->regs + PHY_REG(3)); + + /* Configure PHY to disable fractional divider */ + writeb(0x00, phy->regs + PHY_REG(4)); + writeb(0x00, phy->regs + PHY_REG(5)); + writeb(0x80, phy->regs + PHY_REG(6)); + writeb(0x00, phy->regs + PHY_REG(7)); + + writeb(REG21_SEL_TX_CK_INV | FIELD_PREP(REG21_PMS_S_MASK, s-1), + phy->regs + PHY_REG(21)); + } - fsl_samsung_hdmi_phy_configure_pixclk(phy, cfg); fsl_samsung_hdmi_phy_configure_pll_lock_det(phy, cfg); writeb(REG33_FIX_DA | REG33_MODE_SET_DONE, phy->regs + PHY_REG(33)); @@ -484,8 +592,17 @@ static unsigned long phy_clk_recalc_rate(struct clk_hw *hw, static long phy_clk_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate) { + u32 int_div_clk; int i; + u16 m; + u8 p, s; + + /* If the integer divider works, just use it */ + int_div_clk = fsl_samsung_hdmi_phy_find_pms(rate * 5, &p, &m, &s) / 5; + if (int_div_clk == rate) + return int_div_clk; + /* Otherwise, fall back to the LUT */ for (i = ARRAY_SIZE(phy_pll_cfg) - 1; i >= 0; i--) if (phy_pll_cfg[i].pixclk <= rate) return phy_pll_cfg[i].pixclk; @@ -497,16 +614,28 @@ static int phy_clk_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { struct fsl_samsung_hdmi_phy *phy = to_fsl_samsung_hdmi_phy(hw); + u32 int_div_clk; int i; - - for (i = ARRAY_SIZE(phy_pll_cfg) - 1; i >= 0; i--) - if (phy_pll_cfg[i].pixclk <= rate) - break; - - if (i < 0) - return -EINVAL; - - phy->cur_cfg = &phy_pll_cfg[i]; + u16 m; + u8 p, s; + + /* If the integer divider works, just use it */ + int_div_clk = fsl_samsung_hdmi_phy_find_pms(rate * 5, &p, &m, &s) / 5; + if (int_div_clk == rate) { + /* Just set the pixclk rate, the rest will be calculated */ + custom_phy_pll_cfg.pixclk = int_div_clk; + phy->cur_cfg = &custom_phy_pll_cfg; + } else { + /* Otherwise, search the LUT */ + for (i = ARRAY_SIZE(phy_pll_cfg) - 1; i >= 0; i--) + if (phy_pll_cfg[i].pixclk <= rate) + break; + + if (i < 0) + return -EINVAL; + + phy->cur_cfg = &phy_pll_cfg[i]; + } return fsl_samsung_hdmi_phy_configure(phy, phy->cur_cfg); }