From patchwork Fri Dec 27 00:44:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 3407781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DDD499F314 for ; Fri, 27 Dec 2013 00:47:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AA182013A for ; Fri, 27 Dec 2013 00:47:56 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 12D652012B for ; Fri, 27 Dec 2013 00:47:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VwLZ4-0004R3-8N; Fri, 27 Dec 2013 00:46:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VwLYf-00008L-6m; Fri, 27 Dec 2013 00:45:45 +0000 Received: from mail-yh0-f74.google.com ([209.85.213.74]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VwLY9-0008Ue-N7 for linux-arm-kernel@lists.infradead.org; Fri, 27 Dec 2013 00:45:14 +0000 Received: by mail-yh0-f74.google.com with SMTP id a41so558166yho.5 for ; Thu, 26 Dec 2013 16:44:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dNmSrIq2muW2ro5aZfMgULOmMrYHqcwn71RccB7JeSY=; b=kRwGom6p3Rm80qIfNOe5S6hYJqLyMF9XulkV+jO0Wxt3OzSKbmYfZwxZehOe3zFL0M 5MaZ31nkz9IFYvLu7yvGyQ63cfl6nzKTkS65EI4aWGiANjgcdVF21Z7emJid46mHvCKX NLXchZmRj+dXgItBpjfdzD7EIydPyf8ES+Ih0sdudr4Mw8zSiehSXLrXTOtUjVZUtGi9 Gq4TXzKZrISV6rImB3F4F6cjl06ucn6fjEiXggrQGHuB7jKCryYPx7duRBb+pDP36XSd Oog4u5MxgRD9h6n81xIvKDSdx6VCeuEcTp3EqS24h4XBEslQbSu1vZYPhAIq9oY0mXoA qyMA== X-Gm-Message-State: ALoCoQmzcAeyYTskXJVFGvZ1eoXE4O5a9ygqvKL1HzCHeIyBgl53cOD2Nayki0AjXGyaLrtJYCvEvIyRv2UeQOkfrG5rgHEnU8x8KSSINA7pUaXQcFgDV3jXrioM2VArLuRVSr/qxriDM8w1sP0KYm1uDVf8/Z6e696Aj8Ru4Sy53Tl3UzIoM0AXfLyRX87zT3AmPmW/NXyd7mw630rgDUNIs9j5sKXdDA== X-Received: by 10.58.249.180 with SMTP id yv20mr16543618vec.11.1388105088308; Thu, 26 Dec 2013 16:44:48 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id l41si10141077yhi.5.2013.12.26.16.44.48 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Dec 2013 16:44:48 -0800 (PST) Received: from abrestic.mtv.corp.google.com (abrestic.mtv.corp.google.com [172.22.72.111]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 27D6131C107; Thu, 26 Dec 2013 16:44:48 -0800 (PST) Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id DD3B4220798; Thu, 26 Dec 2013 16:44:47 -0800 (PST) From: Andrew Bresticker To: Mike Turquette , Stephen Warren Subject: [PATCH 2/7] clk: tegra: Fix PLLD mnp table Date: Thu, 26 Dec 2013 16:44:22 -0800 Message-Id: <1388105067-24438-3-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1388105067-24438-1-git-send-email-abrestic@chromium.org> References: <1388105067-24438-1-git-send-email-abrestic@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131226_194513_854264_378652A9 X-CRM114-Status: UNSURE ( 8.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.2 (---) Cc: Prashant Gaikwad , Andrew Bresticker , Peter De Schrijver , linux-kernel@vger.kernel.org, Thierry Reding , linux-tegra@vger.kernel.org, Rhyland Klein , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Rhyland Klein PLLD was using the same mnp table as PLLP. Fix it to use its own table which is different from PLLP's. Signed-off-by: Rhyland Klein Signed-off-by: Andrew Bresticker --- drivers/clk/tegra/clk-tegra124.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c index 28bb238..14c3f2f 100644 --- a/drivers/clk/tegra/clk-tegra124.c +++ b/drivers/clk/tegra/clk-tegra124.c @@ -570,6 +570,15 @@ static struct tegra_clk_pll_params pll_a_params = { .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_USE_LOCK, }; +static struct div_nmp plld_nmp = { + .divm_shift = 0, + .divm_width = 5, + .divn_shift = 8, + .divn_width = 11, + .divp_shift = 20, + .divp_width = 3, +}; + static struct tegra_clk_pll_freq_table pll_d_freq_table[] = { {12000000, 216000000, 864, 12, 4, 12}, {13000000, 216000000, 864, 13, 4, 12}, @@ -603,7 +612,7 @@ static struct tegra_clk_pll_params pll_d_params = { .lock_mask = PLL_BASE_LOCK, .lock_enable_bit_idx = PLLDU_MISC_LOCK_ENABLE, .lock_delay = 1000, - .div_nmp = &pllp_nmp, + .div_nmp = &plld_nmp, .freq_table = pll_d_freq_table, .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON | TEGRA_PLL_USE_LOCK,