From: Ryan Mallon <ryan@bluewatersys•com>
To: H Hartley Sweeten <hartleys@visionengravers•com>
Cc: "linux-arm-kernel@lists•infradead.org"
<linux-arm-kernel@lists•infradead.org>,
Russell King - ARM Linux <linux@arm•linux.org.uk>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Mark Brown <broonie@opensource•wolfsonmicro.com>,
Takashi Iwai <tiwai@suse•de>,
linux-next@vger•kernel.org,
linux kernel <linux-kernel@vger•kernel.org>
Subject: Re: Your patch: ARM: AMBA: Add pclk definition for platforms using primecells
Date: Wed, 21 Jul 2010 12:49:11 +1200 [thread overview]
Message-ID: <4C464407.5060305@bluewatersys.com> (raw)
In-Reply-To: <0D753D10438DA54287A00B02708426976374051D65@AUSP01VMBX24.collaborationhost.net>
On 07/21/2010 11:54 AM, H Hartley Sweeten wrote:
> Hello Russell,
>
> Your patch added a new clock to the ep93xx platform called "apb_pclk". This
> clock was already available as "pclk" on that platform.
>
> Since there are no users of "pclk" in the kernel I have no problems just
> renaming it to "apb_pclk" and removing the dummy_apb_pclk that you added.
>
> Would you like me to submit the ncessary patch or can you fix it?
The dummy_apb_pclk definition caused a merge conflict in next with the
ep93xx i2s audio clock code, which Stephen wrote a fixup patch for. Can
we sort this out all in one big go? Stephen's original message copied below.
~Ryan
---
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> arch/arm/mach-ep93xx/clock.c between commit
> 5c6649e3c1511b183f12d2e884d2c172fe9001e0 ("ARM: AMBA: Add pclk definition
> for platforms using primecells") from the arm tree and commit
> ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support")
> from the sound tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
---
diff --cc arch/arm/mach-ep93xx/clock.c
index d40826a,8031624..0000000
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@@ -43,9 -43,9 +43,11 @@@ static unsigned long get_uart_rate(stru
static int set_keytchclk_rate(struct clk *clk, unsigned long rate);
static int set_div_rate(struct clk *clk, unsigned long rate);
+ static int set_i2s_sclk_rate(struct clk *clk, unsigned long rate);
+ static int set_i2s_lrclk_rate(struct clk *clk, unsigned long rate);
+static struct clk dummy_apb_pclk;
+
static struct clk clk_xtali = {
.rate = EP93XX_EXT_CLK_RATE,
};
parent reply other threads:[~2010-07-21 0:48 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <0D753D10438DA54287A00B02708426976374051D65@AUSP01VMBX24.collaborationhost.net>]
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=4C464407.5060305@bluewatersys.com \
--to=ryan@bluewatersys$(echo .)com \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=hartleys@visionengravers$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tiwai@suse$(echo .)de \
/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