Your patch: ARM: AMBA: Add pclk definition for platforms using primecells

Your patch: ARM: AMBA: Add pclk definition for platforms using primecells

[H Hartley Sweeten]

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?

Regards,
Hartley

Your patch: ARM: AMBA: Add pclk definition for platforms using primecells

[Ryan Mallon]

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,
  };

Your patch: ARM: AMBA: Add pclk definition for platforms using primecells

[Rabin VINCENT]

On Wed, Jul 21, 2010 at 01:54:18 +0200, H Hartley Sweeten wrote:
> Hello Russell,
> 
> Your patch added a new clock to the ep93xx platform called "apb_pclk".

Unrelated to ep93xx, but the same patch breaks the u8500 build:

arch/arm/mach-ux500/clock.c:459: error: 'clk_dummy_apb_pclk' undeclared here (not in a function)

The following can be folded in to fix it:

diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c
index e618ab1..d8ab7f1 100644
--- a/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@ -453,7 +453,7 @@ static DEFINE_PRCC_CLK_CUSTOM(7, mtu0_ed, 2, -1, NULL, clk_mtu_get_rate, 0);
 static DEFINE_PRCC_CLK(7, wdg_ed, 	1, -1, NULL);
 static DEFINE_PRCC_CLK(7, cfgreg_ed, 	0, -1, NULL);
 
-static struct clk dummy_apb_pclk;
+static struct clk clk_dummy_apb_pclk;
 
 static struct clk_lookup u8500_common_clks[] = {
 	CLK(dummy_apb_pclk, NULL,	"apb_pclk"),

Your patch: ARM: AMBA: Add pclk definition for platforms using primecells

[Russell King - ARM Linux]

On Tue, Jul 20, 2010 at 06:54:18PM -0500, 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?

I'd prefer to fix it in the original patch, because that will solve
the merge conflict which SFR is seeing.  First, has such a change
been tested?