From patchwork Fri Oct 18 09:04:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21108 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 55B0E246F1 for ; Fri, 18 Oct 2013 09:05:06 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id w10sf5590892pde.4 for ; Fri, 18 Oct 2013 02:05:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=zaiO9V1XoS4+MiBW1sM05oFCcoCxkHkDQEBbbrCeSbw=; b=DKYJq94TxjGQJfjORGBN/H4em08z70jSmWmBXiC+TUcoQBILiInmqzX4GOOGyWz8BH aLTHHNgJSdHDvTfeAgt8HaCcJRLszQu7z1XkAa20A4pzJQuIKPQ4+oEc9d9LxFVzV3Yx QSwO2hDRejWS1rpkLytojXxjqoWPp5SCFA/gcL1pM6Nsi32DNs5rxHMLc/drtTJ0V6R3 fhXTwIXsRhFuZE1Wc09wt9IGwwIFJYozZpKgDxQpwWANsZMFANcj9ToWxoIfOIkBQGWI Rb65ZC3mTvbnVhfZ5Yv4l/tsuPlFG29JP3LNRsQ6j8BsZdomX/xBCybsymPbmOGl+ZxD ywMA== X-Received: by 10.68.236.137 with SMTP id uu9mr724521pbc.8.1382087105545; Fri, 18 Oct 2013 02:05:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.116.135 with SMTP id jw7ls1239843qeb.58.gmail; Fri, 18 Oct 2013 02:05:05 -0700 (PDT) X-Received: by 10.220.78.18 with SMTP id i18mr1181755vck.3.1382087105403; Fri, 18 Oct 2013 02:05:05 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id sc5si113069vdc.74.2013.10.18.02.05.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Oct 2013 02:05:05 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ld13so251419vcb.39 for ; Fri, 18 Oct 2013 02:05:05 -0700 (PDT) X-Gm-Message-State: ALoCoQnbF0QcGwiYV4wwbfr7xnv5QCduVQzSKrFDq3kMtlVdBQ1pAKWroWIaTS/1Fl0ugcuANe9z X-Received: by 10.220.142.140 with SMTP id q12mr524539vcu.21.1382087105316; Fri, 18 Oct 2013 02:05:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp19915vcz; Fri, 18 Oct 2013 02:05:04 -0700 (PDT) X-Received: by 10.180.126.101 with SMTP id mx5mr1901668wib.63.1382087104335; Fri, 18 Oct 2013 02:05:04 -0700 (PDT) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by mx.google.com with ESMTPS id j16si188025wic.85.2013.10.18.02.05.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Oct 2013 02:05:04 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.180 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.180; Received: by mail-wi0-f180.google.com with SMTP id ey11so638049wid.7 for ; Fri, 18 Oct 2013 02:05:03 -0700 (PDT) X-Received: by 10.194.3.78 with SMTP id a14mr15562wja.77.1382087103761; Fri, 18 Oct 2013 02:05:03 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id b13sm24917973wic.9.2013.10.18.02.05.02 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2013 02:05:02 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones , Mike Turquette Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 2/5] clk: ux500: fix erroneous bit assignment Date: Fri, 18 Oct 2013 11:04:57 +0200 Message-Id: <1382087097-31627-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Due to a typo or similar, the peripheral group 2 clock 11 gate was set to bit 1 instead of bit 11. We need to fix this to be able to set the correct enable bit in the device tree: when trying to correct the bit assignment in the device tree, the system would hang. Cc: Lee Jones Cc: Mike Turquette Signed-off-by: Linus Walleij --- Mike: seeking an ACK for this as it needs to be taken into ARM SoC with the rest of the fixes so as not to cause bisection problems between the trees. --- drivers/clk/ux500/u8500_of_clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c index b768b50..cdeff29 100644 --- a/drivers/clk/ux500/u8500_of_clk.c +++ b/drivers/clk/ux500/u8500_of_clk.c @@ -339,7 +339,7 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", clkrst2_base, BIT(11), 0); - PRCC_PCLK_STORE(clk, 2, 1); + PRCC_PCLK_STORE(clk, 2, 11); clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", clkrst2_base, BIT(12), 0);