From patchwork Wed Sep 2 18:54:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Alonso X-Patchwork-Id: 513624 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A59ED14027F for ; Thu, 3 Sep 2015 04:57:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 75C3F4B7CA; Wed, 2 Sep 2015 20:57:03 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LZwubLqG1LWJ; Wed, 2 Sep 2015 20:57:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D9CFA4B7F9; Wed, 2 Sep 2015 20:56:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4BAD4B7E8 for ; Wed, 2 Sep 2015 20:56:26 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NxRGypZ2iMv8 for ; Wed, 2 Sep 2015 20:56:26 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0138.outbound.protection.outlook.com [157.56.110.138]) by theia.denx.de (Postfix) with ESMTPS id 1755F4B792 for ; Wed, 2 Sep 2015 20:56:13 +0200 (CEST) Received: from BLUPR03CA010.namprd03.prod.outlook.com (10.255.124.27) by CY1PR0301MB1225.namprd03.prod.outlook.com (10.161.212.147) with Microsoft SMTP Server (TLS) id 15.1.256.15; Wed, 2 Sep 2015 18:56:11 +0000 Received: from BN1AFFO11FD020.protection.gbl (10.255.124.4) by BLUPR03CA010.outlook.office365.com (10.255.124.27) with Microsoft SMTP Server (TLS) id 15.1.256.15 via Frontend Transport; Wed, 2 Sep 2015 18:56:10 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD020.mail.protection.outlook.com (10.58.52.80) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Wed, 2 Sep 2015 18:56:10 +0000 Received: from bluefly.am.freescale.net (bluefly.am.freescale.net [10.81.17.130]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t82ItuYT009670; Wed, 2 Sep 2015 11:56:09 -0700 From: Adrian Alonso To: , Date: Wed, 2 Sep 2015 13:54:21 -0500 Message-ID: <1441220064-20866-10-git-send-email-aalonso@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441220064-20866-1-git-send-email-aalonso@freescale.com> References: <1441220064-20866-1-git-send-email-aalonso@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD020; 1:af8Kf0BGBq2RLEaZrc0521l9SDSguqXeLBxMad68LQV1BtwpFC/gZlF6ALH1wN27dj74di/v9yX9jqLJh16uZUGQPQzxEXq2k5OHVYM3qIKuzS2koMZQGd1hauOEHaN/VU5r3H2uq0nu9+/FkQG7bcHe3X8mqNDEKVfm2xTbaynEaHaMP8ruTav+q1h/o7EtrdNHBma8LJ4unqkdEDU28cYr43VFk/0SBVIziROuwuDVUJnaaxqlXrAkNHCCrqyB/qDw/3x8RUPIbDJg/PmqSmqaC1rb8GF0qy5a2yTlzaoSRLCLeRXMWZ8oMYPFvBMid11GaREfZz+B5+a9ke+CBkbx3R2UB6klZwE200MSOirHaBojeZFlwA+hkD8r4ZaqeB72X4qwcx5j9BuIbU8tPg== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(3050300001)(339900001)(199003)(189002)(189998001)(85426001)(48376002)(19580405001)(107886002)(6806004)(5001960100002)(33646002)(104016003)(19580395003)(50226001)(76176999)(87936001)(77096005)(2950100001)(575784001)(5001860100001)(50986999)(92566002)(5001770100001)(68736005)(77156002)(62966003)(86362001)(5001920100001)(50466002)(36756003)(106466001)(5001830100001)(229853001)(81156007)(4001540100001)(97736004)(5007970100001)(47776003)(46102003)(105606002)(64706001)(5003940100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1225; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1225; 2:eJ2IsuaosrAgbbQIDTe6WzXWSzsx9neJdH7R40f3aGQzsh7NtJQ2NfNfl7WlHKo+B7WbtXiZYX26IfbshStSqIuD/+ReSoPZeY+FlTqeKOjOaCwdhp2LmhbSUHl/L9MP6Md8sg9w7UZbjGd5cCulYIrDvkEbUu21XRiuYOR/Apk=; 3:HQbq0nPq+4kctGuRRdTUN42x430RuJh6oqkFpZb09rPgvP/QdzaTAtyX7j8teJjAkUxGPCOPUoqRKgNBOMeawmhUfmTmLky1N1yCoWZV+BnVhJofHYbCdOLecr0Cbvh/mFumxu0shMOaAKnK8f7hb7pC3ctRuBV1GGPxxVAtGwi3u28yrjWBhy+OQinF2Gbbrni8OPed0jxyiTDnuLXii0b3+MF/o4Sjhf+rKx1HjK4=; 25:B08TrIWyeG5TfCvTf/khyRn6XPWbzAc18anX4bPNDnamnrZ1024RhLqFYjU7X+64KEgsbGetWg1FdK4bg0AOnritlwcUXvmH+nCZZh/XBVMYZYMGEhj4LdufzeVf1fbUYmy3cFUqjcrxe7KBV4vptgibPjQnxcYFQgVJPbatFUOezhnA40k1ANpIngQ8u/OAaIi7q+mC4WmfaTlZYewDEJCJ1UpGfDHPahiMt2GqpkNguhtwbSKN4ZTTQy3ZRvqXVCQK2RWk62+4G4wBOfg4pg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1225; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1225; 20:hryph+FrzovgWyJnD1ezqc5MCydCkmTyN/5hRM4ufY10U3FFPUHMA9/2wJUtNSwN6HZPCyQsuxbJLwAX+uDYkN3mtOIqruoaQvU8k0wROdKi2wFJdjEEtsUX8MT1LtsEiqAh0WLMtI6Jr7aNFpWq5hlGleIDTNmXo/ad07ETlDd3bEgrUzBepxbDXWt+E6LbUpy5iE3T4rRb46siX//BzrBpJynTp71kIF/6gvAOpRnOHoievIxfm7itB1COnVJXG/Eo1nBWV4pHZh5UUhm56wQb5Yk2mX8cfzr5ZDqhiXLCWdJDwLICN8c9FwE3wG3dwG6jY+rFLMuXwRRJLFL/Aa8psNr+jsBOvhzfNPWnRLA=; 4:4ZXtvZSqT28IY+NvY92dcEVbCNcxw1An0uVop20lLAb7Oq0p9Maa5tzaMFoYZd64wmjU69uaBQR4tX4IJ62Vtjickd7sKkv9RqHJdXVaASwC5eWcMkD/vketYDZj1VfEIuJ/9CNGXDOjLs/pDRMK5RV4zb8RQAgNLWQSCPCXU6wIi+vQNa3OdT49SMTxQ5zaxSQG7g0x6iYDDtYqNcRRGH3j8T05FkcZvr8DSBA2zm6+iFXKxgub8+ijD5Fr21YKyMtw5X1iBj3RfK+Sg693phMWI9Jrd9WT0POuqFcnHYIfFDVapYVrqLuW97aXPYjm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:CY1PR0301MB1225; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1225; X-Forefront-PRVS: 0687389FB0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1225; 23:A8bPIR9SK64ooaHkcZdj/2sk7RoTLNZns7zUGPE?= =?us-ascii?Q?D+0iYPsNKI1S5QO94sy0WhJ0lr2mpc7VPAMw6e6bt/VxK5Gx7sRwTIf6dY8p?= =?us-ascii?Q?LWphL7df4RYEGlKLHUAkIOYYWguWJvvM4ritdmx47+KcvKE8K0R5H0BCXsxR?= =?us-ascii?Q?Bz8iYKFvyoTd9mwt5juDA+9c7EnYoFB2vNE+24nmnmRRFiz3hs1Lep1tZa2X?= =?us-ascii?Q?fgpgkJqkCbPBkfiEu26MldJ/y22qcaY+drEM5uGMJVv+MV1Sa5oAAf2PS1l7?= =?us-ascii?Q?WGRv9iZfmre+EVrgWF4nP7kSU8rC9akfebBG6J3Ld3/SUZ9GNgKqkaarlb1/?= =?us-ascii?Q?t6KGVoSzE+0OmFyG6UjXMOq6bBL0KbdAF4BSX50lG3vz1B7qvK9Z0ig069C0?= =?us-ascii?Q?BuINNiMOk7Rw/Qh5qzo0kvmxe4Gftm541qOX5zbjhBKAtNS5/hr6u0qhwaHU?= =?us-ascii?Q?IftQDiNuTZ5ptP3DR2/2S2yDUFaaSolJ8dB/7Qd77qvPxtx0FGuWsP7tmTw+?= =?us-ascii?Q?8jsPg5SBFeQ8NYDc997os5vOyu2V45XTpLFJG4fQPeeDq3UcQC20dhJASZlo?= =?us-ascii?Q?hYbiwL8PkxZ8DDHcjqy6Tg1iQF8B+KSnGVZzMxDaOAJYqxlIdHVwGRFcZ9lQ?= =?us-ascii?Q?7DbJ3+BSBjmFtGrV+CC49p1Ea88Smc/QihAHF08/+KMBmAaOr6D1/SVSnnFe?= =?us-ascii?Q?68NotNTgh6ASEOynJOzhCdv0yamVzNeTCPXr+jgypPs0/U+r/poXQoK8c0XG?= =?us-ascii?Q?RklCYz1PJb+nAZmw2u8oPkdwXsP1OtZq5BvfXYvxJK5tWNyCbMb177h4Bxzr?= =?us-ascii?Q?S6Zuuc91RThRqwZxMeQnX1V3cG/FbaFAoUGk+w5vr6gViNF6DN1hTgwqK5bu?= =?us-ascii?Q?uhMEt4bVTubSFgSpvu2OsaGj4ftjrWpqqdh1v5OubHNI7u6TfNnys5EWeubq?= =?us-ascii?Q?NcfnZ56/3neJnvrIRwhFATqxn+u7smdDP/l5IU+2isPTy9NBYKkvQO4aOyh9?= =?us-ascii?Q?sCPL8AcBWlzNbwjijng2NQpEZv71gmlnApIwDf0EqQeEid6s/8WKR4O7tjMy?= =?us-ascii?Q?XnLabCUuWE0f8vNPj8gzJmyf3GU7wJc0BylriAUvn13+1dULTaopHq3UekhE?= =?us-ascii?Q?qLQFYgxzo9Tthhp/a7SlTZXyFZrAoiXJ0vHCdIDpGY04OwtCZh7lipX5lKDH?= =?us-ascii?Q?tmieWKXQe8pn2txtL1/8Np+x2svJxQ0YV/N+B+OGQtXyVUwybEwpfrQcImOS?= =?us-ascii?Q?fKDveUzxzPDMqvcL5pCjUZ30rGMSN2kYnmAuVjQtxAdFSn8ZBil9hwEWkCX/?= =?us-ascii?Q?mrg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1225; 5:QcZcm73QzeVho8nC3xDPiqWgiG3GasGcuSJ82D7bH7/p5Hs+nuzo+iP4fheO1A2o8npGqEMd+x0WAEO5+Bm9Uy35RaWuEzs2IxmtqafDlrKLQnt9MFCEjqROsm4vvfvE9rtrYsmljULocDs8jxiCxA==; 24:RncxmxHCzrT/NjGyq8olwdxjBTY+mV/VBAkemYrvIVjBooLERIXsPMfo7tmQf1J+9LJRNu24bIokKvBZYTceEM4zWJsQAO4Z3FNPHzqZpPU=; 20:WcTZQRTEEboKjPsD2KjALQljLe8VEWCAUz3265pLOKUuAiEpH8NyO/+uXpysIx3AOz4pTA58bS2++8HTHSVMPQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2015 18:56:10.5783 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1225 Cc: Fabio.Estevam@freescale.com, otavio@ossystems.com.br Subject: [U-Boot] [PATCH v2 10/13] arm: imx-common: init: rework wdog settings for imx6/imx7 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Rework imx_set_wdog_powerdown to be reused by imx6 and imx7 Signed-off-by: Adrian Alonso --- Changes for V2: Rework for common sys_proto header file Changes for V3: Resend arch/arm/cpu/armv7/mx6/soc.c | 14 -------------- arch/arm/imx-common/init.c | 21 +++++++++++++++++++++ arch/arm/include/asm/imx-common/sys_proto.h | 1 + 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 06f63da..282302b 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -250,20 +250,6 @@ static int set_ldo_voltage(enum ldo_reg ldo, u32 mv) return 0; } -static void imx_set_wdog_powerdown(bool enable) -{ - struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; - struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; - struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR; - - if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) - writew(enable, &wdog3->wmcr); - - /* Write to the PDE (Power Down Enable) bit */ - writew(enable, &wdog1->wmcr); - writew(enable, &wdog2->wmcr); -} - static void set_ahb_rate(u32 val) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c index f1d4314..56d5010 100644 --- a/arch/arm/imx-common/init.c +++ b/arch/arm/imx-common/init.c @@ -66,6 +66,27 @@ void init_aips(void) } } +void imx_set_wdog_powerdown(bool enable) +{ + struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; + struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; + struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR; +#ifdef CONFIG_MX7D + struct wdog_regs *wdog4 = (struct wdog_regs *)WDOG4_BASE_ADDR; +#endif + + /* Write to the PDE (Power Down Enable) bit */ + writew(enable, &wdog1->wmcr); + writew(enable, &wdog2->wmcr); + + if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL) || + is_soc_type(MXC_SOC_MX7)) + writew(enable, &wdog3->wmcr); +#ifdef CONFIG_MX7D + writew(enable, &wdog4->wmcr); +#endif +} + #define SRC_SCR_WARM_RESET_ENABLE 0 void init_src(void) diff --git a/arch/arm/include/asm/imx-common/sys_proto.h b/arch/arm/include/asm/imx-common/sys_proto.h index c0a5b2c..5673fb4 100644 --- a/arch/arm/include/asm/imx-common/sys_proto.h +++ b/arch/arm/include/asm/imx-common/sys_proto.h @@ -37,6 +37,7 @@ void set_chipselect_size(int const); void init_aips(void); void init_src(void); +void imx_set_wdog_powerdown(bool enable); /* * Initializes on-chip ethernet controllers.