From patchwork Wed Mar 19 19:42:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 26609 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 620FC20534 for ; Wed, 19 Mar 2014 19:46:36 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oz11sf22603906veb.1 for ; Wed, 19 Mar 2014 12:46:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:in-reply-to :references:message-id:user-agent:subject:date:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=GNG50B2CaOXWrBtWsBpRrRnwFDPWGnajAaQs8+26Zbo=; b=E/9UC0QMTpqIooxEVnGyaN/tdGlec7Y9+S94DBKu9XbxGX5Eo/Jyx/ooNXzj+vQoQo cIeyzzbSdaF43XkQVXds//Wf1IIo5y50kZ0pxskHDdTyd/sFcQSWINrzloDugX8CFAdO P/gd99AkpvwkkOL8UCb/Ma5/TiUkMEtjMPsNPt1/f0GrI+YRaBjCVOLlRJ+lj6rlATtA 9W9QnImIdZHrGNOcN7/P4qN1Ea0bJw8KWnsFpqhppE6sXHwincj+9noLB0fXTiNlVpQ3 btr0ucMy/VebolZsFyAouvNV0Lq5uPnmuPltafmEciXzaq0HAK5uduS5VrUtYJDwcFXH 8KKQ== X-Gm-Message-State: ALoCoQna4lVWQoUbd21yrDh3WbkXFuGBIaQbvcIDnIu8nkXtq6DDMv8wub+Y4oGHB/CV6TsFMweW X-Received: by 10.58.136.35 with SMTP id px3mr5985767veb.31.1395258396144; Wed, 19 Mar 2014 12:46:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.100.137 with SMTP id s9ls2724060qge.57.gmail; Wed, 19 Mar 2014 12:46:36 -0700 (PDT) X-Received: by 10.58.132.228 with SMTP id ox4mr267246veb.54.1395258396015; Wed, 19 Mar 2014 12:46:36 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id bf4si4707305vec.154.2014.03.19.12.46.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 12:46:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 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.182; Received: by mail-vc0-f182.google.com with SMTP id ks9so9648692vcb.41 for ; Wed, 19 Mar 2014 12:46:35 -0700 (PDT) X-Received: by 10.220.114.135 with SMTP id e7mr14286870vcq.23.1395258395908; Wed, 19 Mar 2014 12:46:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp329532vck; Wed, 19 Mar 2014 12:46:35 -0700 (PDT) X-Received: by 10.194.186.235 with SMTP id fn11mr478502wjc.60.1395258394847; Wed, 19 Mar 2014 12:46:34 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [85.118.1.10]) by mx.google.com with ESMTPS id ba5si15690953wjb.51.2014.03.19.12.46.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Mar 2014 12:46:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 85.118.1.10 as permitted sender) client-ip=85.118.1.10; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMQJ-0008Ob-CZ; Wed, 19 Mar 2014 19:45:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMPZ-0006db-0Y; Wed, 19 Mar 2014 19:44:25 +0000 Received: from mail-pa0-f54.google.com ([209.85.220.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMNw-0006Sp-7M for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:42:47 +0000 Received: by mail-pa0-f54.google.com with SMTP id lf10so9481796pab.27 for ; Wed, 19 Mar 2014 12:42:22 -0700 (PDT) X-Received: by 10.68.231.35 with SMTP id td3mr19407464pbc.137.1395258139340; Wed, 19 Mar 2014 12:42:19 -0700 (PDT) Received: from localhost ([2601:9:5900:1fe:ca60:ff:fe0a:8a36]) by mx.google.com with ESMTPSA id sx8sm108255743pab.5.2014.03.19.12.42.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 12:42:17 -0700 (PDT) MIME-Version: 1.0 To: =?utf-8?q?Emilio_L=C3=B3pez?= , "Maxime Ripard" From: Mike Turquette In-Reply-To: <1395253173-30437-2-git-send-email-emilio@elopez.com.ar> References: <1395253173-30437-1-git-send-email-emilio@elopez.com.ar> <1395253173-30437-2-git-send-email-emilio@elopez.com.ar> Message-ID: <20140319194213.30995.52897@quantum> User-Agent: alot/0.3.5 Subject: Re: [PATCH 1/4] clk: sunxi: fix A20 PLL4 calculation Date: Wed, 19 Mar 2014 12:42:13 -0700 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_154244_413954_AD08B2EA X-CRM114-Status: GOOD ( 11.28 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.54 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: =?utf-8?q?Emilio_L=C3=B3pez?= , 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mturquette@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Quoting Emilio López (2014-03-19 11:19:30) > Allwinner actually reworked the PLL4 on A20; now it's compatible with > the sun4i PLL5/6 design previous to any divisions, as well as to the new > PLL8 in sun7i. > > Signed-off-by: Emilio López Trivial merge conflict after applying this patch on top of your 3.15 pull request. My resolution is below. Let me know if I've made a mistake. Regards, Mike >From 5a8ddf26822dcf601a44d35efa8fe162cbc84e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= Date: Wed, 19 Mar 2014 15:19:30 -0300 Subject: [PATCH] clk: sunxi: fix A20 PLL4 calculation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allwinner actually reworked the PLL4 on A20; now it's compatible with the sun4i PLL5/6 design previous to any divisions, as well as to the new PLL8 in sun7i. Signed-off-by: Emilio López Signed-off-by: Mike Turquette --- drivers/clk/sunxi/clk-sunxi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 23baad9..ef6ad52b 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -589,6 +589,12 @@ static const struct factors_data sun6i_a31_pll1_data __initconst = { .getter = sun6i_a31_get_pll1_factors, }; +static const struct factors_data sun7i_a20_pll4_data __initconst = { + .enable = 31, + .table = &sun4i_pll5_config, + .getter = sun4i_get_pll5_factors, +}; + static const struct factors_data sun4i_pll5_data __initconst = { .enable = 31, .table = &sun4i_pll5_config, @@ -1209,6 +1215,7 @@ free_clkdata: static const struct of_device_id clk_factors_match[] __initconst = { {.compatible = "allwinner,sun4i-a10-pll1-clk", .data = &sun4i_pll1_data,}, {.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,}, + {.compatible = "allwinner,sun7i-a20-pll4-clk", .data = &sun7i_a20_pll4_data,}, {.compatible = "allwinner,sun6i-a31-pll6-clk", .data = &sun6i_a31_pll6_data,}, {.compatible = "allwinner,sun4i-a10-apb1-clk", .data = &sun4i_apb1_data,}, {.compatible = "allwinner,sun4i-a10-mod0-clk", .data = &sun4i_mod0_data,},