linux-next: manual merge of the m68knommu tree with Linus' tree

linux-next: manual merge of the m68knommu tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/kernel/m68k_ksyms.c between commit a697dc934f52 ("m68k: merge
non-mmu and mmu versions of m68k_ksyms.c") from Linus' tree and commit
e05f64c1bac9 ("m68k: merge non-mmu and mmu versions of m68k_ksyms.c")
from the m68knommu tree.

Two (slightly different) versions of the same change  I used the version
from the m68knommu tree as that was comitted later.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

P.S. Greg, do I need to change your contact address?

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the m68knommu tree with Linus' tree

[Greg Ungerer]

Hi Stephen,

On 25/05/11 11:04, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/kernel/m68k_ksyms.c between commit a697dc934f52 ("m68k: merge
> non-mmu and mmu versions of m68k_ksyms.c") from Linus' tree and commit
> e05f64c1bac9 ("m68k: merge non-mmu and mmu versions of m68k_ksyms.c")
> from the m68knommu tree.
>
> Two (slightly different) versions of the same change  I used the version
> from the m68knommu tree as that was comitted later.

Sorry, should be fixed now. (Though maybe I annoyed Andrew a little
by including a couple of new patches in there as well :-(


> P.S. Greg, do I need to change your contact address?

No, you can use any of:

   gerg@snapgear.com
   gerg@uclinux.org

I tend to signoff using the uclinux.org address, but primary email
address is the snapgear.com one.

Regards
Greg


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: linux-next: manual merge of the m68knommu tree with Linus' tree

[Greg Ungerer]

Hi Stephen,

On 25/05/11 11:04, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/kernel/m68k_ksyms.c between commit a697dc934f52 ("m68k: merge
> non-mmu and mmu versions of m68k_ksyms.c") from Linus' tree and commit
> e05f64c1bac9 ("m68k: merge non-mmu and mmu versions of m68k_ksyms.c")
> from the m68knommu tree.
>
> Two (slightly different) versions of the same change  I used the version
> from the m68knommu tree as that was comitted later.

Sorry, should be fixed now. (Though maybe I annoyed Andrew a little
by including a couple of new patches in there as well :-(


> P.S. Greg, do I need to change your contact address?

No, you can use any of:

   gerg@snapgear.com
   gerg@uclinux.org

I tend to signoff using the uclinux.org address, but primary email
address is the snapgear.com one.

Regards
Greg


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: linux-next: manual merge of the m68knommu tree with Linus' tree

[Greg Ungerer]

Hi Stephen,

On 29/06/12 11:33, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/platform/coldfire/clk.c between commit 19a1d332cc8c
> ("m68knommu: define a local devm_clk_get() function") from Linus' tree
> and commit a0412a2ddaa3 ("m68knommu: Add support for the Coldfire
> m5441x") from the m68knommu tree.

Ah, yes, that would be right.


> I fixed it up (I think - see below) and can carry the fix as necessary.

I think though that the change made by commit 19a1d332cc8c ("m68knommu:
define a local devm_clk_get() function") needs also to be carried through
to the other "#else" branch with an appropriately coded devm_clk_get() as
well. I suspect it needs more than the trivial code added by
commit 19a1d332cc8c.

I'll check this out further an update my for-next as required.

Thanks
Greg



-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: linux-next: manual merge of the m68knommu tree with Linus' tree

[Greg Ungerer]

Hi Stephen,

On 29/06/12 11:33, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/platform/coldfire/clk.c between commit 19a1d332cc8c
> ("m68knommu: define a local devm_clk_get() function") from Linus' tree
> and commit a0412a2ddaa3 ("m68knommu: Add support for the Coldfire
> m5441x") from the m68knommu tree.

Ah, yes, that would be right.


> I fixed it up (I think - see below) and can carry the fix as necessary.

I think though that the change made by commit 19a1d332cc8c ("m68knommu:
define a local devm_clk_get() function") needs also to be carried through
to the other "#else" branch with an appropriately coded devm_clk_get() as
well. I suspect it needs more than the trivial code added by
commit 19a1d332cc8c.

I'll check this out further an update my for-next as required.

Thanks
Greg



-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

linux-next: manual merge of the m68knommu tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3154 bytes --]

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/platform/coldfire/clk.c between commit 19a1d332cc8c
("m68knommu: define a local devm_clk_get() function") from Linus' tree
and commit a0412a2ddaa3 ("m68knommu: Add support for the Coldfire
m5441x") from the m68knommu tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/m68k/platform/coldfire/clk.c
index 44da406,d96405c..0000000
--- a/arch/m68k/platform/coldfire/clk.c
+++ b/arch/m68k/platform/coldfire/clk.c
@@@ -43,10 -49,102 +49,107 @@@ unsigned long clk_get_rate(struct clk *
  }
  EXPORT_SYMBOL(clk_get_rate);
  
 +struct clk *devm_clk_get(struct device *dev, const char *id)
 +{
 +	return NULL;
 +}
 +EXPORT_SYMBOL(devm_clk_get);
 +
+ #else
+ static DEFINE_SPINLOCK(clk_lock);
+ 
+ struct clk *clk_get(struct device *dev, const char *id)
+ {
+ 	const char *clk_name = dev ? dev_name(dev) : id ? id : NULL;
+ 	struct clk *clk;
+ 	unsigned i;
+ 
+ 	for (i = 0; (clk = mcf_clks[i]) != NULL; ++i)
+ 		if (!strcmp(clk->name, clk_name))
+ 			return clk;
+ 	pr_warn("clk_get: didn't find clock %s\n", clk_name);
+ 	return ERR_PTR(-ENOENT);
+ }
+ EXPORT_SYMBOL(clk_get);
+ 
+ int clk_enable(struct clk *clk)
+ {
+ 	unsigned long flags;
+ 	spin_lock_irqsave(&clk_lock, flags);
+ 	if ((clk->enabled++ == 0) && clk->clk_ops)
+ 		clk->clk_ops->enable(clk);
+ 	spin_unlock_irqrestore(&clk_lock, flags);
+ 
+ 	return 0;
+ }
+ EXPORT_SYMBOL(clk_enable);
+ 
+ void clk_disable(struct clk *clk)
+ {
+ 	unsigned long flags;
+ 	spin_lock_irqsave(&clk_lock, flags);
+ 	if ((--clk->enabled == 0) && clk->clk_ops)
+ 		clk->clk_ops->disable(clk);
+ 	spin_unlock_irqrestore(&clk_lock, flags);
+ }
+ EXPORT_SYMBOL(clk_disable);
+ 
+ void clk_put(struct clk *clk)
+ {
+ 	if (clk->enabled != 0)
+ 		pr_warn("clk_put %s still enabled\n", clk->name);
+ }
+ EXPORT_SYMBOL(clk_put);
+ 
+ unsigned long clk_get_rate(struct clk *clk)
+ {
+ 	return clk->rate;
+ }
+ EXPORT_SYMBOL(clk_get_rate);
+ 
 -
  /***************************************************************************/
+ 
+ void __clk_init_enabled(struct clk *clk)
+ {
+ 	clk->enabled = 1;
+ 	clk->clk_ops->enable(clk);
+ }
+ 
+ void __clk_init_disabled(struct clk *clk)
+ {
+ 	clk->enabled = 0;
+ 	clk->clk_ops->disable(clk);
+ }
+ 
+ static void __clk_enable0(struct clk *clk)
+ {
+ 	__raw_writeb(clk->slot, MCFPM_PPMCR0);
+ }
+ 
+ static void __clk_disable0(struct clk *clk)
+ {
+ 	__raw_writeb(clk->slot, MCFPM_PPMSR0);
+ }
+ 
+ struct clk_ops clk_ops0 = {
+ 	.enable		= __clk_enable0,
+ 	.disable	= __clk_disable0,
+ };
+ 
+ #ifdef MCFPM_PPMCR1
+ static void __clk_enable1(struct clk *clk)
+ {
+ 	__raw_writeb(clk->slot, MCFPM_PPMCR1);
+ }
+ 
+ static void __clk_disable1(struct clk *clk)
+ {
+ 	__raw_writeb(clk->slot, MCFPM_PPMSR1);
+ }
+ 
+ struct clk_ops clk_ops1 = {
+ 	.enable		= __clk_enable1,
+ 	.disable	= __clk_disable1,
+ };
+ #endif /* MCFPM_PPMCR1 */
+ #endif /* MCFPM_PPMCR0 */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]