public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: emilio@elopez•com.ar (Emilio López)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/4] clk: sunxi: fix A20 PLL4 calculation
Date: Wed, 19 Mar 2014 17:01:54 -0300	[thread overview]
Message-ID: <5329F7B2.6000205@elopez.com.ar> (raw)
In-Reply-To: <20140319194213.30995.52897@quantum>

Hi Mike,

El 19/03/14 16:42, Mike Turquette escribi?:
> 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 <emilio@elopez•com.ar>
>
> 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.

Looks good to me.

Thanks!

Emilio

  reply	other threads:[~2014-03-19 20:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-19 18:19 [PATCH 0/4] sunxi clock fixes Emilio López
2014-03-19 18:19 ` [PATCH 1/4] clk: sunxi: fix A20 PLL4 calculation Emilio López
2014-03-19 19:42   ` Mike Turquette
2014-03-19 20:01     ` Emilio López [this message]
2014-03-19 18:19 ` [PATCH 2/4] ARM: sun7i: fix PLL4 clock and add PLL8 Emilio López
2014-04-14  9:59   ` Maxime Ripard
2014-03-19 18:19 ` [PATCH 3/4] clk: sunxi: fix some calculations Emilio López
2014-03-19 18:19 ` [PATCH 4/4] clk: sunxi: fix thinko in comment Emilio López
2014-03-19 19:04 ` [PATCH 0/4] sunxi clock fixes Mike Turquette
2014-03-19 19:15   ` Emilio López
2014-03-20 15:15     ` Maxime Ripard
2014-03-20 16:35       ` Mike Turquette

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5329F7B2.6000205@elopez.com.ar \
    --to=emilio@elopez$(echo .)com.ar \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox