Merge commit 'gcl/next' into next

4 files changed, 40 insertions, 40 deletions

diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index e0b9454ae691..8b8e9560a315 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -24,6 +24,7 @@ config PPC_MPC5200_SIMPLE
           are:
              intercontrol,digsy-mtc
              phytec,pcm030
+             phytec,pcm032
              promess,motionpro
              schindler,cm5200
              tqc,tqm5200
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index d5e1471e51f7..c31e5b534f0a 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -51,8 +51,9 @@ static void __init mpc5200_simple_setup_arch(void)
 /* list of the supported boards */
 static char *board[] __initdata = {
         "intercontrol,digsy-mtc",
-        "promess,motionpro",
         "phytec,pcm030",
+        "phytec,pcm032",
+        "promess,motionpro",
         "schindler,cm5200",
         "tqc,tqm5200",
         NULL
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index e9d2cf632eeb..8e3dd5a0f228 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -206,6 +206,43 @@ int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
 EXPORT_SYMBOL(mpc52xx_set_psc_clkdiv);
 
 /**
+ * mpc52xx_get_xtal_freq - Get SYS_XTAL_IN frequency for a device
+ *
+ * @node: device node
+ *
+ * Returns the frequency of the external oscillator clock connected
+ * to the SYS_XTAL_IN pin, or 0 if it cannot be determined.
+ */
+unsigned int mpc52xx_get_xtal_freq(struct device_node *node)
+{
+        u32 val;
+        unsigned int freq;
+
+        if (!mpc52xx_cdm)
+                return 0;
+
+        freq = mpc52xx_find_ipb_freq(node);
+        if (!freq)
+                return 0;
+
+        if (in_8(&mpc52xx_cdm->ipb_clk_sel) & 0x1)
+                freq *= 2;
+
+        val  = in_be32(&mpc52xx_cdm->rstcfg);
+        if (val & (1 << 5))
+                freq *= 8;
+        else
+                freq *= 4;
+        if (val & (1 << 6))
+                freq /= 12;
+        else
+                freq /= 16;
+
+        return freq;
+}
+EXPORT_SYMBOL(mpc52xx_get_xtal_freq);
+
+/**
  * mpc52xx_restart: ppc_md->restart hook for mpc5200 using the watchdog timer
  */
 void
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index cb038dc67a85..bfbcd418e690 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -335,44 +335,6 @@ static void
 mpc52xx_gpt_gpio_setup(struct mpc52xx_gpt_priv *p, struct device_node *np) { }
 #endif /* defined(CONFIG_GPIOLIB) */
 
-/***********************************************************************
- * SYSFS attributes
- */
-#if defined(CONFIG_SYSFS)
-static ssize_t mpc52xx_gpt_show_regs(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
-{
-        struct mpc52xx_gpt_priv *gpt = dev_get_drvdata(dev);
-        int i, len = 0;
-        u32 __iomem *regs = (void __iomem *) gpt->regs;
-
-        for (i = 0; i < 4; i++)
-                len += sprintf(buf + len, "%.8x ", in_be32(regs + i));
-        len += sprintf(buf + len, "\n");
-
-        return len;
-}
-
-static struct device_attribute mpc52xx_gpt_attrib[] = {
-        __ATTR(regs, S_IRUGO | S_IWUSR, mpc52xx_gpt_show_regs, NULL),
-};
-
-static void mpc52xx_gpt_create_attribs(struct mpc52xx_gpt_priv *gpt)
-{
-        int i, err = 0;
-
-        for (i = 0; i < ARRAY_SIZE(mpc52xx_gpt_attrib); i++) {
-                err = device_create_file(gpt->dev, &mpc52xx_gpt_attrib[i]);
-                if (err)
-                        dev_err(gpt->dev, "error creating attribute %i\n", i);
-        }
-
-}
-
-#else /* defined(CONFIG_SYSFS) */
-static void mpc52xx_gpt_create_attribs(struct mpc52xx_gpt_priv *) { return 0; }
-#endif /* defined(CONFIG_SYSFS) */
-
 /* ---------------------------------------------------------------------
  * of_platform bus binding code
  */
@@ -395,7 +357,6 @@ static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
 
         dev_set_drvdata(&ofdev->dev, gpt);
 
-        mpc52xx_gpt_create_attribs(gpt);
         mpc52xx_gpt_gpio_setup(gpt, ofdev->node);
         mpc52xx_gpt_irq_setup(gpt, ofdev->node);