From patchwork Fri Sep 20 21:13:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bresticker X-Patchwork-Id: 2921651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0157EBFF05 for ; Fri, 20 Sep 2013 21:17:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31C5220459 for ; Fri, 20 Sep 2013 21:17:17 +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 2C3A820457 for ; Fri, 20 Sep 2013 21:17:16 +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 1VN83K-0007nD-Or; Fri, 20 Sep 2013 21:15:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN82o-0005yJ-FG; Fri, 20 Sep 2013 21:15:18 +0000 Received: from mail-ye0-f202.google.com ([209.85.213.202]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN822-0005rf-Cn for linux-arm-kernel@lists.infradead.org; Fri, 20 Sep 2013 21:14:36 +0000 Received: by mail-ye0-f202.google.com with SMTP id r14so108400yen.1 for ; Fri, 20 Sep 2013 14:14:09 -0700 (PDT) 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=WzrxC/iJpchO0/GayRyZJSkZi4d5m4XsQ/WaXcpIdqQ=; b=hw9nuMSiXuBgTQ4IB2F4/8yUvKzFQ0kPwOeinJbFJHcHUK2yfdktDSkDD4cjaHQpHR lqGJ5W1ulr9sM992jDE3GR/mBVBYxmg4hhdNlIoLLWZneLcLVyA9TPpAlwxbqwSNcQo1 i6kf8Ow1GUiz7A+UP1hZqJHOd/VxwrPGVSIr0RxKZLeAbajcVWUX/7Q6JEoANQW8AzcO s/kw+td1kA3woEHS2hVrh+T6HliWcV4Hlt/BAAu1H2ip+/bwx814SiM6hUZz4aQskVHk 2TgHKYocT/YY+w3e4VcjIltvjFMc0NyDblOY1wJCtyuq8teEI0Q33IXq/n9f3vQaVbp/ Zr2w== X-Gm-Message-State: ALoCoQnvTg/nWtsPfnuPVXWuEcHiZSy4cpT1/m03lnCqxLBGyZ0gRchu6uhn3RwaWiVniWDDX8Vyy8d3k4fsc6cxOxyKqLFd5H/KvuGcWopWzT74aIWNcz4zDEei3OnMBH3eAJITnu+/sNfQSvbPlCwv0Hg9ObTRKtkc7mtr6fpOWmzkWJPn7jfjCh8OHKPMOO3xZQLMR/oYq6lnn30xGs0kpbkgfAw9HA== X-Received: by 10.236.41.100 with SMTP id g64mr3296140yhb.31.1379711648913; Fri, 20 Sep 2013 14:14:08 -0700 (PDT) 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 y62si1722570yha.0.1969.12.31.16.00.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 20 Sep 2013 14:14:08 -0700 (PDT) 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 90D2F31C233; Fri, 20 Sep 2013 14:14:08 -0700 (PDT) Received: by abrestic.mtv.corp.google.com (Postfix, from userid 137652) id 505B222082B; Fri, 20 Sep 2013 14:14:08 -0700 (PDT) From: Andrew Bresticker To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 5/6] clk: exynos-audss: add support for Exynos 5420 Date: Fri, 20 Sep 2013 14:13:56 -0700 Message-Id: <1379711637-5226-5-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1379711637-5226-1-git-send-email-abrestic@chromium.org> References: <1379711637-5226-1-git-send-email-abrestic@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130920_171430_549968_178CB362 X-CRM114-Status: GOOD ( 13.24 ) X-Spam-Score: 0.2 (/) Cc: Mark Rutland , Yadwinder Singh Brar , linux-doc@vger.kernel.org, Andrew Bresticker , Tomasz Figa , linux-kernel@vger.kernel.org, Tushar Behera , Kukjin Kim , Russell King , Sachin Kamat , Stephen Warren , Grant Likely , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Rob Herring , Mike Turquette , linux-arm-kernel@lists.infradead.org, Rahul Sharma , Padmavathi Venna , Jiri Kosina , Stephen Boyd , Doug Anderson , Leela Krishna Amudala , Rob Landley 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=-1.4 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 AudioSS block on Exynos 5420 has an additional clock gate for the ADMA bus clock. Signed-off-by: Andrew Bresticker --- Documentation/devicetree/bindings/clock/clk-exynos-audss.txt | 7 +++++-- drivers/clk/samsung/clk-exynos-audss.c | 8 ++++++++ include/dt-bindings/clk/exynos-audss-clk.h | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt b/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt index d51a2f9..a10c648 100644 --- a/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt +++ b/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt @@ -8,8 +8,10 @@ Required Properties: - compatible: should be one of the following: - "samsung,exynos4210-audss-clock" - controller compatible with all Exynos4 SoCs. - - "samsung,exynos5250-audss-clock" - controller compatible with all Exynos5 SoCs. - + - "samsung,exynos5250-audss-clock" - controller compatible with Exynos5250 + SoCs. + - "samsung,exynos5420-audss-clock" - controller compatible with Exynos5420 + SoCs. - reg: physical base address and length of the controller's register set. - #clock-cells: should be 1. @@ -51,6 +53,7 @@ i2s_bus 6 sclk_i2s 7 pcm_bus 8 sclk_pcm 9 +adma 10 Exynos5420 Example 1: An example of a clock controller node using the default input clock names is listed below. diff --git a/drivers/clk/samsung/clk-exynos-audss.c b/drivers/clk/samsung/clk-exynos-audss.c index aac5342..07c8dbd 100644 --- a/drivers/clk/samsung/clk-exynos-audss.c +++ b/drivers/clk/samsung/clk-exynos-audss.c @@ -145,6 +145,13 @@ static int exynos_audss_clk_probe(struct platform_device *pdev) sclk_pcm_p, CLK_SET_RATE_PARENT, reg_base + ASS_CLK_GATE, 5, 0, &lock); + if (of_device_is_compatible(pdev->dev.of_node, + "samsung,exynos5420-audss-clock")) { + clk_table[EXYNOS_ADMA] = clk_register_gate(NULL, "adma", + "dout_srp", CLK_SET_RATE_PARENT, + reg_base + ASS_CLK_GATE, 9, 0, &lock); + } + #ifdef CONFIG_PM_SLEEP register_syscore_ops(&exynos_audss_clk_syscore_ops); #endif @@ -164,6 +171,7 @@ static int exynos_audss_clk_remove(struct platform_device *pdev) static const struct of_device_id exynos_audss_clk_of_match[] = { { .compatible = "samsung,exynos4210-audss-clock", }, { .compatible = "samsung,exynos5250-audss-clock", }, + { .compatible = "samsung,exynos5420-audss-clock", }, {}, }; diff --git a/include/dt-bindings/clk/exynos-audss-clk.h b/include/dt-bindings/clk/exynos-audss-clk.h index 8279f42..0ae6f5a 100644 --- a/include/dt-bindings/clk/exynos-audss-clk.h +++ b/include/dt-bindings/clk/exynos-audss-clk.h @@ -19,7 +19,8 @@ #define EXYNOS_SCLK_I2S 7 #define EXYNOS_PCM_BUS 8 #define EXYNOS_SCLK_PCM 9 +#define EXYNOS_ADMA 10 -#define EXYNOS_AUDSS_MAX_CLKS 10 +#define EXYNOS_AUDSS_MAX_CLKS 11 #endif