From patchwork Tue Aug 6 15:08:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1142840 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="awXno6Y1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 462ynj0SXqz9s3Z for ; Wed, 7 Aug 2019 01:13:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 96CA5C21E15; Tue, 6 Aug 2019 15:10:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DECABC21E56; Tue, 6 Aug 2019 15:09:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9CBA7C21E68; Tue, 6 Aug 2019 15:09:30 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lists.denx.de (Postfix) with ESMTPS id 95431C21E62 for ; Tue, 6 Aug 2019 15:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1565104147; bh=2FDwBVXKdUanYnCgbJG/6TDT6kT7M3tSaUvAwQNb3Ys=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=awXno6Y1Jtf2z9Elc5AI2az9Qoirq2rtuaqbYSL1Cbe5znNKsCQyO7wdH3lL3Gvcm YFWrexMGml54qHmbs4Z/T8zHHKtzt4torrxL4m2tHeHDcrbr3DxGz1oXKaozEE6sfb y+3N6HVfQz7oL7MUNuJOunLYPFaCBQbU7G8oQRUc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([217.61.153.94]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MBlxM-1i2kKU40U8-00C6Em; Tue, 06 Aug 2019 17:09:07 +0200 From: Frank Wunderlich To: Albert Aribaud , Ryder Lee , Weijie Gao , GSS_MTK_Uboot_upstream , Frank Wunderlich , Simon Glass , Mark Lee , Oleksandr Rybalko , Christian Gmeiner , Tuomas Tynkkynen , Prabhakar Kushwaha , Hou Zhiqiang , Marek Vasut , Stefan Roese , Bin Meng , Bao Xiaowei , Jean-Jacques Hiblot , Neil Armstrong , Ramon Fried , Daniel Schwierzeck , u-boot@lists.denx.de Date: Tue, 6 Aug 2019 17:08:48 +0200 Message-Id: <20190806150852.5527-5-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190806150852.5527-1-frank-w@public-files.de> References: <20190806150852.5527-1-frank-w@public-files.de> X-Provags-ID: V03:K1:c/9oOtcZ80TdWXNwyE+R0WXlF5yIyNp4F4+Xdxwgw0b+V+SJV0H QRNX8Ioh4O81GTE7HIAUPHX9FcDnu9z2dQozMwin6sII5nYzcPvMlfjue6ve5j4hEen9ZF2 3PNmLVkRq45/RDLxRCJ8UVFod4h/FZL5XJA2ATw85Ges5uZsHun0nH4sGyfyHdYo9Lx79YN A+lOmQxH3wXBstEbja/jQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:l4Y6+h7/2QU=:czjQtx4IGYIOLsrCQIrqaX 6Dn8yCvnNxVsp21QALazK5dSyJIejdEVuJUaWWJ0EGA/rTinC2Ll5BzJblMeonLjQECTtihqA CKNZ2vKYGNEb0thEiArQmqSUYuDbJAWHivfvrB76ANGOsLP8cLMqlz8aZ50uKXxaJdHNMlf4l 1BwKnVh5l3NxgoF5KMghSdmZnIPL1abmBp/y9f36UUycwQqmDUVi4EJTE4Y813KPhKPjXutC+ tQcSUg7dXTur5+bivB8QQR0XgXlP+uCehSS4I8ALD5bYCx0gwXetjYDFeyHNbSlENSoWZKxmQ e0EHRDIVFYGbXzNkoe5YLV9sj0Mp4n+O/cLpX8kaIGkkzINRP/TjwDFHSAvkxJktiIFx0XQba LvCZzbdM1fMLZBJJOJW4tmcntoQxZ5v4W2Ac1inXFaAZjctz+UO5xPDrTkVCX7CYnuxj/aJ1G LW1/+3DGZpFexBNfdCFBa9xP9CjuXRYutotQPq2FnqD2qbPsqZRwbtpcPhAs3uO9YsncnUDv4 2Na2sYIdHeRrpnPRmnVm5S8cLBxWe2nJJ8VF9MUQr7Tbumf44lOgIlRwJgIhHexh7tHq1Nfab 7kJ6WiPhrJeYk4sAjotgv9KDFUBd87jwu6RuKal7qgkuafGod38OKJYrA1W7kuECWHy2y7Opd xq2+sLcEyFpgxNcacg/qHtw9WkwdRyapkD6fV3POCIWbRuLQJd/USrLZWw7/Itcvv149SuBDr Y/NaeMQi2X7HsNX1C9HDxASgG+43dBRIFfnKYJBIUkT4jZztLGEDgfDC02Rxz0r4V8AUQ8bcL ceky8c/OhU4gvYSDygCFNXDwekMmSq1cGoi2eh491ZoMCbr8/vW0N4mfjsrGzExcTnzGOixV7 vxNAqbioo0adwJwNDo3Cc1w9v8hQFlhYcfBkBUjErH9LBGPF7dq8lQcjaWtyYT1JQTockJDOO V8JbpqgI6Xr+E10CoMA8x55FAOtiERRBKgfiYxplyLQPNRABmhDk+zKmyu1NbmeQYTRDbDCq5 sJliQi3e4ib+uUmEWWxVE5sGKLVHBbU2C0pS/Dz6RlHhXyXQfVf3aMyDV1gQx10tSgPMMUuAt vbjMBdfFCFzLus6hs+ovtaRlJUtRsImPw2hXUSmc4NrpJFAAgkAwhPQzA== Subject: [U-Boot] [PATCH v3 4/8] arm: dts: split mtk-reset.h into per-chip header X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Ryder Lee This follows the linux header rules to avoid conflict bitfields. changes since v2: none Tested-by: Frank Wunderlich Signed-off-by: Ryder Lee Signed-off-by: Frank Wunderlich --- arch/arm/dts/mt7623.dtsi | 2 +- arch/arm/dts/mt7629.dtsi | 2 +- .../reset/{mtk-reset.h => mt7623-reset.h} | 4 +-- include/dt-bindings/reset/mt7629-reset.h | 36 +++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) rename include/dt-bindings/reset/{mtk-reset.h => mt7623-reset.h} (88%) create mode 100644 include/dt-bindings/reset/mt7629-reset.h -- 2.17.1 diff --git a/arch/arm/dts/mt7623.dtsi b/arch/arm/dts/mt7623.dtsi index 3a868ea2ee..1135b1e1ae 100644 --- a/arch/arm/dts/mt7623.dtsi +++ b/arch/arm/dts/mt7623.dtsi @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "skeleton.dtsi" / { diff --git a/arch/arm/dts/mt7629.dtsi b/arch/arm/dts/mt7629.dtsi index ecbd29d7ae..3c9eab9770 100644 --- a/arch/arm/dts/mt7629.dtsi +++ b/arch/arm/dts/mt7629.dtsi @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "skeleton.dtsi" / { diff --git a/include/dt-bindings/reset/mtk-reset.h b/include/dt-bindings/reset/mt7623-reset.h similarity index 88% rename from include/dt-bindings/reset/mtk-reset.h rename to include/dt-bindings/reset/mt7623-reset.h index 78fcdab009..a859a5b26a 100644 --- a/include/dt-bindings/reset/mtk-reset.h +++ b/include/dt-bindings/reset/mt7623-reset.h @@ -6,11 +6,9 @@ #ifndef _DT_BINDINGS_MTK_RESET_H_ #define _DT_BINDINGS_MTK_RESET_H_ -/* ETHSYS */ +/* ETHSYS resets */ #define ETHSYS_PPE_RST 31 -#define ETHSYS_EPHY_RST 24 #define ETHSYS_GMAC_RST 23 -#define ETHSYS_ESW_RST 16 #define ETHSYS_FE_RST 6 #define ETHSYS_MCM_RST 2 #define ETHSYS_SYS_RST 0 diff --git a/include/dt-bindings/reset/mt7629-reset.h b/include/dt-bindings/reset/mt7629-reset.h new file mode 100644 index 0000000000..8f1634f7a6 --- /dev/null +++ b/include/dt-bindings/reset/mt7629-reset.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2019 MediaTek Inc. + */ + +#ifndef _DT_BINDINGS_MTK_RESET_H_ +#define _DT_BINDINGS_MTK_RESET_H_ + +/* PCIe Subsystem resets */ +#define PCIE1_CORE_RST 19 +#define PCIE1_MMIO_RST 20 +#define PCIE1_HRST 21 +#define PCIE1_USER_RST 22 +#define PCIE1_PIPE_RST 23 +#define PCIE0_CORE_RST 27 +#define PCIE0_MMIO_RST 28 +#define PCIE0_HRST 29 +#define PCIE0_USER_RST 30 +#define PCIE0_PIPE_RST 31 + +/* SSUSB Subsystem resets */ +#define SSUSB_PHY_PWR_RST 3 +#define SSUSB_MAC_PWR_RST 4 + +/* ETH Subsystem resets */ +#define ETHSYS_SYS_RST 0 +#define ETHSYS_MCM_RST 2 +#define ETHSYS_HSDMA_RST 5 +#define ETHSYS_FE_RST 6 +#define ETHSYS_ESW_RST 16 +#define ETHSYS_GMAC_RST 23 +#define ETHSYS_EPHY_RST 24 +#define ETHSYS_CRYPTO_RST 29 +#define ETHSYS_PPE_RST 31 + +#endif /* _DT_BINDINGS_MTK_RESET_H_ */