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: 3860881 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 F3E2B9F373 for ; Wed, 19 Mar 2014 19:46:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D939201F4 for ; Wed, 19 Mar 2014 19:46:15 +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 150EB2010E for ; Wed, 19 Mar 2014 19:46:14 +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 1WQMQH-0008Oc-Hv; Wed, 19 Mar 2014 19:45:10 +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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version :content-transfer-encoding:to:from:in-reply-to:cc:references :message-id:user-agent:subject:date; bh=BsBeEqSthSg1GZPcOMyZwBVE1+/qEepvkjuVBCbOS3k=; b=BEvDyXzOhlMxvjYdjSzFNGCcNQU2CogmuwqSFm368IZh1YRP8UHGPAA/eMwA5RM0BT nsYIp9nFg7fe4D3WEtkeRcVyO5ib9T/88xW4hlG0RH3zxTTDJk/fy4Ed9fxQPyf0XyQa 8tLE2Vsz+BHaVUGl4X9wG5zlK7jEzn+XtyoQs2R5kDzrmtbAByuOqO+IqE3GIuasV4rg aqkUDGf7h/eZDpdVFHDK9szmBCh1n+7w5Ch0RxcNgqsPo28f3peip60rT+KP7nCufE1H piVlENMXljTlkbxH9x8DeScBzleTAf24jusNhlMcPgfX9thNAULr1PxQTc4NVkGsfmWP yK7A== X-Gm-Message-State: ALoCoQkgmiLGEi2KqL2ur9aVXykquLk1yC8jIR9AUccFk11A6DqaMFlwo6wdjWnWRX95gFh7EZl5 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 (--) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 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,},