From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Allwinner sunXi clock patches for 3.12
Date: Tue, 27 Aug 2013 18:12:04 -0700 [thread overview]
Message-ID: <20130828011204.8231.86567@quantum> (raw)
In-Reply-To: <20130826091434.GA4980@lukather>
Quoting Maxime Ripard (2013-08-26 02:14:34)
> Hi Mike,
>
> Please pull the following branch with the sunxi additions to the clk
> driver for the 3.12 merge window, based on your current clk-next.
>
> Please note that the patch "clk: sunxi: fix initialization of basic
> clocks" from Emilio, that you told was applied, wasn't in your clk-next
> branch, so I took it, as it conflicted with later patches.
Ah, right. I had that patch in my local branch so I got a conflict with
OF_CLK_DECLARE for the osc clock. I went with the version in your pull
request ("sun4i_osc" versus "sunxi_osc").
Regards,
Mike
>
> Thanks!
> Maxime
>
> The following changes since commit bddbd13453d838a30baf84869c56076c8ce2b211:
>
> Merge tag 'zynq-clk-for-3.12' of git://git.xilinx.com/linux-xlnx into clk-next (2013-08-20 14:58:48 -0700)
>
> are available in the git repository at:
>
>
> https://github.com/mripard/linux.git tags/sunxi-clk-for-3.12
>
> for you to fetch changes up to 1fb2e4aab8b31b15e6be5debacb4203333360fd2:
>
> clk: sunxi: Add Allwinner A20 gates (2013-08-26 10:58:21 +0200)
>
> ----------------------------------------------------------------
> Allwinner clock changes for 3.12
>
> These patches mostly do some cleanup to introduce the basic gated clocks for
> the Allwinner A10s, A20 and A31 SoCs.
>
> ----------------------------------------------------------------
> Emilio L?pez (1):
> clk: sunxi: fix initialization of basic clocks
>
> Maxime Ripard (5):
> clk: sunxi: Add A10s gates
> clk: sunxi: Rename the structure to prepare the addition of sun6i
> clk: sunxi: Allow to specify the divider width from the dividers data
> clk: sunxi: Add A31 clocks support
> clk: sunxi: Add Allwinner A20 gates
>
> Documentation/devicetree/bindings/clock/sunxi.txt | 12 +
> .../bindings/clock/sunxi/sun5i-a10s-gates.txt | 75 +++++++
> .../bindings/clock/sunxi/sun6i-a31-gates.txt | 83 +++++++
> .../bindings/clock/sunxi/sun7i-a20-gates.txt | 98 +++++++++
> drivers/clk/sunxi/clk-sunxi.c | 241 +++++++++++++++++----
> 5 files changed, 464 insertions(+), 45 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt
> create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt
> create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun7i-a20-gates.txt
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
prev parent reply other threads:[~2013-08-28 1:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-26 9:14 [GIT PULL] Allwinner sunXi clock patches for 3.12 Maxime Ripard
2013-08-28 1:12 ` Mike Turquette [this message]
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=20130828011204.8231.86567@quantum \
--to=mturquette@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.