Message ID | 1438094935-18213-6-git-send-email-Peng.Fan@freescale.com |
---|---|
State | Superseded |
Delegated to: | Przemyslaw Marczak |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 3B914140DFC for <incoming@patchwork.ozlabs.org>; Wed, 29 Jul 2015 00:50:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 393254B7EA; Tue, 28 Jul 2015 16:49:59 +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 3Rs1OXpm4VzG; Tue, 28 Jul 2015 16:49:59 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A6EF84B795; Tue, 28 Jul 2015 16:49:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A82B44B788 for <u-boot@lists.denx.de>; Tue, 28 Jul 2015 16:49:44 +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 23cXl7CkzlWM for <u-boot@lists.denx.de>; Tue, 28 Jul 2015 16:49:44 +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-by2-obe.outbound.protection.outlook.com (mail-by2on0132.outbound.protection.outlook.com [207.46.100.132]) by theia.denx.de (Postfix) with ESMTPS id 1DD624B7E5 for <u-boot@lists.denx.de>; Tue, 28 Jul 2015 16:49:32 +0200 (CEST) Received: from CO2PR03CA0024.namprd03.prod.outlook.com (10.141.194.151) by DM2PR0301MB1277.namprd03.prod.outlook.com (10.160.221.146) with Microsoft SMTP Server (TLS) id 15.1.225.19; Tue, 28 Jul 2015 14:49:24 +0000 Received: from BL2FFO11FD012.protection.gbl (2a01:111:f400:7c09::184) by CO2PR03CA0024.outlook.office365.com (2a01:111:e400:1414::23) with Microsoft SMTP Server (TLS) id 15.1.207.19 via Frontend Transport; Tue, 28 Jul 2015 14:49:24 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; lists.denx.de; dkim=none (message not signed) header.d=none; 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 BL2FFO11FD012.mail.protection.outlook.com (10.173.161.18) with Microsoft SMTP Server (TLS) id 15.1.231.11 via Frontend Transport; Tue, 28 Jul 2015 14:49:24 +0000 Received: from linux-jyl1.am.freescale.net ([10.192.185.104]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t6SEn0T4003425; Tue, 28 Jul 2015 07:49:22 -0700 From: Peng Fan <Peng.Fan@freescale.com> To: <sjg@chromium.org>, <p.marczak@samsung.com> Date: Tue, 28 Jul 2015 22:48:55 +0800 Message-ID: <1438094935-18213-6-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1438094935-18213-1-git-send-email-Peng.Fan@freescale.com> References: <1438094935-18213-1-git-send-email-Peng.Fan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD012; 1:BCEbn2SzQwuwdWl3BnerHGf4xHNCZTek6oZRUfb7qsXZwKMU087OEx953qjEdAZqvCMo4ZZni71atZjPHvL7R4qZFlCwM4x41WcClJ7B44M1NOEgfP0Qif0KpJkx6pvuF1olWCLmeStJVv9osco2xQYwGvxk5gAWq9vUy0eAsIOWvA2CbNSnuu6eMAFrlsrvwPGsn2o5CNJiVLTm7vQAkrQfWrnSFBeME44MY0bKS9wQMTdH13bmQXcJ2t/dtyZ5r8uV4DHCzD/gC2HTLgOKj2HNOuvHRmWq/DLXSS4XRAtTOkCuNHpGye7iHGCRdYLb X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(19580405001)(2950100001)(77096005)(85426001)(87936001)(36756003)(48376002)(104016003)(5001770100001)(105606002)(229853001)(47776003)(106466001)(50986999)(50226001)(46102003)(189998001)(6806004)(5001960100002)(62966003)(19580395003)(86362001)(92566002)(76176999)(77156002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1277; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 2:D5LQ4Er0UH52620ZohvPxOnVE/KnQNv3fzzbqZHctgXK11E5El4YJXknxCHfTJXPCDV1+fKuoSvosEBBTlC0k8OG45OEfKKvRwD53kbh36r23HNHBrDk+ugzaPM+4m+wTi5NvOzlP0uMbJ5ODp8YyXwHNzAhKH0R9f3cC1VodXk=; 3:Fu3RHVWvqPXS9MxVwJY2fPsp109S4X7fY+V38DqAUluLO5TmHGKeV7eGhYdyOwoEkeAI6K70zB4wAI9Ii/tDnB5p3yBYrBuvLrWQFel1GjJZF2g3JLZgejc0Agu2tV+N1WSfzLWn09Nt1N1OqiiVFpI6Yga9LwjGUBq820IVAgFZT61vQISDqDibLir0gnR6EmSSAgnrJO4m0M0wx6tVDiHjh+CaDnjAiaA5FidK7PQ=; 25:PbWUp4wRvohgc9A7F907helMVlJK+0RrCKrvPMlX3a1UkMyQLZFlRvo8nDTpfKrcTRl5xHiWka2SH4Z173VZWmz2LNAI3DlRoQC4FwVsTauBXdayD+BHKxBmTc7Q6d3smLBxPsfIqsWJhd1ggtWQPXuUC4pDMRFqq8A0nY/jGh9HP6qInpBfQjnehhchAkWT5/rQsiekpbXVcpwCnSBbP6YsSej60olnMm9PK3OC2XHs9bjVxKmBTXirlctxtIrmAuWphITYHM8cvvLh6/pzbw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1277; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 20:H4EaPaAeJSy6aFgGcgUlhIJsVCik8GFWkKIP/Dv9wvP0XFv/iGuQ+SjOJQbUhJq9WyNRarOhKum0OnQ+TBN/TJZg7yn711bArIBdghYCiS7AxvZSBA0mI2K8Af9wW4dkP+OmOfZobqjubnEMlV619OlideGv9/hOhqYm+oprF+6JAzswdxQLUcE/ulLVAesPeJsU2fLYiF0bmg2vAGuAExrrAdOnROXrF9LbvoxRv7XUM7bkRCPPYpN7MpCf1PwbZwjsUymRbg6zscTNXTER5NxB0qpcuDmzaoN/k3A8LDkSHgrlAz5Y/SxqeafppmXMse+zrrwm7WzbYk+BSAETYE8Rs1P5faj3O2M2cMHCKt0=; 4:XGsAbYCGS9B0WJSDjLAJwgj/sxcuaIn84Y0W5Yp7iHmstv1GE24gUGG/dWYYQ71lZMRi1VALy3UwdImMFzuXuVeG7lYbQrgOFc6btmPMl/vai21+lrenPpYjzKQscT/chrlY6MXYvb5ChRRyenaIde6DAkPcyUNnQdsglnFOcqkiCt7JRQ4by1iWNerALBr2tdweLzc6nXRUoCaVyajWSf05xyH7s++baiuBYAiFzWRZC7etqSnvvUJIyxe1+fN2pyUtIwEQUiy0Hokw6aLkocjJOVwCJKjiuL3ymZ3eWsM= DM2PR0301MB1277: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: <DM2PR0301MB12772B2833E570AACF16D0B0828D0@DM2PR0301MB1277.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DM2PR0301MB1277; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1277; X-Forefront-PRVS: 06515DA04B X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 23:h1V5bxf8AkJPSt9aUl06wIuJU9SI34kh31lT5V50Pq446iwg+Dmg8ZxoEfWspaIWImSfKPQg/OSfE1jdZYWNDO28oPJPLN8GPLrrBLtmpTqVuAu36Mz4yjFq1Lc1Qg1erf9tC25rdV6/5bsj40QuIrhdN5pa7vD4C6tUQC8+klNEWnTzbwpHJEMKbGAK/+XYffsMb1blyKgBmvk5hebhxEODZUWUP28Jz+1ubCdUmt+IwqqwP865Xpn9inAmbKWU699cOUyYchnQUAMFNPyuhUYT4qdf09Cr6fQgjX2PKrsKvx8lSvY3qDWJyvkXf394wx+YwiiERXoD4iZAuAKvqV/vV4BBdfyXVvhE+8KS3AASXZ04uRb7fDNC3rPm+w/EW7KusrjHc2g824TYBAzugFcPqYXvtkgKrHcdeqlqoET+RA1FeOFTz70op7ElLZ2BUL4xtdtkuEhUKlBoE0LVTeMHoWmNUrH/XxBd1MnVpwhLoLkQulN+PKM5IajlPW75Fg2YpbGdIIwXwNvW9zAWYp3iiSO47MCWB7w1Wl1QALpmiyOGfsRM2cCCcoGFWYK+3gjjTXuPin8xQrV4mmOt9YezVaNnxIgJUf25UVqThfHCdl/fnmMkGtLv+vAq45X1CqMkbtsmVTaKILVL3ioJcQTAkGrvOeLe8Oy2ePy+GBkPdnKnZakzStU9Cw9XPjbqGaIl7MDzTlXqNl1CCbXMilYBAT+Nv6vm5GS8wfcIgtwYIrLsptmwO4tXD8R/1rBxnqKMwEH+2pla+pLpGVGKSqGbTl51DttALt2ZBZjhGiVSAg5pAkYx9/lUFtNhcS7n X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1277; 5:pHjCDBrADyz94GVAgJ/MgtsN8LsK+2FWxixRnF6fqkxo5o3ZRry93zCzZpqzUVIhSahN4SiXCrkrRXnl4fddu4h90GP40uBByHwnpR6r+E9qc8/BR9vlI4LuHpOws+u2J+20H4eGmizbP7srDgEfmQ==; 24:APq2zXUomIR1bBXaix49Pi/auYTqbfs++pKl7w8UZ7RsxNhq9HcsIi0pRbkcmp1mOd+BBhiIrPG1whH3mbvnHDcTgT6UoxAK+9j5uTzPs+Q=; 20:8bWmrVKt03yZ8ZCC+pFtrA0IQEAoC5V8mi+7yNDStTAXcrHpr8M3DXlwL/jnMjFYkCcWXNK69GyFENPj6BR4Ig== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2015 14:49:24.0627 (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: DM2PR0301MB1277 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 5/5] fsl: common: pfuze: no use original pfuze code if DM_PMIC X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
On 28 July 2015 at 08:48, Peng Fan <Peng.Fan@freescale.com> wrote: > If enable DM PMIC and REGULATOR, we should not use original power > framework. So need to comment out the pfuze code for original power > framework, when CONFIG_DM_PMIC_PFUZE100 defined. > > Signed-off-by: Peng Fan <Peng.Fan@freescale.com> > Cc: Przemyslaw Marczak <p.marczak@samsung.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Stefano Babic <sbabic@denx.de> > --- > board/freescale/common/pfuze.c | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c index d6a209e..783c46d 100644 --- a/board/freescale/common/pfuze.c +++ b/board/freescale/common/pfuze.c @@ -9,6 +9,7 @@ #include <power/pmic.h> #include <power/pfuze100_pmic.h> +#ifndef CONFIG_DM_PMIC_PFUZE100 int pfuze_mode_init(struct pmic *p, u32 mode) { unsigned char offset, i, switch_num; @@ -90,3 +91,4 @@ struct pmic *pfuze_common_init(unsigned char i2cbus) return p; } +#endif
If enable DM PMIC and REGULATOR, we should not use original power framework. So need to comment out the pfuze code for original power framework, when CONFIG_DM_PMIC_PFUZE100 defined. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Simon Glass <sjg@chromium.org> Cc: Stefano Babic <sbabic@denx.de> --- board/freescale/common/pfuze.c | 2 ++ 1 file changed, 2 insertions(+)