From patchwork Wed Jul 1 09:01:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 489977 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 BBD091402D6 for ; Wed, 1 Jul 2015 19:03:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AC6144B67B; Wed, 1 Jul 2015 11:03:20 +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 mINeWwvJHewE; Wed, 1 Jul 2015 11:03:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 306444B689; Wed, 1 Jul 2015 11:03:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B11844B65F for ; Wed, 1 Jul 2015 11:03:15 +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 7cLt1uMzXaz4 for ; Wed, 1 Jul 2015 11:03:15 +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-bn1on0135.outbound.protection.outlook.com [157.56.110.135]) by theia.denx.de (Postfix) with ESMTPS id 249C54B65A for ; Wed, 1 Jul 2015 11:03:09 +0200 (CEST) Received: from BN3PR0301CA0036.namprd03.prod.outlook.com (10.160.180.174) by CY1PR0301MB0683.namprd03.prod.outlook.com (10.160.158.153) with Microsoft SMTP Server (TLS) id 15.1.201.16; Wed, 1 Jul 2015 09:03:02 +0000 Received: from BY2FFO11FD011.protection.gbl (2a01:111:f400:7c0c::141) by BN3PR0301CA0036.outlook.office365.com (2a01:111:e400:4000::46) with Microsoft SMTP Server (TLS) id 15.1.201.16 via Frontend Transport; Wed, 1 Jul 2015 09:03:01 +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; 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 BY2FFO11FD011.mail.protection.outlook.com (10.1.14.129) with Microsoft SMTP Server (TLS) id 15.1.201.10 via Frontend Transport; Wed, 1 Jul 2015 09:03:01 +0000 Received: from linux-jyl1.ap.freescale.net (b51431-11.ap.freescale.net [10.193.102.204]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t6192mcr027832; Wed, 1 Jul 2015 02:02:59 -0700 From: Peng Fan To: Date: Wed, 1 Jul 2015 17:01:49 +0800 Message-ID: <1435741310-20022-1-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 1.8.4 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD011; 1:9NnW5dqJIrm5sxwVPKyGYl6N+JJ3tRPjDcaXAter88s02x9e528U743yH1S7N+GTZOiBOXNURcYPDJyptl8YdmJpW+jYCVVOh5MWhQYHG/dCUdviymrPWc7OUmtOjayr/yHTUqBo3CseRVWdk1mBshyY4o1RPeZDsVhcXYBazRSgtQ+k5IffXCwUZdidfOB69OHOXUH9mMpvCRdHS++vIx33PMHmeEUMCSpRdONI3a9aw6vxO6kr4dcKlngy2ddqqaqSIlxWuWXGEYUvPiKZdgMOdmTWT19MHSGRVQdWGObQ83Cve9VeQNmkZMUxl/ZcMmNbM0ivj5WouCOqb60+2A== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(46102003)(189998001)(19580405001)(47776003)(104016003)(5001960100002)(19580395003)(85426001)(105606002)(107886002)(77096005)(106466001)(50466002)(48376002)(62966003)(50226001)(50986999)(92566002)(36756003)(77156002)(110136002)(6806004)(87936001)(2351001)(5001920100001)(229853001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB0683; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0683; 2:rQbWtZdsxlT1uvymia1nGI2xVbcATHlFme+bXEzNeptT7rVNa7dGbe9eF7Z/ZOP8; 3:nPSLNCNXbQuIE0G60WDqqzk/8FVUR0WUARx7NY/gVsbNH11BBZ0ISoxpzuW0AOYrkUnkj9irxEcpxiZcQ1luT24pT1S2V3K93A0PyVloRqznt6dzI0uqXQ9L6aYDHA2J0bhL5oiHJKQkz521xDb9lFdSoMAJ6ItEFub62mdeDSLkrms/GvxBefWd19bGecNWcNs8boV+5F4UehaZcu9NlnS9M0tIqweuRxKdOv4be+U=; 25:PoNGVoqbkvcec+jokmMdcOG3+SfdXIBCv1KS59bY60g1e9hxOAmxNJCd9K64eei1D3ABHQovgZzc/TpQB4v3UeGtzy2VyHp8DqCqd3Hz+pUkGsH7i+XhvG9QadCp8NA+XI0vd2M5VmSAmr5mEdk0NrgxvmQXsPSkKv72MteiMRsrK8I6AfVoVhIIAc4FRSAvOBS5PFMksTIX/T/FPP+7yso3YDUxMkHw/jklSskDcthJvvJxusC7GARoUZjvTdK7S5NykdnsTEGZw6MYkeWLIw==; 20:tIfiJXNFjjByrSzqMTG7vcjWmpyiX7/BAeNi5MEOM3fbTp+n4taZez1b2tWWbnMAh8P0+mkEYArU9BaNTLvjDWd5roz22pZvFBga7LetVdH3noUn7+pqW/SMcBqG70w3S+EA0YZS9C6Ur4jYd4+Yb5FuNEf4Kbs6dVz3RMhU/3Qr2xla22Oz7sR6e4lF7iy7rG2hCqtKqDXJljRyGsivFyWcqmJ6lXdZvVCOR6F0wUdPji7dj/fX86gAQIclf2+oV9pl9/CSWJ/A+YYMYUAIZ1yUSvr9u48uMTUAC4GmCaXYVvsJ1PCBXVSCNG6fjWNG8C77qtu3VBYshCntnyhWGlPNPckUeekz4KkfAHsavyI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0683; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR0301MB0683; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB0683; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0683; 4:zPzZhwD5TkFoLiyDUqfuucvfOpv7oMNHn103PTeXjHlfRRacUIfilUq+WuWQmpiGoUqsXlotcBOJOLDyNhRd7zWN3fsUqKQMNSIy786O0NDOH79Fe7HYvFzM4w1LEUcnLSgLn2j88boMgywcrhlg+5Vhjd8I5P5FaF2k+FHE/Cvbn8Hytg6Yzqzq4rQDt9P1LU0fgR3wOhuRmFaru+7sq7tdSfni9or+sos7rhRw4EBU+Uaw74MhaycXEBjOxPeJwl4WjWyLzazQVgODSR96LZ3Fwo3uJxz2Nq3AsdVknME= X-Forefront-PRVS: 0624A2429E X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0683; 23:G/hRYZ0S5OIhRZZGUWboZZC7RMcK+H0nAWIOxARuGQL1nOUiDSLZMq/QBfG3FPNw9xYHvwJfShtUVbf/Fa2GK0TfT3JMH7JVwJWCgm0y4eKlejtLcSBANbCgW9rDTd2DOofXWmPJg8nPcx8JUusp1wv6m8qtbFM2hEUMW2/VXYgFZuHIfIbFKCrd9t6U980C9L3p4cok3biqmtz9LVyJwpqm7eYAtNrZwI98oFzizI0/ZmEZnt3OFg40imUJKYYd4jRVIPp7/5i/NmfWrsbka7ENGRNZNbWrKwbE9FZ6wvqwJlIl6+Jr94vBL/gWuK7ayQhcujJu3S280riG6XdIjLnF0h3uvZOyugqw+WvhJtRZOWKuNTLnFB39SBbJrSdglURmrlrtuYNqD8BQgYRlwMtSXl3lilpmnZ3L3wJvBLfS05YKKn2Nv51nzS0U0DVcvBJepxI4Hq13EQukGL5KZpfov5kxxlkM4nn/gA0IlryEP8mwSU6qOEV4T/IpCsd+WdotZgFUWXHNCpcb4ezes5ZjTTJYw8OWvPRP7Q6zmiKO158UvJhZih0Mo0R8KAdJufmd7c/Kpn0+HSGVO/izJaEEaHL//L1BNUn5NlXniL97JiHV6y8exX8WsWtvVPtGNotzwCTLUK9GNfDj0zN5K9HiMX7A//0eMKKlALTkCkzvw7qtgdCnGX1y8iw6cQHf3fjDQEV29UCJywMeYvvvlXVS6LyyqFwjIVf+9W3Zbp6g/DC7gN+cUO8K324kVjXGFxOsKGRGcg++iugGXSOPAWho1CVXgz8PtIdyDtbSOHI3JHs8Xo+nFk27OcAj9GJ9J9auQMNH15Jg+oBfspmWYJi8TeGR0d6w8pwdV+qsJtBgCpigzWh5uA1jQCsZNMRR X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0683; 5:Lkao5sCGBQVGBwqRHx1xS9/5Y1XCj8XpYFE8P0VCjxZLryrbwIK/duzPnv7va5SR7+6P0W4dTqotmiqcq4YleAezV3+Ry9ubR4DyXvCVb8i8SsUW5CUZNX32o+vTfSbSkf5IOdpNS6FhMH2lbuQauQ==; 24:JYmP1USi+JA20H/1e5gFdZxVhyJUbkr57F19XM4A5zKBnl2cH5GQFJl0nx4T+/zTmRG3Whr1fVHMba/X2pD4XirOdBq2opIk0QJuVc4S8dQ=; 20:jNgzS4cJ7iaxmzhKYCWyog4HZq4l0gEGPMPtDQGmcqyFu2SPUYGvJ0qbFdl8ZrUQirlkwJdT2Sez614SYL3U8w== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2015 09:03:01.1185 (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: CY1PR0301MB0683 Cc: fabio.estevam@freescale.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 1/2] imx: mx6 remove duplicated enable_cspi_clock 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" enable_spi_clock does the same thing with enable_cspi_clock, so remove enable_cspi_clock. Remove enable_cspi_clock prototype in header file convert cm_fx6/spl.c to use enable_spi_clk Signed-off-by: Peng Fan Acked-by: Stefano Babic --- Changes v2: Add Stefano's Acked-by arch/arm/cpu/armv7/mx6/clock.c | 19 ------------------- arch/arm/include/asm/arch-mx6/clock.h | 1 - board/compulab/cm_fx6/spl.c | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index b7e714c..7bd78d7 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -102,25 +102,6 @@ void enable_uart_clk(unsigned char enable) } #endif -#ifdef CONFIG_SPI -/* spi_num can be from 0 - 4 */ -int enable_cspi_clock(unsigned char enable, unsigned spi_num) -{ - u32 mask; - - if (spi_num > 4) - return -EINVAL; - - mask = MXC_CCM_CCGR_CG_MASK << (spi_num * 2); - if (enable) - setbits_le32(&imx_ccm->CCGR1, mask); - else - clrbits_le32(&imx_ccm->CCGR1, mask); - - return 0; -} -#endif - #ifdef CONFIG_MMC int enable_usdhc_clk(unsigned char enable, unsigned bus_num) { diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index a6de5ee..7b3bbb8 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -57,7 +57,6 @@ void hab_caam_clock_enable(unsigned char enable); void enable_ocotp_clk(unsigned char enable); void enable_usboh3_clk(unsigned char enable); void enable_uart_clk(unsigned char enable); -int enable_cspi_clock(unsigned char enable, unsigned spi_num); int enable_usdhc_clk(unsigned char enable, unsigned bus_num); int enable_sata_clock(void); void disable_sata_clock(void); diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c index 5b4b76f..d94ced9 100644 --- a/board/compulab/cm_fx6/spl.c +++ b/board/compulab/cm_fx6/spl.c @@ -303,7 +303,7 @@ static void cm_fx6_setup_uart(void) static void cm_fx6_setup_ecspi(void) { cm_fx6_set_ecspi_iomux(); - enable_cspi_clock(1, 0); + enable_spi_clk(1, 0); } #else static void cm_fx6_setup_ecspi(void) { }