From patchwork Sat Jan 23 14:18:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 369552 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 0EB68C433E0 for ; Sat, 23 Jan 2021 14:19:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D517822D5A for ; Sat, 23 Jan 2021 14:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725274AbhAWOTR (ORCPT ); Sat, 23 Jan 2021 09:19:17 -0500 Received: from aposti.net ([89.234.176.197]:32836 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725268AbhAWOTP (ORCPT ); Sat, 23 Jan 2021 09:19:15 -0500 From: Paul Cercueil To: Kishon Vijay Abraham I , Vinod Koul , Rob Herring Cc: =?utf-8?b?5ZGo55Cw5p2w?= , od@zcrc.me, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 1/2] dt-bindings/phy: ingenic: Add compatibles for JZ4760(B) SoCs Date: Sat, 23 Jan 2021 14:18:24 +0000 Message-Id: <20210123141825.15481-1-paul@crapouillou.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the ingenic,jz4760-phy and ingenic,jz4760b-phy compatible strings, and make the ingenic,jz4770-phy compatible string require ingenic,jz4760-phy as a fallback, since both work the same, and the JZ4760 SoC is older. Signed-off-by: Paul Cercueil --- Notes: v2: Fix indentation .../bindings/phy/ingenic,phy-usb.yaml | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml b/Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml index 0fd93d71fe5a..d59c697ed81e 100644 --- a/Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml +++ b/Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml @@ -15,13 +15,19 @@ properties: pattern: '^usb-phy@.*' compatible: - enum: - - ingenic,jz4770-phy - - ingenic,jz4775-phy - - ingenic,jz4780-phy - - ingenic,x1000-phy - - ingenic,x1830-phy - - ingenic,x2000-phy + oneOf: + - enum: + - ingenic,jz4760-phy + - ingenic,jz4775-phy + - ingenic,jz4780-phy + - ingenic,x1000-phy + - ingenic,x1830-phy + - ingenic,x2000-phy + - items: + - enum: + - ingenic,jz4760b-phy + - ingenic,jz4770-phy + - const: ingenic,jz4760-phy reg: maxItems: 1 @@ -48,7 +54,7 @@ examples: - | #include otg_phy: usb-phy@3c { - compatible = "ingenic,jz4770-phy"; + compatible = "ingenic,jz4770-phy", "ingenic,jz4760-phy"; reg = <0x3c 0x10>; vcc-supply = <&vcc>; From patchwork Sat Jan 23 14:18:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 370027 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 9B538C433DB for ; Sat, 23 Jan 2021 14:20:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 651FE22DCC for ; Sat, 23 Jan 2021 14:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725881AbhAWOUE (ORCPT ); Sat, 23 Jan 2021 09:20:04 -0500 Received: from aposti.net ([89.234.176.197]:32860 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725290AbhAWOUD (ORCPT ); Sat, 23 Jan 2021 09:20:03 -0500 From: Paul Cercueil To: Kishon Vijay Abraham I , Vinod Koul , Rob Herring Cc: =?utf-8?b?5ZGo55Cw5p2w?= , od@zcrc.me, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 2/2] phy: ingenic: Add support for the JZ4760(B) Date: Sat, 23 Jan 2021 14:18:25 +0000 Message-Id: <20210123141825.15481-2-paul@crapouillou.net> In-Reply-To: <20210123141825.15481-1-paul@crapouillou.net> References: <20210123141825.15481-1-paul@crapouillou.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add support for the JZ4760 and JZ4760B SoCs, which behave exactly as the (newer) JZ4770 SoC. Signed-off-by: Paul Cercueil --- Notes: v2: No change drivers/phy/ingenic/phy-ingenic-usb.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/phy/ingenic/phy-ingenic-usb.c b/drivers/phy/ingenic/phy-ingenic-usb.c index ea127b177f46..42902a0278cc 100644 --- a/drivers/phy/ingenic/phy-ingenic-usb.c +++ b/drivers/phy/ingenic/phy-ingenic-usb.c @@ -201,7 +201,7 @@ static const struct phy_ops ingenic_usb_phy_ops = { .owner = THIS_MODULE, }; -static void jz4770_usb_phy_init(struct phy *phy) +static void jz4760_usb_phy_init(struct phy *phy) { struct ingenic_usb_phy *priv = phy_get_drvdata(phy); u32 reg; @@ -288,8 +288,8 @@ static void x2000_usb_phy_init(struct phy *phy) writel(reg, priv->base + REG_USBPCR_OFFSET); } -static const struct ingenic_soc_info jz4770_soc_info = { - .usb_phy_init = jz4770_usb_phy_init, +static const struct ingenic_soc_info jz4760_soc_info = { + .usb_phy_init = jz4760_usb_phy_init, }; static const struct ingenic_soc_info jz4775_soc_info = { @@ -363,7 +363,8 @@ static int ingenic_usb_phy_probe(struct platform_device *pdev) } static const struct of_device_id ingenic_usb_phy_of_matches[] = { - { .compatible = "ingenic,jz4770-phy", .data = &jz4770_soc_info }, + { .compatible = "ingenic,jz4760-phy", .data = &jz4760_soc_info }, + { .compatible = "ingenic,jz4770-phy", .data = &jz4760_soc_info }, { .compatible = "ingenic,jz4775-phy", .data = &jz4775_soc_info }, { .compatible = "ingenic,jz4780-phy", .data = &jz4780_soc_info }, { .compatible = "ingenic,x1000-phy", .data = &x1000_soc_info },