From patchwork Mon May 26 07:31:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 352441 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 264D9140082 for ; Mon, 26 May 2014 18:55:36 +1000 (EST) 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 1WoqdN-0002lp-8u; Mon, 26 May 2014 08:51:53 +0000 Received: from mail-bl2lp0204.outbound.protection.outlook.com ([207.46.163.204] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WoqdK-0002VF-7h for linux-arm-kernel@lists.infradead.org; Mon, 26 May 2014 08:51:51 +0000 Received: from BLUPR03CA030.namprd03.prod.outlook.com (10.141.30.23) by BLUPR03MB424.namprd03.prod.outlook.com (10.141.78.152) with Microsoft SMTP Server (TLS) id 15.0.949.11; Mon, 26 May 2014 08:51:21 +0000 Received: from BN1BFFO11FD011.protection.gbl (2a01:111:f400:7c10::1:142) by BLUPR03CA030.outlook.office365.com (2a01:111:e400:879::23) with Microsoft SMTP Server (TLS) id 15.0.949.11 via Frontend Transport; Mon, 26 May 2014 08:51:21 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.1) by BN1BFFO11FD011.mail.protection.outlook.com (10.58.144.74) with Microsoft SMTP Server (TLS) id 15.0.949.9 via Frontend Transport; Mon, 26 May 2014 08:51:21 +0000 Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s4Q8pFGt008906; Mon, 26 May 2014 01:51:16 -0700 From: Huang Shijie To: Subject: [PATCH] ARM: clk: imx: remove the CLK_SET_RATE_NO_REPARENT for imx_clk_mux_flags Date: Mon, 26 May 2014 15:31:14 +0800 Message-ID: <1401089474-14346-1-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.8 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.1; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(189002)(199002)(36756003)(104016001)(62966002)(4396001)(81342001)(77982001)(50466002)(76482001)(48376002)(46102001)(50226001)(87286001)(93916002)(74662001)(33646001)(6806004)(44976005)(19580395003)(83322001)(74502001)(85852003)(19580405001)(50986999)(89996001)(99396002)(77156001)(92726001)(31966008)(77096999)(92566001)(88136002)(26826002)(83072002)(87936001)(47776003)(21056001)(81542001)(79102001)(80022001)(64706001)(102836001)(20776003)(42262001); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB424; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:gate-tx3.freescale.com; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Forefront-PRVS: 02234DBFF6 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.168.1 as permitted sender) receiver=; client-ip=192.88.168.1; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.1) smtp.mailfrom=shijie.huang@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140526_015150_337577_E69EA5B6 X-CRM114-Status: UNSURE ( 9.33 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [207.46.163.204 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: kernel@pengutronix.de, Huang Shijie , shc_work@mail.ru, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The clocks for Quadspi controller may be different when different NOR flashes are connected to the board. But the CLK_SET_RATE_NO_REPARENT flag in the current imx_clk_mux_flags makes the clock do not have the re-parent capability. This patch removes the CLK_SET_RATE_NO_REPARENT for imx_clk_mux_flags. It makes the Quadspi happy. Signed-off-by: Huang Shijie --- arch/arm/mach-imx/clk.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index e29f6eb..32d6253 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h @@ -108,8 +108,7 @@ static inline struct clk *imx_clk_mux_flags(const char *name, int num_parents, unsigned long flags) { return clk_register_mux(NULL, name, parents, num_parents, - flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0, - &imx_ccm_lock); + flags, reg, shift, width, 0, &imx_ccm_lock); } static inline struct clk *imx_clk_fixed_factor(const char *name,