From patchwork Sun Aug 4 17:23:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1141816 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="cW2HteaV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 461nrm4FF6z9sMr for ; Mon, 5 Aug 2019 03:27:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3507DC21DFA; Sun, 4 Aug 2019 17:25:24 +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 D03A1C21E07; Sun, 4 Aug 2019 17:25:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BB371C21DF8; Sun, 4 Aug 2019 17:24:34 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lists.denx.de (Postfix) with ESMTPS id B2E11C21BE5 for ; Sun, 4 Aug 2019 17:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1564939445; bh=MQC4bhU7TnVA5Fa449T8MyVyw+e4tcmSvMapt5aJR3o=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=cW2HteaVeu1VJEY6VdKPAL7xlrykWe+ZV1zZ00WU8X3DqdFvTabY9uwJKbOgVFwNI iu5MhipvN0QmOtOnE2EOAXzLH6rHT5rgJQFMu1Ju82dF5x2E2NSqiYSdYW6ukxlvjw EcoDBsOdoKd9qj2NrkhQymcWdwCmcOpsNM1V2NTk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([217.61.144.189]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LeNGL-1ihhs00Dtt-00qB4w; Sun, 04 Aug 2019 19:24:05 +0200 From: Frank Wunderlich To: Albert Aribaud , Christian Gmeiner , Daniel Schwierzeck , Frank Wunderlich , GSS_MTK_Uboot_upstream , Hou Zhiqiang , Jean-Jacques Hiblot , Marek Vasut , Mark Lee , Neil Armstrong , Oleksandr Rybalko , Prabhakar Kushwaha , Ramon Fried , Ryder Lee , Simon Glass , Stefan Roese , Tuomas Tynkkynen , u-boot@lists.denx.de, Weijie Gao Date: Sun, 4 Aug 2019 19:23:40 +0200 Message-Id: <20190804172342.5225-5-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190804172342.5225-1-frank-w@public-files.de> References: <20190804172342.5225-1-frank-w@public-files.de> X-Provags-ID: V03:K1:YZIcn/BfPUj5VFQJBj0RAJV4MtPVsNAfMmN+8Lh0rwnt4AvCKi9 KIqYAoBDZi3ZKqticBL0VEze24LjuBoDiA2rUSEygobhOsd+JDMRU9Et3uEdbYDvlJNXxu/ PVHNWqudtBtoCa1iufLXJJMJhlCgjcfIiMgFjZyBhkzzIqB7I1gk8q7RO7mGMpjZJpfLgMf 78OnRnSw6Qo00IubQaeWA== X-UI-Out-Filterresults: notjunk:1; V03:K0:p5W4eV9mViU=:zw51zTR5yAyzn3ppO+3Vau 7kFX0h1pp7oLuBD1kMGBjMEw4XGuO8VoPHvNmLQtturnLFO9ALqEzzVqiN+0PwcqN2Ybaj7tc hDerD4geZZ04F/yB4CorjVmnI+jQdv1cqdxIWCKHOS2JPFaOwzLRmTpA8/gm5DFkb5vs1JaqZ Gg+ZvnfmU6p4nghmRMYM8+9CkhPjj9dSlWi/yRmC2T2IiAXugGafP99+Ojxkm0YZug3fmRkk9 E1ZGPBhJYQcv4e4sCE0Oh7ohAlhL3Ok5fPtzQayaAGsneUv3Y7LJgTJYRnM9Ye8P1je+ewO3W 9yX9nJ10EgJAyQpdMvFUGIb2QoYy8zJrDU/ERg3PJ6tjaB3S7zENhESPEIK0mWtoCEI4KyhBT 9Ux2d7RbheSa9IlJxAbVS734uUyWRClwNogh4cjyqLJUU+yy0fzDYKYKPQsiuHjtVXQLu6EEn GBS2ymfpcCg3Qd00d+NfXxhK/c81QyYmybFv+hIXRi26L1drN6lX3lp8U/9oPLm4hemW7X1e4 jSnxEoilkuGUUQLUtrADojzIAvHfk+myke0YLnf4lqS7ycrT2TMpVx7BXAjUYyqly9sHaUBff eCBIvp+ueNq+Ux3uv6naiQf+6D5WyUSb9jk4ZORKS+7UA4bCWVNXtfdmOd8iB2sn0RKWDai93 IENLhhD6aaBevnjwUkA5PNfJPRZ++a4WkUdrGql0Jw+6il7vXr+VAVIhIzgjjcZAje6pmJpc0 GEXhJxM/lkWruVuOY+i5GiKpjsBBNuIpNrZCiCG/bS83Ut8RartYefz8khHdoxxpqUIsJcVUj q2ivoGsJ7ZjyG7vXhLIbGvQ5unIdxpSOp6ax6WoYjvlAD8jn/zaoQWiAx+C8RwuCZHRLGcjmb 2M0ph4qPTqu7Hm2Rc/BeRuzjUay4PuF8C5BJ+yZTCihqQYr8xg//4KWHFLy3ca6/NUJW0V65z 8Q/h8t3tU2vaQ79lSHa7p9KWgyt12X0kx4zJ1UI1rCvyNMnM9UJt/B7CKNKDecbzQ4qkdHPEn 7Vbx7W/yg0rdCObCG3Sl3YEbGha/Id3JSKpr8gOIZu5npD9yN+igXxVov6G/7VOgjneHbytqU O3+kNko7KiG/Hy/nLUvrKi1+dGd2OTqVPhPf+IVoMi5Mjv7lI/tjfMIVQ== Subject: [U-Boot] [PATCH v2 4/6] 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. Tested-by: Frank Wunderlich Signed-off-by: Frank Wunderlich Signed-off-by: Ryder Lee --- 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_ */