From patchwork Mon Feb 24 21:10:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 11401659 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00BF3159A for ; Mon, 24 Feb 2020 21:10:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB2CC222C2 for ; Mon, 24 Feb 2020 21:10:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XLfNCpXs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727952AbgBXVKn (ORCPT ); Mon, 24 Feb 2020 16:10:43 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40856 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727459AbgBXVKn (ORCPT ); Mon, 24 Feb 2020 16:10:43 -0500 Received: by mail-wr1-f65.google.com with SMTP id t3so12104340wru.7; Mon, 24 Feb 2020 13:10:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yy+X7DrHgGbuvo7Mx28qlKxTXUfj1P67Jn/BBZc/WKg=; b=XLfNCpXsrWvjZwCmy/Zo99J+1y8dgO5B5/o+wYElugvJj0BkMYjO30D1DJdrs1tCjQ 8jWBzkc/eD68T1JGA2Nbn5ayt/6xpwMBid4X+Bqzycyh92C5KT6o03ENWGqWkDRpwcs5 0Hdi+0aJWIVLq4+9TePmg/TRLLJTA4qpIdeMb5A4dt+Sp2Pov6xcT1VQK/7tFCGNmVFe nMoPLkJZBqkWdKrF9agGC+zb3aCWEWvXsjWGoi8qgh+yO9HjGSrayV1mTXqyqe/1f9hj 1Zzotv6GeeAjpmYlPBLURqmL5rIR+803nlcQPdwipqreTX+plwZVaEJNPlT4zwxYQCvP WHSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yy+X7DrHgGbuvo7Mx28qlKxTXUfj1P67Jn/BBZc/WKg=; b=GqwutCb7yY1gVIE/0bQSHM8yUr73mDzjoKiGpbJInbhnu8Y160C/ttCsnuewUNyvWe W8rmJkqnLD/1Fj9K1r/G20wEBkZwDThYcL+WlwexN8R/A7qnmgEvz+5PAFTHsfxNriyg /OeSQvJ5Ult7TRMVeoCJj1AfsFCNG90W+ZYk+rYX0fGyCnPzLqH9ZgKNbFtg6rkaBbM9 NxvkjkHCb3H/pF0QQSVp4SWE6ON4FL2Dph56U52eDJgSUBsHd3E2Q0rBH+vZhY0Mj6PX jjGNIKAzxUS5YGbrp5Z1qysqpU7UhUSY0OmgN+A7EF6AWMxk4/6LxrFwGNKbgr1gcRBK 5MEw== X-Gm-Message-State: APjAAAVIpJ2Noy2Xqd+HBObsFi6WIAnGTl6kUp7Qjke+E63xGwBj/HP6 G8yQJiR3K9+842bR+/A1W5Q= X-Google-Smtp-Source: APXvYqwpactMwwAc9SldXGTqY/9FGnHhtkz3TSQnJOPuxltn9o8CNNW4qRVWBv+BEyXXHzG766THcw== X-Received: by 2002:adf:82ef:: with SMTP id 102mr17341019wrc.23.1582578638971; Mon, 24 Feb 2020 13:10:38 -0800 (PST) Received: from Ansuel-XPS.localdomain (93-39-149-95.ip76.fastwebnet.it. [93.39.149.95]) by smtp.googlemail.com with ESMTPSA id i204sm917780wma.44.2020.02.24.13.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 13:10:38 -0800 (PST) From: Ansuel Smith Cc: Ansuel Smith , Christian Lamparter , Andy Gross , Bjorn Andersson , "David S. Miller" , Rob Herring , Mark Rutland , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Russell King , linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/2] net: mdio: add ipq8064 mdio driver Date: Mon, 24 Feb 2020 22:10:30 +0100 Message-Id: <20200224211035.16897-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Currently ipq806x soc use generic bitbang driver to comunicate with the gmac ethernet interface. Add a dedicated driver created by chunkeey to fix this. Signed-off-by: Christian Lamparter Co-developed-by: Christian Lamparter Signed-off-by: Ansuel Smith --- Changes in v7: - Add myself as module author and copyright - Reduced usleep_range to 8-10 as suggested by chunkeey Changes in v6: - Fix error in commit description - Add co-developed tag Changes in v5: - Rename define to more rappresentative name Changes in v4: - Fix wrong print value in dev_err Changes in v3: - Fix wrong return logic on error Changes in v2: - Use regmap_read_poll_timeout - Reject clause 45 drivers/net/phy/Kconfig | 8 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/mdio-ipq8064.c | 169 +++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+) create mode 100644 drivers/net/phy/mdio-ipq8064.c diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 9dabe03a668c..ec2a5493a7e8 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -157,6 +157,14 @@ config MDIO_I2C This is library mode. +config MDIO_IPQ8064 + tristate "Qualcomm IPQ8064 MDIO interface support" + depends on HAS_IOMEM && OF_MDIO + depends on MFD_SYSCON + help + This driver supports the MDIO interface found in the network + interface units of the IPQ8064 SoC + config MDIO_MOXART tristate "MOXA ART MDIO interface support" depends on ARCH_MOXART || COMPILE_TEST diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index fe5badf13b65..8f02bd2089f3 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o +obj-$(CONFIG_MDIO_IPQ8064) += mdio-ipq8064.o obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o obj-$(CONFIG_MDIO_MSCC_MIIM) += mdio-mscc-miim.o obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o diff --git a/drivers/net/phy/mdio-ipq8064.c b/drivers/net/phy/mdio-ipq8064.c new file mode 100644 index 000000000000..9713d6e8c076 --- /dev/null +++ b/drivers/net/phy/mdio-ipq8064.c @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Qualcomm IPQ8064 MDIO interface driver + * + * Copyright (C) 2019 Christian Lamparter + * Copyright (C) 2020 Ansuel Smith + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* MII address register definitions */ +#define MII_ADDR_REG_ADDR 0x10 +#define MII_BUSY BIT(0) +#define MII_WRITE BIT(1) +#define MII_CLKRANGE_60_100M (0 << 2) +#define MII_CLKRANGE_100_150M (1 << 2) +#define MII_CLKRANGE_20_35M (2 << 2) +#define MII_CLKRANGE_35_60M (3 << 2) +#define MII_CLKRANGE_150_250M (4 << 2) +#define MII_CLKRANGE_250_300M (5 << 2) +#define MII_CLKRANGE_MASK GENMASK(4, 2) +#define MII_REG_SHIFT 6 +#define MII_REG_MASK GENMASK(10, 6) +#define MII_ADDR_SHIFT 11 +#define MII_ADDR_MASK GENMASK(15, 11) + +#define MII_DATA_REG_ADDR 0x14 + +#define MII_MDIO_DELAY_USEC (1000) +#define MII_MDIO_RETRY_MSEC (10) + +struct ipq8064_mdio { + struct regmap *base; /* NSS_GMAC0_BASE */ +}; + +static int +ipq8064_mdio_wait_busy(struct ipq8064_mdio *priv) +{ + u32 busy; + + return regmap_read_poll_timeout(priv->base, MII_ADDR_REG_ADDR, busy, + !(busy & MII_BUSY), MII_MDIO_DELAY_USEC, + MII_MDIO_RETRY_MSEC * USEC_PER_MSEC); +} + +static int +ipq8064_mdio_read(struct mii_bus *bus, int phy_addr, int reg_offset) +{ + struct ipq8064_mdio *priv = bus->priv; + u32 miiaddr = MII_BUSY | MII_CLKRANGE_250_300M; + u32 ret_val; + int err; + + /* Reject clause 45 */ + if (reg_offset & MII_ADDR_C45) + return -EOPNOTSUPP; + + miiaddr |= ((phy_addr << MII_ADDR_SHIFT) & MII_ADDR_MASK) | + ((reg_offset << MII_REG_SHIFT) & MII_REG_MASK); + + regmap_write(priv->base, MII_ADDR_REG_ADDR, miiaddr); + usleep_range(8, 10); + + err = ipq8064_mdio_wait_busy(priv); + if (err) + return err; + + regmap_read(priv->base, MII_DATA_REG_ADDR, &ret_val); + return (int)ret_val; +} + +static int +ipq8064_mdio_write(struct mii_bus *bus, int phy_addr, int reg_offset, u16 data) +{ + struct ipq8064_mdio *priv = bus->priv; + u32 miiaddr = MII_WRITE | MII_BUSY | MII_CLKRANGE_250_300M; + + /* Reject clause 45 */ + if (reg_offset & MII_ADDR_C45) + return -EOPNOTSUPP; + + regmap_write(priv->base, MII_DATA_REG_ADDR, data); + + miiaddr |= ((phy_addr << MII_ADDR_SHIFT) & MII_ADDR_MASK) | + ((reg_offset << MII_REG_SHIFT) & MII_REG_MASK); + + regmap_write(priv->base, MII_ADDR_REG_ADDR, miiaddr); + usleep_range(8, 10); + + return ipq8064_mdio_wait_busy(priv); +} + +static int +ipq8064_mdio_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct ipq8064_mdio *priv; + struct mii_bus *bus; + int ret; + + bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*priv)); + if (!bus) + return -ENOMEM; + + bus->name = "ipq8064_mdio_bus"; + bus->read = ipq8064_mdio_read; + bus->write = ipq8064_mdio_write; + snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(&pdev->dev)); + bus->parent = &pdev->dev; + + priv = bus->priv; + priv->base = syscon_node_to_regmap(np); + if (IS_ERR(priv->base) && priv->base != ERR_PTR(-EPROBE_DEFER)) + priv->base = syscon_regmap_lookup_by_phandle(np, "master"); + + if (priv->base == ERR_PTR(-EPROBE_DEFER)) { + return -EPROBE_DEFER; + } else if (IS_ERR(priv->base)) { + dev_err(&pdev->dev, "error getting syscon regmap, error=%pe\n", + priv->base); + return PTR_ERR(priv->base); + } + + ret = of_mdiobus_register(bus, np); + if (ret) + return ret; + + platform_set_drvdata(pdev, bus); + return 0; +} + +static int +ipq8064_mdio_remove(struct platform_device *pdev) +{ + struct mii_bus *bus = platform_get_drvdata(pdev); + + mdiobus_unregister(bus); + + return 0; +} + +static const struct of_device_id ipq8064_mdio_dt_ids[] = { + { .compatible = "qcom,ipq8064-mdio" }, + { } +}; +MODULE_DEVICE_TABLE(of, ipq8064_mdio_dt_ids); + +static struct platform_driver ipq8064_mdio_driver = { + .probe = ipq8064_mdio_probe, + .remove = ipq8064_mdio_remove, + .driver = { + .name = "ipq8064-mdio", + .of_match_table = ipq8064_mdio_dt_ids, + }, +}; + +module_platform_driver(ipq8064_mdio_driver); + +MODULE_DESCRIPTION("Qualcomm IPQ8064 MDIO interface driver"); +MODULE_AUTHOR("Christian Lamparter "); +MODULE_AUTHOR("Ansuel Smith "); +MODULE_LICENSE("GPL"); From patchwork Mon Feb 24 21:10:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 11401677 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC78C14BC for ; Mon, 24 Feb 2020 21:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBBBD21927 for ; Mon, 24 Feb 2020 21:10:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mEQqfu/s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727459AbgBXVKx (ORCPT ); Mon, 24 Feb 2020 16:10:53 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38255 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728020AbgBXVKq (ORCPT ); Mon, 24 Feb 2020 16:10:46 -0500 Received: by mail-wm1-f68.google.com with SMTP id a9so853098wmj.3; Mon, 24 Feb 2020 13:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6yWM1dVY3KXj+nN/ReZRFLyP/i4t8gAHjBcXNGyYMFQ=; b=mEQqfu/sa9O0wq9FoZjyB9hUTWBa49Do30CEHoosU8I3drOeyns0gC/iuheDQyubhm OCXQE1qe58xL9PnsLfZizKbQTBlmKJ/l1QCnoY2mfh/jp1+q1yDELzhrbKHUsgt0Lk7K GldgrHtK+7B4E+tmjmJexuQkBHi2+zfJrD9rv9kQQMTJ/2zX+uNqRCvWmRK6ttUMge1/ dXw7z78dorngi9f4d6Jh4a7/WP8EEeg12oTS04V5Vi5NnkDP6s+9pYPrkdQ0AnqmSO+5 o9X2tvRJX0BnfdaoiPMOjLgp0NRIpowhse0FOEZE0w5owUentgkd03jn41a80cUR3/wf RCHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6yWM1dVY3KXj+nN/ReZRFLyP/i4t8gAHjBcXNGyYMFQ=; b=YNRHL2qps+WJDv4pKxNdCtyfRueL9W7q7W3Ejh2qi5MAQC//qnqNp8LdJ2SMNDUbX2 Dw+iHXDFctkwhzouwSRFhX+tHUkZgeOiMWSLWVMIJsjjkyi6/V8I/J9ZfTxeJajfTcUV 6WXWMJldqhDoi5SX0IVVaFxBWM73cuy8If/c0mscQMCEqVewMQbbJ4r8zVlfE+2kZtSk RBllxOJfoV7zxpnUsQRDtC8+Pjk/cewfzR5O0C5aqYVw8zVsI1m5BAiZYt4eU3TDKXOH Lp+CbbNz4zGALXX/DGyu5KSoVcYgtp9O9MFAV5R1J3AUoVJ+C8gM2DIoYw8Irma9S0LX QJ3w== X-Gm-Message-State: APjAAAW7UZXVd0g8BYl0+pGIh/RlfhWiv4FGQD8jtav0xLat7YKtuI8l AcJCpDB/jWFz35ig0BQo9Xs= X-Google-Smtp-Source: APXvYqz9cj0t68TUy8GusArQPezxkC+gx4AYZMHTOs3PD80Kjlhjopv9YCUoeEh7xdXJ1rKrFGO04Q== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr938547wmo.13.1582578642434; Mon, 24 Feb 2020 13:10:42 -0800 (PST) Received: from Ansuel-XPS.localdomain (93-39-149-95.ip76.fastwebnet.it. [93.39.149.95]) by smtp.googlemail.com with ESMTPSA id i204sm917780wma.44.2020.02.24.13.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 13:10:41 -0800 (PST) From: Ansuel Smith Cc: Ansuel Smith , Andy Gross , Bjorn Andersson , "David S. Miller" , Rob Herring , Mark Rutland , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Russell King , linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/2] Documentation: devictree: Add ipq806x mdio bindings Date: Mon, 24 Feb 2020 22:10:31 +0100 Message-Id: <20200224211035.16897-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200224211035.16897-1-ansuelsmth@gmail.com> References: <20200224211035.16897-1-ansuelsmth@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add documentations for ipq806x mdio driver. Signed-off-by: Ansuel Smith --- Changes in v7: - Fix dt_binding_check problem .../bindings/net/qcom,ipq8064-mdio.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml diff --git a/Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml b/Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml new file mode 100644 index 000000000000..3178cbfdc661 --- /dev/null +++ b/Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml @@ -0,0 +1,55 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/qcom,ipq8064-mdio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm ipq806x MDIO bus controller + +maintainers: + - Ansuel Smith + +description: |+ + The ipq806x soc have a MDIO dedicated controller that is + used to comunicate with the gmac phy conntected. + Child nodes of this MDIO bus controller node are standard + Ethernet PHY device nodes as described in + Documentation/devicetree/bindings/net/phy.txt + +allOf: + - $ref: "mdio.yaml#" + +properties: + compatible: + const: qcom,ipq8064-mdio + reg: + maxItems: 1 + description: address and length of the register set for the device + clocks: + maxItems: 1 + description: A reference to the clock supplying the MDIO bus controller + +required: + - compatible + - reg + - clocks + - "#address-cells" + - "#size-cells" + +examples: + - | + mdio0: mdio@37000000 { + #address-cells = <1>; + #size-cells = <0>; + + compatible = "qcom,ipq8064-mdio", "syscon"; + reg = <0x37000000 0x200000>; + resets = <&gcc GMAC_CORE1_RESET>; + reset-names = "stmmaceth"; + clocks = <&gcc GMAC_CORE1_CLK>; + + switch@10 { + compatible = "qca,qca8337"; + /* ... */ + }; + };