From patchwork Mon Apr 12 03:42:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 12196721 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.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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=unavailable 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 4A001C433B4 for ; Mon, 12 Apr 2021 03:43:13 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE0136109E for ; Mon, 12 Apr 2021 03:43:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE0136109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=a6exVokofdE1W35xfIlLDCFRj6fEGaVyeY8OWdt2oJw=; b=Xj9RLJVctjeYHutXxbI0bhhHi OW3QEkRJxg9psh/9oRnj3JkDkLJu3jmskhaGS4PJdU0TcGsYQjiVV5Bqrk+OJGbQx8cfmrCnXY/AW YMHST9MOTsJn1wnZ+tSOVjTNOrlPHEOwE+6Zs7YzNtUIBl8J3PhfvdIecfAvQLAAsbFfM19+xYmha kU6d4YSaMpHFljTPSg6MPCML1l6U6P4kpD9YILEREgso+45Y9AVOgxNfOb5jxa/pbEFFbXGjuPvx0 SPX5lG/QupLpRUWwVJxacSeagV8xHedO1cATziFBG2D7iJ2TVblxtVT9PQh9W3vopeRslpwwah4Si Hlnf3aXBw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTY-005cBU-Kv; Mon, 12 Apr 2021 03:43:00 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTW-005cBJ-N1 for linux-mediatek@desiato.infradead.org; Mon, 12 Apr 2021 03:42:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=yZ5W7oXdZ8SNpPNFFttOnaomBLVx/4n5LPa5t4ANWJ0=; b=qVEbdcfXVBJ7u5U+2NOKuFMOcu ZITyMMUo6+eHNZQW5DvnE871jvskMh0dsjiCylllCKR2pPPTxkor5tcxvcnt0RpaVsyN6x1gfp2F2 4GCwuKItRVRvfTWhBiKh+/3iVuLFxXje5SBuTeilxqRRqsTmCJoAs6rOn5FuE2R5VNJrEwosx090r +p+dZJQf6H77rbvY+27MDbCckhi2uO0YQ7Xc0cTY+7MR2v3itY9sOwGoSMC1XyjLdzxGoeCIoPVc8 DXnuAqXEXqgpdxPSC1+Z1dM3aMWMHWGCoPPy4J6pgvZjlbyFu0V/HwIt1ujXfkxlN25aTIrhD1roa MFqdrR1A==; Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTU-005rRf-2P for linux-mediatek@lists.infradead.org; Mon, 12 Apr 2021 03:42:57 +0000 Received: by mail-pf1-x42f.google.com with SMTP id d124so8293875pfa.13 for ; Sun, 11 Apr 2021 20:42:55 -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=yZ5W7oXdZ8SNpPNFFttOnaomBLVx/4n5LPa5t4ANWJ0=; b=Q7B9AjeF9NMppAnZgPBNLnRMqmdegsCdvq2YpRpbdrse+fuZaDv5zijjMghvi4MwlL fe1IVZN1jikUJWBsSUm5yl7bGGePathlCm5raqrH3Az1+n/A4YFEvCG0JqRdl9aX31r5 ByWNu2Sg/Y1sZD3EIod8MP2xOwdocVzTODczQncAueE6bhp6RZvpji2g+GTN6EYivneg roU/1XdizOS0Bw9+biWE0pI0pbFedGIUaET2ZemZ4yBY/aCNdDestY0EXNWpEWPZRlE4 GJdDTJ785fYMAI611M22NEVDDptx2qGuYyQj/2/EEfnmcnsOycijsn4jQi3l+3HWqIq9 WmKg== 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=yZ5W7oXdZ8SNpPNFFttOnaomBLVx/4n5LPa5t4ANWJ0=; b=HXEgM0APyCmj+UfWSJrpSsc5ilfRN+0mhUCP71sY/iz3Z3JzExyQBiiIR4uZkkWgsb 9f91BJrY29qAC0O8azQ4vWU7DH29I1MNgRM5+zKM8AvkU2VXha8nrdIt1AWW1ZYsyojy zBOTt1pUAphh6AgbzKE2FwnhnW0qYF7Om1ZOKY65/tHy1GKgHCYT96NVrCu7udjQ1kFK NfB+d9KEdTPmnnM/suGJIbeylmmkmQhcnjcIjZY+kOCoYWW7ehblNS9bMMoChW25DNI+ GiUXoGjOdkjapeF6kcviOWRK1WEGIcHs+zOZF6PQDRvFVb7OsatHo+hF/tGbpW4XtkSP Cmew== X-Gm-Message-State: AOAM530tf9zexmtH7a4PreOVWzUs5O+BpWPc9NKpwdfE+pdpcoOqnk69 yCD7HXFYIrU8KhJKCzfs0Sc= X-Google-Smtp-Source: ABdhPJwsvYhO4IziErJNUYCF3KDQeyuFzX4kE9/W+LyP7lyWchgraQcVo8Bm+Ia4zNVEPLv3dLDbmA== X-Received: by 2002:aa7:8817:0:b029:24e:bb8:46e1 with SMTP id c23-20020aa788170000b029024e0bb846e1mr1293952pfo.0.1618198975316; Sun, 11 Apr 2021 20:42:55 -0700 (PDT) Received: from localhost.localdomain ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id v22sm5387185pff.105.2021.04.11.20.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Apr 2021 20:42:54 -0700 (PDT) From: DENG Qingfang To: "David S. Miller" , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jakub Kicinski , Landen Chao , Matthias Brugger , Russell King , Sean Wang , Vivien Didelot , Vladimir Oltean , Rob Herring , Linus Walleij , Greg Kroah-Hartman , Sergio Paracuellos , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: Weijie Gao , Chuanhong Guo , =?utf-8?q?Ren=C3=A9_van_Dorst?= , Frank Wunderlich , Thomas Gleixner , Marc Zyngier Subject: [RFC v4 net-next 1/4] net: phy: add MediaTek PHY driver Date: Mon, 12 Apr 2021 11:42:34 +0800 Message-Id: <20210412034237.2473017-2-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210412034237.2473017-1-dqfext@gmail.com> References: <20210412034237.2473017-1-dqfext@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210411_204256_133202_F337D9C7 X-CRM114-Status: GOOD ( 19.32 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add support for MediaTek PHYs found in MT7530 and MT7531 switches. The initialization procedure is from the vendor driver, but due to lack of documentation, the function of some register values remains unknown. Signed-off-by: DENG Qingfang --- RFC v3 -> RFC v4: - Remove unused include. drivers/net/phy/Kconfig | 5 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/mediatek.c | 111 +++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 drivers/net/phy/mediatek.c diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index a615b3660b05..edd858cec9ec 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -207,6 +207,11 @@ config MARVELL_88X2222_PHY Support for the Marvell 88X2222 Dual-port Multi-speed Ethernet Transceiver. +config MEDIATEK_PHY + tristate "MediaTek PHYs" + help + Supports the MediaTek switch integrated PHYs. + config MICREL_PHY tristate "Micrel PHYs" help diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index de683e3abe63..9ed7dbab7770 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_LXT_PHY) += lxt.o obj-$(CONFIG_MARVELL_10G_PHY) += marvell10g.o obj-$(CONFIG_MARVELL_PHY) += marvell.o obj-$(CONFIG_MARVELL_88X2222_PHY) += marvell-88x2222.o +obj-$(CONFIG_MEDIATEK_PHY) += mediatek.o obj-$(CONFIG_MESON_GXL_PHY) += meson-gxl.o obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o obj-$(CONFIG_MICREL_PHY) += micrel.o diff --git a/drivers/net/phy/mediatek.c b/drivers/net/phy/mediatek.c new file mode 100644 index 000000000000..1627b7c04345 --- /dev/null +++ b/drivers/net/phy/mediatek.c @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include +#include + +#define MTK_EXT_PAGE_ACCESS 0x1f +#define MTK_PHY_PAGE_STANDARD 0x0000 +#define MTK_PHY_PAGE_EXTENDED 0x0001 +#define MTK_PHY_PAGE_EXTENDED_2 0x0002 +#define MTK_PHY_PAGE_EXTENDED_3 0x0003 +#define MTK_PHY_PAGE_EXTENDED_2A30 0x2a30 +#define MTK_PHY_PAGE_EXTENDED_52B5 0x52b5 + +static int mtk_phy_read_page(struct phy_device *phydev) +{ + return __phy_read(phydev, MTK_EXT_PAGE_ACCESS); +} + +static int mtk_phy_write_page(struct phy_device *phydev, int page) +{ + return __phy_write(phydev, MTK_EXT_PAGE_ACCESS, page); +} + +static void mtk_phy_config_init(struct phy_device *phydev) +{ + /* Disable EEE */ + phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); + + /* Enable HW auto downshift */ + phy_modify_paged(phydev, MTK_PHY_PAGE_EXTENDED, 0x14, 0, BIT(4)); + + /* Increase SlvDPSready time */ + phy_select_page(phydev, MTK_PHY_PAGE_EXTENDED_52B5); + __phy_write(phydev, 0x10, 0xafae); + __phy_write(phydev, 0x12, 0x2f); + __phy_write(phydev, 0x10, 0x8fae); + phy_restore_page(phydev, MTK_PHY_PAGE_STANDARD, 0); + + /* Adjust 100_mse_threshold */ + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x123, 0xffff); + + /* Disable mcc */ + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0xa6, 0x300); +} + +static int mt7530_phy_config_init(struct phy_device *phydev) +{ + mtk_phy_config_init(phydev); + + /* Increase post_update_timer */ + phy_write_paged(phydev, MTK_PHY_PAGE_EXTENDED_3, 0x11, 0x4b); + + return 0; +} + +static int mt7531_phy_config_init(struct phy_device *phydev) +{ + if (phydev->interface != PHY_INTERFACE_MODE_INTERNAL) + return -EINVAL; + + mtk_phy_config_init(phydev); + + /* PHY link down power saving enable */ + phy_set_bits(phydev, 0x17, BIT(4)); + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, 0xc6, 0x300); + + /* Set TX Pair delay selection */ + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x13, 0x404); + phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x14, 0x404); + + return 0; +} + +static struct phy_driver mtk_phy_driver[] = { + { + PHY_ID_MATCH_EXACT(0x03a29412), + .name = "MediaTek MT7530 PHY", + .config_init = mt7530_phy_config_init, + /* Interrupts are handled by the switch, not the PHY + * itself. + */ + .config_intr = genphy_no_config_intr, + .handle_interrupt = genphy_handle_interrupt_no_ack, + .read_page = mtk_phy_read_page, + .write_page = mtk_phy_write_page, + }, + { + PHY_ID_MATCH_EXACT(0x03a29441), + .name = "MediaTek MT7531 PHY", + .config_init = mt7531_phy_config_init, + /* Interrupts are handled by the switch, not the PHY + * itself. + */ + .config_intr = genphy_no_config_intr, + .handle_interrupt = genphy_handle_interrupt_no_ack, + .read_page = mtk_phy_read_page, + .write_page = mtk_phy_write_page, + }, +}; + +module_phy_driver(mtk_phy_driver); + +static struct mdio_device_id __maybe_unused mtk_phy_tbl[] = { + { PHY_ID_MATCH_VENDOR(0x03a29400) }, + { } +}; + +MODULE_DESCRIPTION("MediaTek switch integrated PHY driver"); +MODULE_AUTHOR("DENG, Qingfang "); +MODULE_LICENSE("GPL"); + +MODULE_DEVICE_TABLE(mdio, mtk_phy_tbl); From patchwork Mon Apr 12 03:42:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 12196723 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.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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=unavailable 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 C3AB0C433B4 for ; Mon, 12 Apr 2021 03:43:20 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4DDD16120D for ; Mon, 12 Apr 2021 03:43:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DDD16120D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=pfh+ajpoYrD/EsxtRyZX50/fZglzdlVL1JkG6R+hXO0=; b=cTJojNwHJQxR4ySZ76//i/dZL jrD3zuiBPpwfglPw1cmqw9jB5XROybe8iNHe70LvRCZUocSpr12dK0D+TxX5Ij0pqYfKVKFW01A5w 0qw8c1oqHwS9qAMydMsksPy3yqRHGXQYlQjWTicoSt6teGwbpg8v6SJY0Egyqu9qFYj3hBwlVjeQW PsomDU45atArIzfV+t4BBbud0vIhGLlxozqe9v/vqHIc+f/XgACv4GnGLp12/q21yKTgQD1muico+ Jx3KEu2qoo3szF0QEvXw3hqv+XtjgIpdRNukqmW7c0JO76TywZ3aBCGhMXFhFisihJ0ROwzv0oQ0z 2e/yFJKfQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTh-005cCQ-2w; Mon, 12 Apr 2021 03:43:09 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTe-005cC9-Qr for linux-mediatek@desiato.infradead.org; Mon, 12 Apr 2021 03:43:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=5iVy9Qcyd/0kvs5rJnuGEArCW/7WVX29m/AJAXhyoBk=; b=fKBji6nGdTVeOKFpqj8xa7r9GK zb60v5WqW4k/SzvZLTxzzhf8zk+GLta3Zr3mqRP6hgoFxRU1m7MJ+KOnm4bX/E888P4TeIO/ED66p xe3jcrw5uTeEBd2JlXsoLuS7kZeOtxfHBOvoZgXhCWSxPIpW05AnzByS3iZZjgf9hBHgVFoVZlpgI Fdzfqz2W7Ya42SuoE26VuG9BGc6Fqph3Uzm1HexDIdc4yGtQZJbYyzkU0zxsVE0gbLzn964IzSoz/ nwa2JviM5RmFLWj+xXfShRFN0J+mGdBVTHV9jxAMg2icO7g7ngfRjKPtMMGwy30cG5Xtq4J7BQmJe IVqvDUog==; Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTb-005rSc-K5 for linux-mediatek@lists.infradead.org; Mon, 12 Apr 2021 03:43:05 +0000 Received: by mail-pj1-x102a.google.com with SMTP id e8-20020a17090a7288b029014e51f5a6baso1028336pjg.2 for ; Sun, 11 Apr 2021 20:43:03 -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=5iVy9Qcyd/0kvs5rJnuGEArCW/7WVX29m/AJAXhyoBk=; b=PZsgk8IRMw6NlE4y40V8k5hOpnQ9c6JZac2VHiKop8XGj5yUyePy17NrpAqXAkaBIg 1FB2R1Boop42pdUP+IbWUro2DSD3ilxyYBdkF1EzzQMe19yQLk85DyuRn4ljpy0prHQQ 8j6PiYIjjrZanrDgIphHxQ+Pn5HQdh1mtBhETj5pIk75BTbV/k42Ml5RPFGl3nQ3YmNm ZZcN+p01de2vSS/fq5u7zR2EcwjQY4MXcBcrmm/rkwejHQOeOvS0Nkm55sz4lA3/kguE IPHtmlpm2ensTbJfH7bUX10JVZpP5rh1IopC2azD+YWpqP03YgCALY3EDseXJmfBRBvC 5R6g== 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=5iVy9Qcyd/0kvs5rJnuGEArCW/7WVX29m/AJAXhyoBk=; b=nleJ11TjRcJf9UlKFN9I3b1cys8TVLSFHKgOEBifam0Nk79IkXDYj5I9mRoBm7khVw r3kN6bln+Gh1dX63URHap1bDaQZsAoQIy1ib5NS/fG3ZNP7xFNmsykazuJTzsqQV+Nm5 tyuSBjfJLHyUhK53Kwhz/tfR4zDfLrBIRo4d0Sr15uDJamYOYuM86tyoOItgflxGB1U4 tf39nfYwBDJ9OBNUaEFc3h4hUWgPf8p+cCfzYEwS7YCzbWkBiKUsfRFbJgwSPJSG9qyP ZiR4XZQgadubJsx/6JuifpAUgifsL5io/Z065blRG8S3M42MwVqjiVnljhKkB1yhzX5j Zsrw== X-Gm-Message-State: AOAM533od5CYvWj6VjTEOLrzTfJALUu5ZE1PwPDp/dZ7Lbf/UUN8sVBf h9nR4x1bVKQtWcYPhjthMoo= X-Google-Smtp-Source: ABdhPJyGJKPqTcB2WhCGQqxU3A0XXNr8MxsG2Glnt/Rly/I9okZWOsVIhOwHcwpcEUtrRLjB1S4XyA== X-Received: by 2002:a17:902:d305:b029:ea:db56:e7d with SMTP id b5-20020a170902d305b02900eadb560e7dmr7322836plc.66.1618198983108; Sun, 11 Apr 2021 20:43:03 -0700 (PDT) Received: from localhost.localdomain ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id v22sm5387185pff.105.2021.04.11.20.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Apr 2021 20:43:02 -0700 (PDT) From: DENG Qingfang To: "David S. Miller" , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jakub Kicinski , Landen Chao , Matthias Brugger , Russell King , Sean Wang , Vivien Didelot , Vladimir Oltean , Rob Herring , Linus Walleij , Greg Kroah-Hartman , Sergio Paracuellos , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: Weijie Gao , Chuanhong Guo , =?utf-8?q?Ren=C3=A9_van_Dorst?= , Frank Wunderlich , Thomas Gleixner , Marc Zyngier Subject: [RFC v4 net-next 2/4] net: dsa: mt7530: add interrupt support Date: Mon, 12 Apr 2021 11:42:35 +0800 Message-Id: <20210412034237.2473017-3-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210412034237.2473017-1-dqfext@gmail.com> References: <20210412034237.2473017-1-dqfext@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210411_204303_689019_90E85E86 X-CRM114-Status: GOOD ( 27.22 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add support for MT7530 interrupt controller to handle internal PHYs. In order to assign an IRQ number to each PHY, the registration of MDIO bus is also done in this driver. Signed-off-by: DENG Qingfang --- RFC v3 -> RFC v4: - No changes. drivers/net/dsa/Kconfig | 1 + drivers/net/dsa/mt7530.c | 266 +++++++++++++++++++++++++++++++++++---- drivers/net/dsa/mt7530.h | 20 ++- 3 files changed, 258 insertions(+), 29 deletions(-) diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index a5f1aa911fe2..264384449f09 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -36,6 +36,7 @@ config NET_DSA_LANTIQ_GSWIP config NET_DSA_MT7530 tristate "MediaTek MT753x and MT7621 Ethernet switch support" select NET_DSA_TAG_MTK + select MEDIATEK_PHY help This enables support for the MediaTek MT7530, MT7531, and MT7621 Ethernet switch chips. diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 2bd1bab71497..da033004a74d 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -596,18 +597,14 @@ mt7530_mib_reset(struct dsa_switch *ds) mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE); } -static int mt7530_phy_read(struct dsa_switch *ds, int port, int regnum) +static int mt7530_phy_read(struct mt7530_priv *priv, int port, int regnum) { - struct mt7530_priv *priv = ds->priv; - return mdiobus_read_nested(priv->bus, port, regnum); } -static int mt7530_phy_write(struct dsa_switch *ds, int port, int regnum, +static int mt7530_phy_write(struct mt7530_priv *priv, int port, int regnum, u16 val) { - struct mt7530_priv *priv = ds->priv; - return mdiobus_write_nested(priv->bus, port, regnum, val); } @@ -785,9 +782,8 @@ mt7531_ind_c22_phy_write(struct mt7530_priv *priv, int port, int regnum, } static int -mt7531_ind_phy_read(struct dsa_switch *ds, int port, int regnum) +mt7531_ind_phy_read(struct mt7530_priv *priv, int port, int regnum) { - struct mt7530_priv *priv = ds->priv; int devad; int ret; @@ -803,10 +799,9 @@ mt7531_ind_phy_read(struct dsa_switch *ds, int port, int regnum) } static int -mt7531_ind_phy_write(struct dsa_switch *ds, int port, int regnum, +mt7531_ind_phy_write(struct mt7530_priv *priv, int port, int regnum, u16 data) { - struct mt7530_priv *priv = ds->priv; int devad; int ret; @@ -822,6 +817,22 @@ mt7531_ind_phy_write(struct dsa_switch *ds, int port, int regnum, return ret; } +static int +mt753x_phy_read(struct mii_bus *bus, int port, int regnum) +{ + struct mt7530_priv *priv = bus->priv; + + return priv->info->phy_read(priv, port, regnum); +} + +static int +mt753x_phy_write(struct mii_bus *bus, int port, int regnum, u16 val) +{ + struct mt7530_priv *priv = bus->priv; + + return priv->info->phy_write(priv, port, regnum, val); +} + static void mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data) @@ -1828,6 +1839,211 @@ mt7530_setup_gpio(struct mt7530_priv *priv) } #endif /* CONFIG_GPIOLIB */ +static irqreturn_t +mt7530_irq_thread_fn(int irq, void *dev_id) +{ + struct mt7530_priv *priv = dev_id; + bool handled = false; + u32 val; + int p; + + mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED); + val = mt7530_mii_read(priv, MT7530_SYS_INT_STS); + mt7530_mii_write(priv, MT7530_SYS_INT_STS, val); + mutex_unlock(&priv->bus->mdio_lock); + + for (p = 0; p < MT7530_NUM_PHYS; p++) { + if (BIT(p) & val) { + unsigned int irq; + + irq = irq_find_mapping(priv->irq_domain, p); + handle_nested_irq(irq); + handled = true; + } + } + + return IRQ_RETVAL(handled); +} + +static void +mt7530_irq_mask(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + priv->irq_enable &= ~BIT(d->hwirq); +} + +static void +mt7530_irq_unmask(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + priv->irq_enable |= BIT(d->hwirq); +} + +static void +mt7530_irq_bus_lock(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED); +} + +static void +mt7530_irq_bus_sync_unlock(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + mt7530_mii_write(priv, MT7530_SYS_INT_EN, priv->irq_enable); + mutex_unlock(&priv->bus->mdio_lock); +} + +static struct irq_chip mt7530_irq_chip = { + .name = KBUILD_MODNAME, + .irq_mask = mt7530_irq_mask, + .irq_unmask = mt7530_irq_unmask, + .irq_bus_lock = mt7530_irq_bus_lock, + .irq_bus_sync_unlock = mt7530_irq_bus_sync_unlock, +}; + +static int +mt7530_irq_map(struct irq_domain *domain, unsigned int irq, + irq_hw_number_t hwirq) +{ + irq_set_chip_data(irq, domain->host_data); + irq_set_chip_and_handler(irq, &mt7530_irq_chip, handle_simple_irq); + irq_set_nested_thread(irq, true); + irq_set_noprobe(irq); + + return 0; +} + +static const struct irq_domain_ops mt7530_irq_domain_ops = { + .map = mt7530_irq_map, + .xlate = irq_domain_xlate_onecell, +}; + +static void +mt7530_setup_mdio_irq(struct mt7530_priv *priv) +{ + struct dsa_switch *ds = priv->ds; + int p; + + for (p = 0; p < MT7530_NUM_PHYS; p++) { + if (BIT(p) & ds->phys_mii_mask) { + unsigned int irq; + + irq = irq_create_mapping(priv->irq_domain, p); + ds->slave_mii_bus->irq[p] = irq; + } + } +} + +static int +mt7530_setup_irq(struct mt7530_priv *priv) +{ + struct device *dev = priv->dev; + struct device_node *np = dev->of_node; + int ret; + + if (!of_property_read_bool(np, "interrupt-controller")) { + dev_info(dev, "no interrupt support\n"); + return 0; + } + + priv->irq = of_irq_get(np, 0); + if (priv->irq <= 0) { + dev_err(dev, "failed to get parent IRQ: %d\n", priv->irq); + return priv->irq ? : -EINVAL; + } + + priv->irq_domain = irq_domain_add_linear(np, MT7530_NUM_PHYS, + &mt7530_irq_domain_ops, priv); + if (!priv->irq_domain) { + dev_err(dev, "failed to create IRQ domain\n"); + return -ENOMEM; + } + + /* This register must be set for MT7530 to properly fire interrupts */ + if (priv->id != ID_MT7531) + mt7530_set(priv, MT7530_TOP_SIG_CTRL, TOP_SIG_CTRL_NORMAL); + + ret = request_threaded_irq(priv->irq, NULL, mt7530_irq_thread_fn, + IRQF_ONESHOT, KBUILD_MODNAME, priv); + if (ret) { + irq_domain_remove(priv->irq_domain); + dev_err(dev, "failed to request IRQ: %d\n", ret); + return ret; + } + + return 0; +} + +static void +mt7530_free_mdio_irq(struct mt7530_priv *priv) +{ + int p; + + for (p = 0; p < MT7530_NUM_PHYS; p++) { + if (BIT(p) & priv->ds->phys_mii_mask) { + unsigned int irq; + + irq = irq_find_mapping(priv->irq_domain, p); + irq_dispose_mapping(irq); + } + } +} + + +static void +mt7530_free_irq_common(struct mt7530_priv *priv) +{ + free_irq(priv->irq, priv); + irq_domain_remove(priv->irq_domain); +} + +static void +mt7530_free_irq(struct mt7530_priv *priv) +{ + mt7530_free_mdio_irq(priv); + mt7530_free_irq_common(priv); +} + +static int +mt7530_setup_mdio(struct mt7530_priv *priv) +{ + struct dsa_switch *ds = priv->ds; + struct device *dev = priv->dev; + struct mii_bus *bus; + static int idx; + int ret; + + bus = devm_mdiobus_alloc(dev); + if (!bus) + return -ENOMEM; + + ds->slave_mii_bus = bus; + bus->priv = priv; + bus->name = KBUILD_MODNAME "-mii"; + snprintf(bus->id, MII_BUS_ID_SIZE, KBUILD_MODNAME "-%d", idx++); + bus->read = mt753x_phy_read; + bus->write = mt753x_phy_write; + bus->parent = dev; + bus->phy_mask = ~ds->phys_mii_mask; + + if (priv->irq) + mt7530_setup_mdio_irq(priv); + + ret = mdiobus_register(bus); + if (ret) { + dev_err(dev, "failed to register MDIO bus: %d\n", ret); + if (priv->irq) + mt7530_free_mdio_irq(priv); + } + + return ret; +} + static int mt7530_setup(struct dsa_switch *ds) { @@ -2780,32 +2996,25 @@ static int mt753x_setup(struct dsa_switch *ds) { struct mt7530_priv *priv = ds->priv; + int ret = priv->info->sw_setup(ds); + if (ret) + return ret; - return priv->info->sw_setup(ds); -} - -static int -mt753x_phy_read(struct dsa_switch *ds, int port, int regnum) -{ - struct mt7530_priv *priv = ds->priv; - - return priv->info->phy_read(ds, port, regnum); -} + ret = mt7530_setup_irq(priv); + if (ret) + return ret; -static int -mt753x_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val) -{ - struct mt7530_priv *priv = ds->priv; + ret = mt7530_setup_mdio(priv); + if (ret && priv->irq) + mt7530_free_irq_common(priv); - return priv->info->phy_write(ds, port, regnum, val); + return ret; } static const struct dsa_switch_ops mt7530_switch_ops = { .get_tag_protocol = mtk_get_tag_protocol, .setup = mt753x_setup, .get_strings = mt7530_get_strings, - .phy_read = mt753x_phy_read, - .phy_write = mt753x_phy_write, .get_ethtool_stats = mt7530_get_ethtool_stats, .get_sset_count = mt7530_get_sset_count, .set_ageing_time = mt7530_set_ageing_time, @@ -2986,6 +3195,9 @@ mt7530_remove(struct mdio_device *mdiodev) dev_err(priv->dev, "Failed to disable io pwr: %d\n", ret); + if (priv->irq) + mt7530_free_irq(priv); + dsa_unregister_switch(priv->ds); mutex_destroy(&priv->reg_mutex); } diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index ec36ea5dfd57..62fcaabefba1 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -7,6 +7,7 @@ #define __MT7530_H #define MT7530_NUM_PORTS 7 +#define MT7530_NUM_PHYS 5 #define MT7530_CPU_PORT 6 #define MT7530_NUM_FDB_RECORDS 2048 #define MT7530_ALL_MEMBERS 0xff @@ -381,6 +382,12 @@ enum mt7531_sgmii_force_duplex { #define SYS_CTRL_SW_RST BIT(1) #define SYS_CTRL_REG_RST BIT(0) +/* Register for system interrupt */ +#define MT7530_SYS_INT_EN 0x7008 + +/* Register for system interrupt status */ +#define MT7530_SYS_INT_STS 0x700c + /* Register for PHY Indirect Access Control */ #define MT7531_PHY_IAC 0x701C #define MT7531_PHY_ACS_ST BIT(31) @@ -702,6 +709,8 @@ static const char *p5_intf_modes(unsigned int p5_interface) } } +struct mt7530_priv; + /* struct mt753x_info - This is the main data structure for holding the specific * part for each supported device * @sw_setup: Holding the handler to a device initialization @@ -726,8 +735,8 @@ struct mt753x_info { enum mt753x_id id; int (*sw_setup)(struct dsa_switch *ds); - int (*phy_read)(struct dsa_switch *ds, int port, int regnum); - int (*phy_write)(struct dsa_switch *ds, int port, int regnum, u16 val); + int (*phy_read)(struct mt7530_priv *priv, int port, int regnum); + int (*phy_write)(struct mt7530_priv *priv, int port, int regnum, u16 val); int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface); int (*cpu_port_config)(struct dsa_switch *ds, int port); bool (*phy_mode_supported)(struct dsa_switch *ds, int port, @@ -761,6 +770,10 @@ struct mt753x_info { * registers * @p6_interface Holding the current port 6 interface * @p5_intf_sel: Holding the current port 5 interface select + * + * @irq: IRQ number of the switch + * @irq_domain: IRQ domain of the switch irq_chip + * @irq_enable: IRQ enable bits, synced to SYS_INT_EN */ struct mt7530_priv { struct device *dev; @@ -782,6 +795,9 @@ struct mt7530_priv { struct mt7530_port ports[MT7530_NUM_PORTS]; /* protect among processes for registers access*/ struct mutex reg_mutex; + int irq; + struct irq_domain *irq_domain; + u32 irq_enable; }; struct mt7530_hw_vlan_entry { From patchwork Mon Apr 12 03:42:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 12196725 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.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 7AB28C433ED for ; Mon, 12 Apr 2021 03:43:27 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 256706120A for ; Mon, 12 Apr 2021 03:43:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 256706120A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=83gylzMIRNJFHX8vHQZuOFF5B+a7cbaq6Fi4VfFVtiM=; b=NERcKdSVu/woh2iSLK4/f5o3J tC+iDmyKDy66RuwS28Sleow0fIDeGtq/S1CWIjVTeDqjShOA7gYREXbAuKApE6nMsx/iDlhRgIoqE 7gMZtp/dbiz+7wlYkioZeugIkqYJAjd4j9ChFqXoiAH5hVJ5OEtqzHsCVFEE7r3bwY+hkUX+XdTbw 7/MOBN7nzYABymVjhxqG3Rel/DE5yNvIZj1UpUDhY0j7sgT/Vc6SEC06iilbuAruhvL0AlOmbuhe4 SmiLuMQZIBqJ81qnWS4LBYrIR4S9y2gBHfmYfGuN2MlS3hQdNsKbGpmCpqFxULKBNqzzggEGKhulH n5o8aOhWQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTn-005cD5-1H; Mon, 12 Apr 2021 03:43:15 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTl-005cCq-PE for linux-mediatek@desiato.infradead.org; Mon, 12 Apr 2021 03:43:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=NGwT/EtJxrze19V12dqNHnmBDYChWF7tADJjxUl/U08=; b=GhHBXWd7ajMN5Afzg05WMmyHuF Uy24cLaHMfFahD1TCbdCtXFh/qXT1Cx2mrSPZVyQicxcoBwlJTyffbDtNqBxltPsPUlg+G79c+GCu Lx/Q0Lfrmv1vx+Ar+BY0JybJxKjcluouGyBPqBqVJI5mqCTiYLDEfLAtA7x6mZ3HDnCFwGbM/YTXD kwSELb6OAYAfc9EheaVNpj9ph9CF53YP43l1tJA4ewc6AvSacl7b8B5MK5MYUzKHzsN3cK4V/jbOV mNG0tMjFrafysdkeQflu+0YCAnMIyOy52KRnwj2GUvfMRR5qW3mGg8zW5ZVLTDAW+qXvdi9MVGyoR RdRq7I8A==; Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTj-005rTW-Co for linux-mediatek@lists.infradead.org; Mon, 12 Apr 2021 03:43:12 +0000 Received: by mail-pg1-x536.google.com with SMTP id t140so8315978pgb.13 for ; Sun, 11 Apr 2021 20:43:11 -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=NGwT/EtJxrze19V12dqNHnmBDYChWF7tADJjxUl/U08=; b=qfe5fnjAN1dEXWk2k8iMmCBx8Vdh2mzI11Y/DMlK2udE9RocprcCc5Qc0dilOshzXZ 0AZhqVun7RwnN28hIZWScCGyeG6NLwVO3iFRFXykAV9hsQYYDb7JFkfRevSnyU413Dyd np5iKwrgXAOAg5Zwd5AqN72cwYXk0ZsP0Bosi/TmhlinCSqBgc2Bt8EXJZ/BvDC1a4j5 +0zeMjfA9DUixATixlXYaPXTHYNZ5KwVCcsrMkBkRgSHvMHxEvebgFa4mv7d9xQzbcG4 7SzqwS/3LTIT5RohgeXccaaZ0ppJ99PisURDqHa1zk7ZfmJfaeQ336NQ15CSJNAHBctT UjEQ== 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=NGwT/EtJxrze19V12dqNHnmBDYChWF7tADJjxUl/U08=; b=oHNU+t9Ueba9U81tVxdCwRqbzlg/BaCrkAl2bj7R6ivyidGeoRIFkckdDPd08NCgf3 UmeWFXQdU6xJV70wbN+Kl4/lyx8NsosB4kohePL4IL5pNJvK9U8CcBuLr4EUHdlL+36s DXkOgsFE3gzJer4Bnj75D5QQ8uKBRVEEKfXAIEMaww7Vxcp7cd2QSdC4UKaEOq7J1u8m jjU/771JAq5gmAnxjcofbNvL9/MJAJF0n6ukyzjp6vj4w4TjEDCaowhnvKAl6WzK6QQ8 8xdkKDvTzhZiBqX24HfNlZ9r4Fb2sQJrNsXGDbGR7krXilFXyJb8aT/7YmzkhsiPyBpH eJUA== X-Gm-Message-State: AOAM532O4Fh9ZEQadl1dte8UznsIg/Oa/vcsDvzJ6hSw5KTPewa78FqV zICBQ2l8XXqgGOn/X7DkUVk= X-Google-Smtp-Source: ABdhPJwwYJK3gG2cbqdB59bcfvjnQhrJh84YWH48ENwcrXR9TVtHr/UTRIravRlYA6bPCKmIlxQ/ag== X-Received: by 2002:aa7:82ce:0:b029:242:deb4:9442 with SMTP id f14-20020aa782ce0000b0290242deb49442mr21885445pfn.73.1618198990693; Sun, 11 Apr 2021 20:43:10 -0700 (PDT) Received: from localhost.localdomain ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id v22sm5387185pff.105.2021.04.11.20.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Apr 2021 20:43:10 -0700 (PDT) From: DENG Qingfang To: "David S. Miller" , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jakub Kicinski , Landen Chao , Matthias Brugger , Russell King , Sean Wang , Vivien Didelot , Vladimir Oltean , Rob Herring , Linus Walleij , Greg Kroah-Hartman , Sergio Paracuellos , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: Weijie Gao , Chuanhong Guo , =?utf-8?q?Ren=C3=A9_van_Dorst?= , Frank Wunderlich , Thomas Gleixner , Marc Zyngier Subject: [RFC v4 net-next 3/4] dt-bindings: net: dsa: add MT7530 interrupt controller binding Date: Mon, 12 Apr 2021 11:42:36 +0800 Message-Id: <20210412034237.2473017-4-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210412034237.2473017-1-dqfext@gmail.com> References: <20210412034237.2473017-1-dqfext@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210411_204311_452032_67DB0A52 X-CRM114-Status: GOOD ( 10.81 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add device tree binding to support MT7530 interrupt controller. Signed-off-by: DENG Qingfang Reviewed-by: Andrew Lunn --- RFC v3 -> RFC v4: - Add #interrupt-cells property. Documentation/devicetree/bindings/net/dsa/mt7530.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/mt7530.txt b/Documentation/devicetree/bindings/net/dsa/mt7530.txt index de04626a8e9d..892b1570c496 100644 --- a/Documentation/devicetree/bindings/net/dsa/mt7530.txt +++ b/Documentation/devicetree/bindings/net/dsa/mt7530.txt @@ -81,6 +81,12 @@ Optional properties: - gpio-controller: Boolean; if defined, MT7530's LED controller will run on GPIO mode. - #gpio-cells: Must be 2 if gpio-controller is defined. +- interrupt-controller: Boolean; Enables the internal interrupt controller. + +If interrupt-controller is defined, the following property is required. + +- #interrupt-cells: Must be 1. +- interrupts: Parent interrupt for the interrupt controller. See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional required, optional properties and how the integrated switch subnodes must From patchwork Mon Apr 12 03:42:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 12196727 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.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 A05A1C433ED for ; Mon, 12 Apr 2021 03:43:34 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 492096109E for ; Mon, 12 Apr 2021 03:43:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 492096109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=IsB/i81Blg/SAiGoHjRKBhjhUzSyGYXqOSKe+NGIBGU=; b=c+3MeoNAaFX+csHp4AZY4DMPy UCJFOzj6KSZDwPkWoIN8g/Tmj2P2RrUa5vGu0D68LRqJfL0hsBSDfI2HCKmHslCGFRxjdJboOWiGk BFn9ts70ImeJ1VA4XuNeDbSWlykfyJbFn+nPy3S6wuhruVX6SRSeYEUb15VII/VEpgMJoYAsHQr8j qSwRhqNVPbTwygv9P8YYMsALKq3fNN0tutByavo5khey1uFIbftxSVjXhItuQOxogfcM5aBavoDX6 I1/bQKAtmgYyPQP3mMhLDpt/fCQu4x8nVsm7df5DFIPIoec4+XDfxkFoLBw21Z94Mj5Epv55kKSee npTfCzl4w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTu-005cE3-Ub; Mon, 12 Apr 2021 03:43:22 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTt-005cDo-A1 for linux-mediatek@desiato.infradead.org; Mon, 12 Apr 2021 03:43:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=B7rQ+eZyVc+UGwnL8MpFME+8yUWCYk1WtHWcRPLJGoU=; b=C7kBaT/aOg6G7X8bBToKPXWSyw 1mprXa6CkNW/27uG95TAB59i3P66LMjYkM5dlJYllQMrvmtI+vZY4hlzjwVow8RqyijJbuO+9dXMz Xa8lPuUPrcx0lQddnYwoHC44lALqytEzViYnsnf6D6kC1LiRV9zt6HALvsZlAkDjhPs6YV3Dn1YZ5 5ir5mQ7ojylnuieathnQF3nbBwscxIGynmYd80E6Wa3kMWI2+tS6BQMF1l2gFJokKVelgaAYMG/rm czEQ3s+gjB9cVO8wPRK2i6rQD+oudUSPyVSraM82cS54Nwj4Z+KxC0ceu7/m4CitAE3uBlfgCx+CM mpWzFUFA==; Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVnTq-005rUR-Uh for linux-mediatek@lists.infradead.org; Mon, 12 Apr 2021 03:43:20 +0000 Received: by mail-pf1-x436.google.com with SMTP id o123so8327010pfb.4 for ; Sun, 11 Apr 2021 20:43:18 -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=B7rQ+eZyVc+UGwnL8MpFME+8yUWCYk1WtHWcRPLJGoU=; b=SX9V77mQzekQf74AmDKyq12CC70YI2JSMomXypPWg9EHeJO19nYLvD9v1RV/OQhqZ2 bnJ5kqRCF0sI51ZclyYfkhiK9LsuieMFVM5BMyGSBtOSFI3OnQmY73FUusH6Tq7gNyW2 osgLXz40/Q0FOx3/MmRNi33vLAK8MLpJUCpJ1aSJSc4Rfl/ljkQoYNCAfyc1Aj/nLRel mWEh8nXmAf9GZPeHwdRvCxRvs8ryBxXafF5k8lQFak74lGtR9/mvfyb0hCDlputgEcIh PQvVZPo35rol+nKCC9hUzYYCm7LFmGgBN03lYQlYMjwaE1P8oTR+LBzBAMFJU+ehziGn guBg== 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=B7rQ+eZyVc+UGwnL8MpFME+8yUWCYk1WtHWcRPLJGoU=; b=O/9qpL0DOszc5MrQAe9m5tcq4iItq/27qWe9SMTuv7MXfS1w1F45m7bySm+OpSwi5K GITz374IA2JpqvjMTWpD9DgHFl/zj5/KvCzBTeZTQqYpbzBNEpVIN+BWbH4c2MLEs3DX o6GnikWkrk+zTqQSZzUyhUPOkcp7rJf9hWiKAs6QusQRwMGTx89MoW/VZKQUW42Y/GX/ rO9fZLp6FuuQIRkpO7VK3VEx2QWJfCtmTEXDbPJh0pS7D0MfOwi+RrBKFH2HTf6d0MjX AapklKy4jHONw0ZLNeUFmxatt4FMEdRmg2YRf6WYnAw1B/iGmdfUivT0hsGXcSqerF+r LkzA== X-Gm-Message-State: AOAM532FXjmISCODsBEJDxT3B2FgyVBeQL1Oi1LEK9612IIrsP26iHkG aBQjojsmWzt2pEPk8vb7uhQ= X-Google-Smtp-Source: ABdhPJydgOU/45ri7toqVvb8GVdWpTxBGy/14uX4uwb3MKKywYOtmAFOl76qvuEMw6EYJbxuNTiK6w== X-Received: by 2002:a63:1c22:: with SMTP id c34mr18489418pgc.408.1618198998301; Sun, 11 Apr 2021 20:43:18 -0700 (PDT) Received: from localhost.localdomain ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id v22sm5387185pff.105.2021.04.11.20.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Apr 2021 20:43:17 -0700 (PDT) From: DENG Qingfang To: "David S. Miller" , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jakub Kicinski , Landen Chao , Matthias Brugger , Russell King , Sean Wang , Vivien Didelot , Vladimir Oltean , Rob Herring , Linus Walleij , Greg Kroah-Hartman , Sergio Paracuellos , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: Weijie Gao , Chuanhong Guo , =?utf-8?q?Ren=C3=A9_van_Dorst?= , Frank Wunderlich , Thomas Gleixner , Marc Zyngier Subject: [RFC v4 net-next 4/4] staging: mt7621-dts: enable MT7530 interrupt controller Date: Mon, 12 Apr 2021 11:42:37 +0800 Message-Id: <20210412034237.2473017-5-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210412034237.2473017-1-dqfext@gmail.com> References: <20210412034237.2473017-1-dqfext@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210411_204319_004793_7F3496F1 X-CRM114-Status: GOOD ( 10.23 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Enable MT7530 interrupt controller in the MT7621 SoC. Signed-off-by: DENG Qingfang Reviewed-by: Andrew Lunn --- RFC v3 -> RFC v4: - Add #interrupt-cells property. drivers/staging/mt7621-dts/mt7621.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi index 16fc94f65486..0f7e487883a5 100644 --- a/drivers/staging/mt7621-dts/mt7621.dtsi +++ b/drivers/staging/mt7621-dts/mt7621.dtsi @@ -447,6 +447,10 @@ switch0: switch0@0 { mediatek,mcm; resets = <&rstctrl 2>; reset-names = "mcm"; + interrupt-controller; + #interrupt-cells = <1>; + interrupt-parent = <&gic>; + interrupts = ; ports { #address-cells = <1>;