From patchwork Wed Apr 16 18:33:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Paton X-Patchwork-Id: 4003621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7B875BFF02 for ; Wed, 16 Apr 2014 18:36:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3EB620353 for ; Wed, 16 Apr 2014 18:36:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB2E320373 for ; Wed, 16 Apr 2014 18:36:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaUew-0000oF-Aw; Wed, 16 Apr 2014 18:34:10 +0000 Received: from mail-wg0-x231.google.com ([2a00:1450:400c:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaUeq-0000iy-EV for linux-arm-kernel@lists.infradead.org; Wed, 16 Apr 2014 18:34:04 +0000 Received: by mail-wg0-f49.google.com with SMTP id a1so11415031wgh.20 for ; Wed, 16 Apr 2014 11:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=HFu+LhETOqMA5zvZJUyoIxFPgGn+7BL69WVukSZ15g8=; b=oyzYDiqNDyksSP6WtJA825+6F+CKZpecwljifE1iwmJdoNbH4lIROyke4zGWQQLsrR M/hranghUEoOu5eC6+7g9WJeioL+SGTlxaATSy3cpdDITdeYP9ccZurT0kJwg9Fh3h71 t/uFdvZ/nSajbFAQFBj1LQ9b7Trxca9Ha18sLhCjww0NxVJ6LNRAYg8HvASsh8E0uKz9 Eb9leM8pKHJXWj82Mofts0X3RDfAnmuW7u/IDsqmHR4azGM1w96J6jcD2GQzHmesw7ZM gqaVI360BUzg+khbDkLIIGLmtu+iFUNAtkjNjMSHs26ryPY3oLwlneh3lJnNnUJy0ms1 iwDA== X-Received: by 10.180.76.146 with SMTP id k18mr11484140wiw.5.1397673221841; Wed, 16 Apr 2014 11:33:41 -0700 (PDT) Received: from [172.20.0.44] (hades.darkvoyage.org.uk. [81.187.177.1]) by mx.google.com with ESMTPSA id ej7sm37440948wib.9.2014.04.16.11.33.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Apr 2014 11:33:41 -0700 (PDT) Message-ID: <534ECCF4.9040108@gmail.com> Date: Wed, 16 Apr 2014 19:33:24 +0100 From: Iain Paton User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: linux-arm-kernel@lists.infradead.org, Shawn Guo , Sascha Hauer Subject: [PATCH] ARM: imx6: clk: i.MX6 DualLite/Solo i2c4 clock X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140416_113404_650178_B63371D5 X-CRM114-Status: GOOD ( 12.42 ) X-Spam-Score: 0.1 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Compared to i.MX6 Quad/Dual the CCM_CCGR1 register in the i.MX6 Solo/DualLite replaces the ecspi5 clock with the i2c4 clock. Handle this difference using cpu_is_imx6dl(). Signed-off-by: Iain Paton --- arch/arm/mach-imx/clk-imx6q.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index b0e7f9d..2961b16 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -352,7 +352,13 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[ecspi2] = imx_clk_gate2("ecspi2", "ecspi_root", base + 0x6c, 2); clk[ecspi3] = imx_clk_gate2("ecspi3", "ecspi_root", base + 0x6c, 4); clk[ecspi4] = imx_clk_gate2("ecspi4", "ecspi_root", base + 0x6c, 6); - clk[ecspi5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8); + if (cpu_is_imx6dl()) + /* + * ecspi5 is replaced with i2c4 on imx6dl & imx6s + */ + clk[ecspi5] = imx_clk_gate2("i2c4", "ipg_per", base + 0x6c, 8); + else + clk[ecspi5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8); clk[enet] = imx_clk_gate2("enet", "ipg", base + 0x6c, 10); clk[esai] = imx_clk_gate2("esai", "esai_podf", base + 0x6c, 16); clk[gpt_ipg] = imx_clk_gate2("gpt_ipg", "ipg", base + 0x6c, 20);