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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 5F187C2B9F2 for ; Sat, 22 May 2021 23:23:06 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45DD4610FA for ; Sat, 22 May 2021 23:23:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45DD4610FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CD6B82AC8; Sun, 23 May 2021 01:23:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ttu86ZwW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1C7A82AF3; Sun, 23 May 2021 01:22:59 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 22EB981CDE for ; Sun, 23 May 2021 01:22:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rehn.andreas86@gmail.com Received: by mail-wr1-x432.google.com with SMTP id x8so24588626wrq.9 for ; Sat, 22 May 2021 16:22:57 -0700 (PDT) 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=VMGPTt2QeJhvY6eHw/YdISGi+76MsxNeA1bei/hWlso=; b=ttu86ZwWLoHwlM9yCia0c42J+W91ZwR08zuB2M6Wnh9Zr8/eQZYJ6sgwYvkQWbz0po SNMDO3ONtRC504FVxAkL/ikAw01xt8s88djiNkmpBdROkTwH5vxUn/IJK8GE9HsUEJ2x ErYATUdA+LQsgu3tEddDXgrBDNpmrNe56K25ZbEWBejQHBwe/Ri6CWckaBNGBrIIILKf ueY9a9dTL7BuQuX5UU3SYA2EbEcGdHPP0qMueB4F2cTBMO3l//otfKHUgJiTztDGNu34 3/p0jPOCETiUuyJ34C1Y6yEiWhs2fz3C4MZnR9YZnPZb3cfbXLFNxixhj7IKp8Y6OjzA yumg== 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=VMGPTt2QeJhvY6eHw/YdISGi+76MsxNeA1bei/hWlso=; b=H8dlg+FFPfHigzO2fs05vTkFPNmcEG1QU65R0B1EivQMG6MxsXd0XF2896lnVcYb2L Jc7cmFAQDQBbG6m6jC04LzrgFT5Rl9oUvZMXlJp4L5Wk3NAhIjewjNTfM8lSv5ysstRj qn+utrvSIJpdzNV9MP9ZL75NjVucANXAG4ePJo01uA7wn1gl3GXcdFekszGaV9C1U2W+ 1hkdbctArkEnFKOSV31SakkzysX5de8NmzV2Se2VeNHhpBOdQNhp2EKenQYqotzWVkf8 r9rG8ChXMzNGY4F8XRTK5gl1+4WFlR/4YiBspuEoGhvjphn1RaFYizMzj+QfGSW2SuD7 WSrQ== X-Gm-Message-State: AOAM531oyLnBVNKE9KplL9hjyIZCNsDmBZgSdSxRGJ8eX03G6feMEU0f MgZdbSV09zg5+PHHrEIdLPU= X-Google-Smtp-Source: ABdhPJwJqx3JsLpjo15p1XmypL1I+rIZz+lgIGNGC3YNHFOt9EQfv8cXsLW67DwSEUueQz5aJdc11Q== X-Received: by 2002:adf:dc8a:: with SMTP id r10mr15273617wrj.119.1621725775655; Sat, 22 May 2021 16:22:55 -0700 (PDT) Received: from flex-5.fritz.box (dynamic-077-012-139-231.77.12.pool.telefonica.de. [77.12.139.231]) by smtp.gmail.com with ESMTPSA id v12sm6616930wrv.76.2021.05.22.16.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 May 2021 16:22:55 -0700 (PDT) From: Andreas Rehn To: hdegoede@redhat.com, jagan@amarulasolutions.com, andre.przywara@arm.com Cc: icenowy@aosc.io, u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Andreas Rehn Subject: [PATCH v2 4/6] net: sun8i-emac: add v3s variant Date: Sun, 23 May 2021 01:22:38 +0200 Message-Id: <20210522232238.201303-1-rehn.andreas86@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210519194208.515548-5-rehn.andreas86@gmail.com> References: <20210519194208.515548-5-rehn.andreas86@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Add variant V3S_EMAC. Handle pinmux compile time error by skipping goio setup, because V3s uses internal phy and don't expose pins. Signed-off-by: Andreas Rehn --- Changes in v2: - skip pinmux and add proper description - Add V3S variant add it to compatible list - Skip (R)GMII flags and handle sun8i_handle_internal_phy drivers/net/sun8i_emac.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 5a1b38bf80..ab9f61994c 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -145,6 +145,7 @@ enum emac_variant { A64_EMAC, R40_GMAC, H6_EMAC, + V3S_EMAC, }; struct emac_dma_desc { @@ -303,7 +304,7 @@ static void sun8i_adjust_link(struct emac_eth_dev *priv, static u32 sun8i_emac_set_syscon_ephy(struct emac_eth_dev *priv, u32 reg) { if (priv->use_internal_phy) { - /* H3 based SoC's that has an Internal 100MBit PHY + /* H3 and V3s based SoC's that has an Internal 100MBit PHY * needs to be configured and powered up before use */ reg &= ~H3_EPHY_DEFAULT_MASK; @@ -354,7 +355,8 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata, case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: - reg |= SC_EPIT | SC_ETCS_INT_GMII; + if (priv->variant != V3S_EMAC) + reg |= SC_EPIT | SC_ETCS_INT_GMII; break; case PHY_INTERFACE_MODE_RMII: if (priv->variant == H3_EMAC || @@ -566,6 +568,10 @@ static int parse_phy_pins(struct udevice *dev) iomux = SUN8I_IOMUX; else if (IS_ENABLED(CONFIG_MACH_SUN50I)) iomux = SUN8I_IOMUX; + else if (IS_ENABLED(CONFIG_MACH_SUN8I_V3S)) + // V3s does not expose any MAC pins, + // but case is required to handle BUILD_BUG_ON_MSG. + return 0; else BUILD_BUG_ON_MSG(1, "missing pinmux value for Ethernet pins"); @@ -956,7 +962,8 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) return -EINVAL; } - if (priv->variant == H3_EMAC) { + if (priv->variant == H3_EMAC || + priv->variant == V3S_EMAC) { ret = sun8i_handle_internal_phy(dev, priv); if (ret) return ret; @@ -1009,6 +1016,8 @@ static const struct udevice_id sun8i_emac_eth_ids[] = { .data = (uintptr_t)R40_GMAC }, {.compatible = "allwinner,sun50i-h6-emac", .data = (uintptr_t)H6_EMAC }, + {.compatible = "allwinner,sun8i-v3s-emac", + .data = (uintptr_t)V3S_EMAC }, { } }; -- 2.25.1