From patchwork Wed Sep 23 03:13:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 521573 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 3F1521401AD for ; Wed, 23 Sep 2015 13:13:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EEB9A4B86E; Wed, 23 Sep 2015 05:13:53 +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 Db1YuOhH0T4z; Wed, 23 Sep 2015 05:13:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 152274B803; Wed, 23 Sep 2015 05:13:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0594D4B803 for ; Wed, 23 Sep 2015 05:13:51 +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 EnYdaSRB9d_w for ; Wed, 23 Sep 2015 05:13:50 +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-by2on0142.outbound.protection.outlook.com [207.46.100.142]) by theia.denx.de (Postfix) with ESMTPS id 1B3A74B800 for ; Wed, 23 Sep 2015 05:13:47 +0200 (CEST) Received: from BLUPR03CA004.namprd03.prod.outlook.com (10.255.124.21) by DM2PR0301MB1309.namprd03.prod.outlook.com (10.160.222.154) with Microsoft SMTP Server (TLS) id 15.1.268.17; Wed, 23 Sep 2015 03:13:43 +0000 Received: from BY2FFO11FD040.protection.gbl (10.255.124.4) by BLUPR03CA004.outlook.office365.com (10.255.124.21) with Microsoft SMTP Server (TLS) id 15.1.274.16 via Frontend Transport; Wed, 23 Sep 2015 03:13:43 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (TLS) id 15.1.274.4 via Frontend Transport; Wed, 23 Sep 2015 03:13:42 +0000 Received: from linux-jyl1.ap.freescale.net (b51431-11.ap.freescale.net [10.193.102.141]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t8N3DTNE008362; Tue, 22 Sep 2015 20:13:40 -0700 From: Peng Fan To: Date: Wed, 23 Sep 2015 11:13:28 +0800 Message-ID: <1442978008-12306-1-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 1.8.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD040; 1:l8PeSRhESoh2UGKCgmTJ01d+nfxop0xLr3YtYInx8M09pgCWKTHoJSlzWQByVAdp6RhOxO/yCFc1HSKt+9Q1crYRtseUWuitu9tvQ3k/H64wP1WqVkPfOqryVHf/A0ru4+AreGa5LT8GMw4+fdPPvgkDNF0/KSLSrBJqTtoIFo2sq6PRr3pv+34MRMBTqXlzoQlrVmGHdMHiEgJcO7gzFa8Xk9YYVY/R40CmZ2TolPKGxIHdJGR4PArL+v4N2xtetYVf47HtBp1KAWM+mCLkbudCGDAUeece4z8/szFXmSktwV6/6igOfG6k6mLocHJWzALeMkjnPLvFRQjgTuIo9kLx2GJwPNjFU+HTMI5k/CyYol+dY072C47IlgSeW/3kqzoLFJBQBUpqw3IBn+kRGA== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(50986999)(5001830100001)(11100500001)(47776003)(50226001)(5007970100001)(92566002)(19580395003)(85426001)(106466001)(2351001)(19580405001)(105606002)(23676002)(62966003)(77096005)(68736005)(86362001)(229853001)(64706001)(5820100001)(69596002)(77156002)(36756003)(4001540100001)(107886002)(97736004)(5001860100001)(87936001)(46102003)(81156007)(6806005)(189998001)(110136002)(50466002)(104016004)(5001960100002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1309; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1309; 2:RO4teVMha12seFe0eXyBd1IVxOJKVKvLojgYBqomn4EE4YYG3cHv1AUDvNvYGi4FQpS/BjPOLAAEBq4GQKB0ySHo6XsWM5tAXuWLMXgeOU1OYxkpqIBrO0voEnIvkZpNzsBMdWJxwJtJ2L3E5Pfn6kcC4F8uP1i6oqEGsveOUiM=; 3:lCIEkxHyLQF36tUg1HJjMmnF3otZ73VS2o+Lpsg/F28ASfwlVvyyaEmaprKasY34qAw5vfD7VbSUIvHD1xzk1JTRHsaJ1Jqw8iudB8S5KWdEASSPagEzn1JqdW74/rYczrhEWCb76FIDnbVtmvaqVENVBBzRth03iwBo87D4HbIZ58XCB4y8O2x3EBD0zIinKpyzxJnW6U0MnIgbKi+3HDjj+YQpt/Rjsb36HiwCA0E=; 25:4LM0npSd0IUuXTiIOCMbMQF8PLeQT7gigmHUbn8M7pZZUZ7U5fkPdYuaiH9CCruGwGspq/O2WdQLcuD4+wraJbw0fagywA9hEP7bQ2dFesFhNdMfB+dYRiWP4ri2wddDJW4eqzjjJPVXXF1/nWBvXqI+pvu0a3JRU9nAx1Pf60uzGOhdjEdwhexuxALPw9bTwo+MsIGiYudEC+H1aBmanBvOw7523qgmgaeVctdSk9QdD3cEw5m/hnj7dfhXkUP1lNzlbbrmeBUn0X7w5rX4AA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1309; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1309; 20:1fDIWT9GX9ImWXgI3Bf85g3+Ppbde3mbcHkHkKClk2xlRDZIYJ2Ddmo2lUIGygCbfTQedCnLkyXyrJkxD7NOccbb00Lwl9om2RnzOcoppL2Lr4hkGhwXPdq0d+KXYttUJgBGJxVM2CYJUa9oLOk5514Z4XTLi3l2tnFddgjirBbOXG6asfnusoC8jJxE9u2kkSqYKD+fbGZEhQ0cK2DRw+UMF+SXz7shkjapG360ryqqVBwjKs40nqLMuvEJQyb20iE0DtRAX/eRHc9NrNZDjzmMmCkTZEsQFuNAYIbMeechORoQNzqRLTcHpDVPGAcLy6RQnRdS3nioJr+jZOiHYK6Y0/DqkMsaEKc+0nkzMw4=; 4:hxnr9kJnlPvOVNuRCN5XFvMbl84Ho+7J9DYJcITmVmz5eddiD1Vup1fObxN1t+z/4wNIpIBFFdIHRkQLnswmv/LmzYAgjuOFgnXUS7gSC+rhpfceEiJjgqSBwbcqeO7DSIqSzqA9LWue9V9hzxrCPVQw6wCdZ2WFmVhzbcrc2xYSYHI/NgzLChi4fETSX2/BQJoGu5xyexXRqwmE4/6JpKVNOBtlWVL1iqXiEHjjxGAfpsPq9QRba+gtd7qaWr0NOp/XiM9njjaRqgB8CZCGKputCuMUKqbyMUS+xvi9+Dzok71QUSYiKxf4uAxESrWJ8wcYLiz3XUZohyd+Y8On2lSMYWc0DDrNgL4ENWHdqRA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:DM2PR0301MB1309; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1309; X-Forefront-PRVS: 07083FF734 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjAzMDFNQjEzMDk7MjM6YTNXZEU4bFpvUjdUU2tqTU1EUEEvdlZP?= =?utf-8?B?WVNGOS95TVN2azlpRHdXZmV5YVhIcS9oc3ZhOEY4YWp2aFByKzc0RFpqRDdL?= =?utf-8?B?ZDhaZ0htSDdkZko4K3FGb1NmRytoL3RMTDVrNktMekEwM1hrdkdSdjJ4YzJp?= =?utf-8?B?TmVPRTZYUGxobmlRa1E2VGRTV2pwc0k0QU1wK2ZDMHBsZUdkRktlSC81Q0xI?= =?utf-8?B?K2tYVGNKUHVpZTg2Ny81a0dmZ0dRTmNDWkswWFhCMEc4RnBmSEp6TUJEaXkv?= =?utf-8?B?a2tOUVdVUjF3YnA3RmE0cGZDNUdNKysrSDdodEJISlNGSUgvSkthVEMxVmNE?= =?utf-8?B?dk1TUTNsZzcydmp1d0tqRy9pMWFJOHZzTDV4cXRINzAzUzFoWlA5S1RVUVJ2?= =?utf-8?B?c2g3VnhLVjFNeWhYSkgvRWJYdUNheDkvRGNoR0xMMXRYSEIzYmx2RFZEUnZK?= =?utf-8?B?VXJRTjYzTi9ZNE5hb2NnMk9UUy83M2JlV0pYeFJZaEZmbWdDU0JtbldlRXNS?= =?utf-8?B?TmlTc0F2Z0xyMU9FSEVuSkVQKzFiMWMwOUhYZVhEaFR2b1dQM3NUcThRVk5J?= =?utf-8?B?VHF5djc1cXh6V0tvOENhZjJGb0ZRVUx0Qi82TzV0V0FTSVZFTVB3bVo5V25H?= =?utf-8?B?Y3FjWEdqOGU0T2gzem5ucUt1UzdrUVhvOE9VTWg4ZDBodlJmS2RnNDNhdk1O?= =?utf-8?B?U1lRakZKb25kSGVxRm9uZ2tTVndLUnlLMmdRakFpem82MFVRVlI0NlFpeHAw?= =?utf-8?B?OGxseXR4MDI0cVFhU2gwaHRRQW1zUUNuR2R0eExoRW0zRE1KQVQwQWNzZWcy?= =?utf-8?B?c1lyWGp0RTJ2YkUxUWNKcEd4YTVpdUp6Um1EZjV2TVE5RU1IRStWelc2a0Vl?= =?utf-8?B?RldqRndoNFQwUWVFdklWU3paV2Q3Sjc2cTdybmRaanZpajFSTVBEMWpFZW14?= =?utf-8?B?Zm5IenZGS0JucFM3VjQ0akpWL2VjK2JWblRzc2Z2TmlibWR6RXoxaEZnV3c2?= =?utf-8?B?ZWlvdmNIcWlLSXUwd255R0ZhQVQvdkhPMG9UMHdGS3NORTNTYU9qaHdaTHdl?= =?utf-8?B?RnB2M3ZVeDNWZjBnSW55TFpLdGVJQmwwZVRQTG96VEJnNldNcTY3WVFONlpm?= =?utf-8?B?NmRVZlpTSEVpSGtCcS9CNlowYStpQmQvYUQ2amozYW5vRERkMFY1aUMzVTcy?= =?utf-8?B?VitXb2hsY0JDdzh2cVB3OHMxVnB4ZFU2VnBOTFcvelN0NEtKNkg1K1MxYkZR?= =?utf-8?B?RWdkY29ZSE1COHFacUZrWEVpc2t0WGJrdDI1K0loZGY2b085c2k3VVRjMWVY?= =?utf-8?B?Y09Pa1l6cW9WenNxczBDR00zZ3Vtc2hEVFZaY29ncGtla2F0cEgzWHM3UUNu?= =?utf-8?B?aUM1aWZmTGpDbkRoQVB5b1BSVHdaU0F5cmFSWGN3WXU1YmQyOERjM1JYbGJi?= =?utf-8?B?WXZ2WmRpWi9TT2Zxa29rY095UFVGL3RLZFJjVGh3dUlqM09GWG8vWEM2RmdW?= =?utf-8?B?M3NsQ0l1TTRhSkxyQ0R2dys1OHVTeWtYazlIZmN5eHJqSitpZUUwa2ExMUNh?= =?utf-8?B?bnY1UjFCQ2RZeFVHL0h5T3EwY3J4RFJUdHZseHJiQjNZUVdrQ3BYdURnSldj?= =?utf-8?Q?hX6geQDZFmg/KgSs7FPLPU?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1309; 5:F0b6n+mk7QJPVsZDEh6+5h3V8MT40itoCCyC0c49cCKA1xcOzeURl5l8vg4tFvmzPnLo0e8Jj6OtdGMdDcbOBDjEJRj5YUDMZJ8cypBV4P6xlNxgOxz3Go6xPhAN5wDyH2Fitq7eh/L5J10Zct73Ow==; 24:ItekH+g9e8w/Fj42v78SyfcCh4UtPzv6yZ2KMiee1PlxPjIvUvLQi05aSOqsjNlENvxth1XjpnsCOzh2qZHi05C5DfMuTKzXfzeqWMSsOKM=; 20:aiTXoNZkp92ya7yLtvEPLLNLH+lJ5DaYjE5wWGRoHra7DG2+nIws0TDz/bP85fG614Hu02IihmHiO9TifM7E6w== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2015 03:13:42.9996 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1309 Cc: Fabio Estevam , Bhuvanchandra DV Subject: [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode 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" Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration. "c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings" Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode. In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610 and mx25. Signed-off-by: Peng Fan Cc: Bhuvanchandra DV Cc: Stefano Babic Cc: Fabio Estevam Acked-by: Stefano Babic Reviewed-by: Benoît Thébaudeau --- Changes v2: refine commit msg, "add mx25". use cleaner way to for setting mux code, following Benoît's suggestion. arch/arm/imx-common/iomux-v3.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 9b9cf58..228d5f8 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -11,10 +11,8 @@ #include #include #include -#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610) -#include -#endif #include +#include static void *base = (void *)IOMUXC_BASE_ADDR; @@ -53,7 +51,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) } #endif - __raw_writel(mux_mode, base + mux_ctrl_ofs); + if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs) + __raw_writel(mux_mode, base + mux_ctrl_ofs); if (sel_input_ofs) __raw_writel(sel_input, base + sel_input_ofs);