From patchwork Mon Jun 17 22:03:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 2737761 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 46FE29F8E1 for ; Mon, 17 Jun 2013 22:04:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 656B9204A0 for ; Mon, 17 Jun 2013 22:04:43 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A26A20489 for ; Mon, 17 Jun 2013 22:04:38 +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 1UohXL-0006xh-JI; Mon, 17 Jun 2013 22:04:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UohXJ-00064P-2X; Mon, 17 Jun 2013 22:04:29 +0000 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UohXE-00063Y-OE for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 22:04:25 +0000 Received: by mail-pa0-f45.google.com with SMTP id bi5so3296747pad.32 for ; Mon, 17 Jun 2013 15:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=lHaE1hJxMr19tVe3gqjhNNa8F7/F5g3jeTyFo/vvrcQ=; b=I00tXxHoiN2S3zKzfcnPCJihLI2QlQZrA1ECe+PhNJAwBRqhlsG7wSJPvbfKTJ0MFy 4pFU30Bwa05TMptVxlMFb+/Zakp9uaucvffdl1O4XH6bcv7G63X5EeVFtVPRAkkwBmop ad+h8LRbGjKSwn5mkZrG+pRnPCmWMzwPgg3BWRI3nESduJmwYprP/4ea5RneGoiKvOUr bSreNKjOduh7o4y8IwFe8PVxu78wp74lGUcL5P98KZMZWz6aTiGwF04lumeF4tcCXS8d MoW6dzSTwtao3H+vSk/T+gRzxISgZv6wfHwTDX59L/j7o+VydiVJnh/C3CytpTIdhOSZ wveA== X-Received: by 10.68.184.100 with SMTP id et4mr14294443pbc.48.1371506641741; Mon, 17 Jun 2013 15:04:01 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id e2sm15240565pbc.23.2013.06.17.15.03.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 17 Jun 2013 15:04:00 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Mike Turquette Subject: [PATCH] clk/zynq/clkc: Add dedicated spinlock for the SWDT Date: Mon, 17 Jun 2013 15:03:46 -0700 Message-Id: <1371506626-3892-1-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130617_180424_887711_F8A11AE3 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -1.9 (-) Cc: Soren Brinkmann , linux-kernel@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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 The clk_mux for the system watchdog timer reused the register lock dedicated to the Ethernet module - for no apparent reason. Add a lock dedicated to the SWDT's clock register to remove this wrong dependency. Signed-off-by: Soren Brinkmann --- I don't know how this slipped in... Anyway, the fix depends on armsoc/zynq/clk. Sören drivers/clk/zynq/clkc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c index 5c205b6..515a573 100644 --- a/drivers/clk/zynq/clkc.c +++ b/drivers/clk/zynq/clkc.c @@ -71,6 +71,7 @@ static DEFINE_SPINLOCK(armpll_lock); static DEFINE_SPINLOCK(ddrpll_lock); static DEFINE_SPINLOCK(iopll_lock); static DEFINE_SPINLOCK(armclk_lock); +static DEFINE_SPINLOCK(swdtclk_lock); static DEFINE_SPINLOCK(ddrclk_lock); static DEFINE_SPINLOCK(dciclk_lock); static DEFINE_SPINLOCK(gem0clk_lock); @@ -293,7 +294,7 @@ static void __init zynq_clk_setup(struct device_node *np) } clks[swdt] = clk_register_mux(NULL, clk_output_name[swdt], swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT, - SLCR_SWDT_CLK_SEL, 0, 1, 0, &gem0clk_lock); + SLCR_SWDT_CLK_SEL, 0, 1, 0, &swdtclk_lock); /* DDR clocks */ clk = clk_register_divider(NULL, "ddr2x_div", "ddrpll", 0,