| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 29 Jun 2012 11:33:10 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg Ungerer <gerg@...pgear.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Steven King <sfking@...dc.com>
Subject: linux-next: manual merge of the m68knommu tree with Linus' tree
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@...b.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 */
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists