From patchwork Tue Nov 14 07:06:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 837706 X-Patchwork-Delegate: yorksun@freescale.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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ybdvJ2xGYz9s7F for ; Tue, 14 Nov 2017 18:10:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 293CFC21EA6; Tue, 14 Nov 2017 07:08:48 +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=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 52C79C21EC1; Tue, 14 Nov 2017 07:07:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9868EC21F0B; Tue, 14 Nov 2017 07:06:43 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0046.outbound.protection.outlook.com [104.47.34.46]) by lists.denx.de (Postfix) with ESMTPS id 5F8AFC21EC2 for ; Tue, 14 Nov 2017 07:06:39 +0000 (UTC) Received: from CY4PR03CA0006.namprd03.prod.outlook.com (10.168.162.16) by BN6PR03MB2692.namprd03.prod.outlook.com (10.173.144.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Tue, 14 Nov 2017 07:06:36 +0000 Received: from BY2FFO11FD038.protection.gbl (2a01:111:f400:7c0c::124) by CY4PR03CA0006.outlook.office365.com (2603:10b6:903:33::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Tue, 14 Nov 2017 07:06:36 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.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 BY2FFO11FD038.mail.protection.outlook.com (10.1.14.223) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Tue, 14 Nov 2017 07:06:35 +0000 Received: from ubuntu1604.ap.freescale.net (ubuntu1604.ap.freescale.net [10.232.133.7]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAE76LKs030592; Tue, 14 Nov 2017 00:06:33 -0700 From: Rajesh Bhagat To: Date: Tue, 14 Nov 2017 12:36:43 +0530 Message-ID: <1510643206-28716-5-git-send-email-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510643206-28716-1-git-send-email-rajesh.bhagat@nxp.com> References: <1510643206-28716-1-git-send-email-rajesh.bhagat@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131551167960361670; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(39860400002)(376002)(346002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(106466001)(16586007)(50226002)(105606002)(68736007)(33646002)(2351001)(2906002)(189998001)(2950100002)(50986999)(76176999)(6916009)(50466002)(104016004)(48376002)(6666003)(53936002)(316002)(47776003)(5660300001)(8676002)(86362001)(8656006)(81156014)(77096006)(85426001)(81166006)(498600001)(54906003)(36756003)(305945005)(97736004)(356003)(4326008)(5003940100001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2692; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD038; 1:vVSbgilNtiKtBYxqPTBLpM52qn/YFKIzDo+/YJHvs5aNwKl7bZpXSJKRvYXJoQhI+fItAfOhOdkrq6km5G5zoyYnlxgdB2F9s4/XS4LsYuVwJu1zSL4TbaDu73XlAvfS MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 76d3fbee-2412-443d-aac6-08d52b2e3e87 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603258); SRVR:BN6PR03MB2692; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 3:yOX4ZSdJcvRVyvDU+uB5ajvo2j1ysN71aKng4tsNAUEO2VV7VfmXBwJIJXiYN8taa3uhunRbRLjy4Y2k/tSi69jBgZ4Qg1ewJnxLYUPa92Vq0wmCP7QniWrtd14jf3O08ziw/8jFq1scTNTwe6UYtqNgHAvHBDG6Y8HT2y2bcgEVxV/YEJtnFo42qkAd5jlBnpqdhBVJMRzRBzldBZ8RW/kc4+bPU3/AtPEIsCdlqfN803TnrQY3MaiojOzxU7qXfnRUtbumKEFx1uC8GQx9PUiV9uhgyNhas7BaidT4icOj2KpG15lMfut2mo5A5CezTklWDmjanUZ6bsfvQwolhjzHAFavRTflwGoPLRxbUjo=; 25:w3TSgVvACemmTzwqA4cgCc2cvv2D7eruB3pZNCpMn+Eo7VNbFj4JH3WQ7rfj+Cv1/LAd+IxLmtUWwqUAnU68RyDmBVNqp8xI8jeGhPZKXHUJptrIsB2Qat/n7Y3a3BZu7W1ykWNnEtqMBLUOxa81YfbNU+yliDwfaTQGabuSo4tncuKA6eae0oAcXBR6ADoW/Qb/xbcOk8zSuFaYv5wH7YY5RbAYNNGAdcuG9Mmu1r2oa/LxxUNm7/JajpqZLAfAHLDqIY6VH7Zk2q3TdRD4V0OLYaQBC2dlykNO32CdtBF/6j/5k8KsJgExHCQBbveEbEX+v+h1nV5pV0TW2ZU/ZQ== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN6PR03MB2692: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 31:ylCM1wZX1CWkI22gXujHPPVC144azq/tPwiIbitwDXY0ENsDni3nkTR5xd5nzq8lXr+Kc1K4MAA08hwfD8R/+hPk6fAIPaeivvmzKCZBNXVAXyRbs1YwehzbXpOZr7+47DwxIWShVKXO4u1sIohDRP7lfzx7AJukVqO5YxoGhLfmRPUPrJo1tlGSLV2/FhbHAzL7yU99Uvv5Oqw8ldnCfOS+nOFE8FTE/i5mECt5+kg=; 4:VbD72EurUVDreD1/oARPb6YkvVnxrWqMF47kzNwxkVK1wwRmiyOpG9RS+ch7GF4ZP1jM2/h7HIamjxuiUaxmjs9wr287xano6YqCpm383nx9abLbh2Epzt7+8SLHJKZR0mdgBiprisJZ+YvEi2YeKEn2M9zaORxE/xLgqe3aJl62YlNLzCZqpJSuuNmXoNb23Ws/Mflkhe0ySmKR9to1hNsG6OuZb8LOTBD/hJpBdCKGrJO2iN3hKF88hx0fKgiGQxgYYNNTivCpHlTjPx8tHMZV+6a7TH4yobB7lmEMFpASKj6hvZwpu1qQXLdCpX9A X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(10201501046)(3231022)(93006095)(93001095)(6055026)(6096035)(20161123565025)(20161123559100)(20161123561025)(20161123556025)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2692; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2692; X-Forefront-PRVS: 04916EA04C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2692; 23:osSM11wi3On6l2QuUHO8bxJf2PoJ05GBUrSTThO+D?= 1YLbD2CLsQyG4lsNNXXjVkYUfCaQKwtVFgriho6bAMBAaueR1VQwXNnwGtCn5+Lew2fyAgYkf3QeQ0Z4iNMOOsBAA4uiIfUxOn9kukuSsQAKnn0CIkKTZE7YygA5EH1rji4RdCNTLXjS2qpQnLeP6GvHOMX0an3ArfPpVKIRZn4RD9BvtIQCU+Sj4uz7t2EtGXXDS7rTcF9UGWIWBS6qK7bSXpP3anqjJj7yLKCwkXxqCpEQvN9WZwwZF8tyM/lxDxFlewlAkayvv+6EkIbPUgrBspRvcLBf/Y7fseMwEpg1dVQggD01kmkYa3igZbNkgJrhK1WmIU3n7RdpRncCQUFLyXu8ppk39B1LMQkIrYhAYomzbS12iQBIFhMOZdaN1AbUjYRj3Y2tjd2wuwgZXrstk5fqJTYJWCrwDEPm9OxaDofOFtimjMVg6+TM2r0PPneE4jO6TsKMZo9EGOta08iG8Zu9PrGJ9IEaX9+3d9qchieV9D65lORm056hrj9I3wt6C6HC0QtlrmjvfkDWq9onecjLwY3dhZ8nYeHLKBtuN8ZTx2ba/a5jlyWZjF1bXRYgubVSxJgqwfNbmN3D4lwecZDg4ys0jvBhT15EFptsDRYskL50H3HV00wTri5WYdQwQYzFdXVTyrdK+YYOHAAPcHAVVRqWVyZ8aJpmZV5SSAxDz6gpYlUZwVvhnhVVeOTMpI3/2O5EF10Jl7RUa10TUGtm1P/68u/D5Wv2C2COz6o7woHb9kijijf06Xb+MnHHiTbSHL2NjCVWessHsO6DEsNB2f7rO0Pm/FPXFtsYl0E+F3puugh+3lbFWbvAqvpJq6jCMFGu35CevY5la+cMMB5dphBmF+ni6p7t2/XgdoigLri6torTSyKrOwDZy91NySQgRHHz/Rui8mKGiamJxktQh0lJNNNBf127370n2zcKdZdxdAZIYu7cq9Rbe3GxwRtCMO5Ya334+CHdp8KAhdrvZOT+hupc2SGlW4DrXJVylvvOs9D/kfwqu5fLmkCo9LAru0D2RUqlIHtnkt8fWzLDIug4BRnT/VIdbTnBzwYOaoXLwPL0oGwXVRV4/mFXPWVt3pTXEuNMq+tss4jqeagQNS1zwQ7mdUasC/cwve4frNu+/A2u9DL1NzFuys= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 6:ENI6CFGSA58LDuqqGYoXmAwlBVEmChkm5p8muljwGUt2XzHCJH8HboGAkDIdDtAWsAkXhx3ajRmITDCrQulaON7nas4dHzbFvW8dEbSjzrVGjS/X8fbTXse4ZeUqmAXBxrmCQb+41bw6jplq13reSfRjWWSvwmRFiRPBeZ90F8L6Yd7YN0fXZoRnJ+LMa2oXxY94rKk2S9ULyIg3u/OOs4aFTSK464iZ1wT6yCd+7L1sYhQ7grRfE7z2b0rviq87yyMHM5iiqIVTGaBUhjRdsQTClrDV0qgU3IPuXtoMpj+lAVptIH6+CvL5FXJe9yS6S9+ikZmUpp08R/mGze3xx72FUDAoOji3JJrYU6jB4Wo=; 5:GK4gVY+ORZyYuUkw1PiPx9PIsQVb4ZhL2ay7wFGQd75/yUfR+S7848MmuSoMDblLGnVKqO+3dBikZe3FohjRBTQvmeJyQMfd7dvw9nfCmWvoAZygX6hdUL7/dcr+dU5dbflrcRwE3IIxDg2CtiZiYwu46dkz1MCaky+bghZa23k=; 24:TU459YdLHssU6UD3kIGnSrt8BAKh+7Hnrq/eu12PhcGsPrmgO5JcpbLdHP0Pwwcma02iSm4c1QbxhrlLsBu3ZgKQy1fQ9fnKWl5M2eC7tnQ=; 7:uNBfHbofzKUHr9CRzQ6JI0K63dq/fItua5vsQd+/N2ZjnUrd3MbTFmSvQFaQKSpE+sRk/zjpKFbsbz3sDAIqIE56rBs9I7lRQLcwDNMceP3sSf/Ycxd97d/h20tHgt+1+kNfxpvtbRxckH2BfR8KCy4siBD0XguHKzsqSb/1PaD+reC+ZzweYJTszxBUEnuP8omVjwpZqdRYyyMUVpuJuAskdrTRvZH4cF3xCQO/XhBF4VM+D1mxDs1wo4sbuR8G SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2017 07:06:35.8333 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76d3fbee-2412-443d-aac6-08d52b2e3e87 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2692 Cc: priyanka.jain@nxp.com Subject: [U-Boot] [PATCH v6 4/7] board: common: vid: Move IR chip specific code in flag 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Moves IR chip (IR36021) specific code in flag to resolve compilation issue where it is not present. For example, LS1088A is having a new LTC3882 voltage chip. Signed-off-by: Ashish Kumar Signed-off-by: Rajesh Bhagat --- Changes in v6: None Changes in v5: None Changes in v4: None board/freescale/common/vid.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index 921841f..8acadc4 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -41,6 +41,8 @@ int __weak board_adjust_vdd(int vdd) return 0; } +#if defined(CONFIG_VOL_MONITOR_IR36021_SET) || \ + defined(CONFIG_VOL_MONITOR_IR36021_READ) /* * Get the i2c address configuration for the IR regulator chip * @@ -73,6 +75,7 @@ static int find_ir_chip_on_i2c(void) } return -1; } +#endif /* Maximum loop count waiting for new voltage to take effect */ #define MAX_LOOP_WAIT_NEW_VOL 100 @@ -184,6 +187,7 @@ static int read_voltage(int i2caddress) return voltage_read; } +#ifdef CONFIG_VOL_MONITOR_IR36021_SET /* * We need to calculate how long before the voltage stops to drop * or increase. It returns with the loop count. Each loop takes @@ -243,7 +247,6 @@ static int wait_for_voltage_stable(int i2caddress) return vdd_current; } -#ifdef CONFIG_VOL_MONITOR_IR36021_SET /* Set the voltage to the IR chip */ static int set_voltage_to_IR(int i2caddress, int vdd) { @@ -298,7 +301,12 @@ int adjust_vdd(ulong vdd_override) int re_enable = disable_interrupts(); struct ccsr_gur *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); u32 fusesr; +#if defined(CONFIG_VOL_MONITOR_IR36021_SET) || \ + defined(CONFIG_VOL_MONITOR_IR36021_READ) u8 vid, buf; +#else + u8 vid; +#endif int vdd_target, vdd_current, vdd_last; int ret, i2caddress; unsigned long vdd_string_override; @@ -369,6 +377,8 @@ int adjust_vdd(ulong vdd_override) ret = -1; goto exit; } +#if defined(CONFIG_VOL_MONITOR_IR36021_SET) || \ + defined(CONFIG_VOL_MONITOR_IR36021_READ) ret = find_ir_chip_on_i2c(); if (ret < 0) { printf("VID: Could not find voltage regulator on I2C.\n"); @@ -393,6 +403,7 @@ int adjust_vdd(ulong vdd_override) ret = -1; goto exit; } +#endif /* get the voltage ID from fuse status register */ fusesr = in_le32(&gur->dcfg_fusesr); @@ -532,6 +543,8 @@ int adjust_vdd(ulong vdd_override) ret = -1; goto exit; } +#if defined(CONFIG_VOL_MONITOR_IR36021_SET) || \ + defined(CONFIG_VOL_MONITOR_IR36021_READ) ret = find_ir_chip_on_i2c(); if (ret < 0) { printf("VID: Could not find voltage regulator on I2C.\n"); @@ -556,6 +569,7 @@ int adjust_vdd(ulong vdd_override) ret = -1; goto exit; } +#endif /* get the voltage ID from fuse status register */ fusesr = in_be32(&gur->dcfg_fusesr); @@ -666,6 +680,8 @@ static int print_vdd(void) debug("VID : I2c failed to switch channel\n"); return -1; } +#if defined(CONFIG_VOL_MONITOR_IR36021_SET) || \ + defined(CONFIG_VOL_MONITOR_IR36021_READ) ret = find_ir_chip_on_i2c(); if (ret < 0) { printf("VID: Could not find voltage regulator on I2C.\n"); @@ -674,6 +690,7 @@ static int print_vdd(void) i2caddress = ret; debug("VID: IR Chip found on I2C address 0x%02x\n", i2caddress); } +#endif /* * Read voltage monitor to check real voltage.