From patchwork Fri Dec 27 00:44:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 3407771 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 4BB4F9F314 for ; Fri, 27 Dec 2013 00:47:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70FDC2013A for ; Fri, 27 Dec 2013 00:46:59 +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 738552012B for ; Fri, 27 Dec 2013 00:46:58 +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 1VwLYj-0004I4-KN; Fri, 27 Dec 2013 00:45:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VwLYV-00007c-KC; Fri, 27 Dec 2013 00:45:35 +0000 Received: from mail-qc0-f201.google.com ([209.85.216.201]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VwLY9-0008Ud-Kn for linux-arm-kernel@lists.infradead.org; Fri, 27 Dec 2013 00:45:14 +0000 Received: by mail-qc0-f201.google.com with SMTP id r5so558125qcx.4 for ; Thu, 26 Dec 2013 16:44:50 -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=d2ZCaCoCDBrddozHzhnnR247bhj+FPub2hzYThIhFrI=; b=boqIYToB91gNYXdf+/YqDa+f++UgczsmIpN9D5vmaZdT7DqFF5YGNbIozYQDB3nZaC k3fd/VJMtkumTLGTwSWsZGs0EjzJRTRTXj7cnEO3ajPtbdYm0xRezrP/M4yW1yXK3Zlj JliACWSFtZQVu41RfFHrh75ZFsW8HI8KKR9F+Ko8OQ35GBPTTuRWCNhQA4sbLHXI+VAs HBbLR1P7z+IFv2nKmRyvC7mvm81bqLy3ubX8eWP8CGtAOPjPGkzPCi3FixFJ5+OQdFUb m5zy4KMpSaxDUfE5H3UBtLMMsVQ8IWsUoXqqqJcbpVAwcXWLE896hUbTWCVP44vrMlnf sRzg== X-Gm-Message-State: ALoCoQk0udxo2/6+JSb3JHo5xnO/JcXYHeX5cY2LeQzhLXywSF++x/39FNGa44DfuLn39byWujLHLRFgYTi2wb/mMkg7csyRnk5O5TQLnHh8GFq09kqDOKJta+uTyjvVfvhFozU6vIaAVNM190CSsbHyok8NaSY3eegRTxdU9BsuGVfW3W7XJhAMyqfDbYWhYFrGdtI57CpT6W2z5qkvZc/J3OrHYSA84g== X-Received: by 10.52.167.129 with SMTP id zo1mr13582426vdb.5.1388105090275; Thu, 26 Dec 2013 16:44:50 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id o30si10144223yhn.1.2013.12.26.16.44.50 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Dec 2013 16:44:50 -0800 (PST) Received: from abrestic.mtv.corp.google.com (abrestic.mtv.corp.google.com [172.22.72.111]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 1EE405A41B6; Thu, 26 Dec 2013 16:44:50 -0800 (PST) Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id D5537220798; Thu, 26 Dec 2013 16:44:49 -0800 (PST) From: Andrew Bresticker To: Mike Turquette , Stephen Warren Subject: [PATCH 4/7] clk: tegra: fix host1x clock on Tegra124 Date: Thu, 26 Dec 2013 16:44:24 -0800 Message-Id: <1388105067-24438-5-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_738989_777FAB6B X-CRM114-Status: UNSURE ( 9.87 ) 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, Mark Zhang , Thierry Reding , linux-tegra@vger.kernel.org, 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: Mark Zhang The host1x clock on Tegra124 is a 3-bit wide mux with 6 parents. Change thte id to tegra_clk_host1x_8 so that the correct clock gets registered. Signed-off-by: Mark Zhang Signed-off-by: Andrew Bresticker --- drivers/clk/tegra/clk-tegra124.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c index 0fc9126..743ccb4 100644 --- a/drivers/clk/tegra/clk-tegra124.c +++ b/drivers/clk/tegra/clk-tegra124.c @@ -775,7 +775,7 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { [tegra_clk_gr3d] = { .dt_id = TEGRA124_CLK_GR_3D, .present = true }, [tegra_clk_disp2] = { .dt_id = TEGRA124_CLK_DISP2, .present = true }, [tegra_clk_disp1] = { .dt_id = TEGRA124_CLK_DISP1, .present = true }, - [tegra_clk_host1x] = { .dt_id = TEGRA124_CLK_HOST1X, .present = true }, + [tegra_clk_host1x_8] = { .dt_id = TEGRA124_CLK_HOST1X, .present = true }, [tegra_clk_vcp] = { .dt_id = TEGRA124_CLK_VCP, .present = true }, [tegra_clk_i2s0] = { .dt_id = TEGRA124_CLK_I2S0, .present = true }, [tegra_clk_apbdma] = { .dt_id = TEGRA124_CLK_APBDMA, .present = true },