dm: adc: add uclass's mask and conversion helpers

[oweals/u-boot.git] / drivers / cpu / bmips_cpu.c

diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index f5bacd2b187f7c5486833e0816d9bc25f8d3ae49..fc047473f5bc9eb163813ee5d90ee894e3394588 100644 (file)
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -66,6 +66,10 @@
 #define STRAPBUS_63268_FCVO_SHIFT      21
 #define STRAPBUS_63268_FCVO_MASK       (0xf << STRAPBUS_63268_FCVO_SHIFT)
 
+#define REG_BCM6838_OTP_BRCMBITS0      0x440
+#define VIPER_6838_FREQ_SHIFT          18
+#define VIPER_6838_FREQ_MASK           (0x7 << VIPER_6838_FREQ_SHIFT)
+
 struct bmips_cpu_priv;
 
 struct bmips_cpu_hw {
@@ -272,6 +276,26 @@ static ulong bcm63268_get_cpu_freq(struct bmips_cpu_priv *priv)
        }
 }
 
+static ulong bcm6838_get_cpu_freq(struct bmips_cpu_priv *priv)
+{
+       unsigned int mips_viper_freq;
+
+       mips_viper_freq = readl_be(priv->regs + REG_BCM6838_OTP_BRCMBITS0);
+       mips_viper_freq = (mips_viper_freq & VIPER_6838_FREQ_MASK)
+               >> VIPER_6838_FREQ_SHIFT;
+
+       switch (mips_viper_freq) {
+       case 0x0:
+               return 600000000;
+       case 0x1:
+               return 400000000;
+       case 0x2:
+               return 240000000;
+       default:
+               return 0;
+       }
+}
+
 static int bcm6328_get_cpu_count(struct bmips_cpu_priv *priv)
 {
        u32 val = readl_be(priv->regs + REG_BCM6328_OTP);
@@ -346,6 +370,12 @@ static const struct bmips_cpu_hw bmips_cpu_bcm63268 = {
        .get_cpu_count = bcm6358_get_cpu_count,
 };
 
+static const struct bmips_cpu_hw bmips_cpu_bcm6838 = {
+       .get_cpu_desc = bmips_short_cpu_desc,
+       .get_cpu_freq = bcm6838_get_cpu_freq,
+       .get_cpu_count = bcm6358_get_cpu_count,
+};
+
 /* Generic CPU Ops */
 static int bmips_cpu_get_desc(struct udevice *dev, char *buf, int size)
 {
@@ -407,7 +437,7 @@ int bmips_cpu_probe(struct udevice *dev)
        const struct bmips_cpu_hw *hw =
                (const struct bmips_cpu_hw *)dev_get_driver_data(dev);
 
-       priv->regs = dev_remap_addr(dev);
+       priv->regs = dev_remap_addr(dev_get_parent(dev));
        if (!priv->regs)
                return -EINVAL;
 
@@ -444,6 +474,9 @@ static const struct udevice_id bmips_cpu_ids[] = {
        }, {
                .compatible = "brcm,bcm63268-cpu",
                .data = (ulong)&bmips_cpu_bcm63268,
+       }, {
+               .compatible = "brcm,bcm6838-cpu",
+               .data = (ulong)&bmips_cpu_bcm6838,
        },
        { /* sentinel */ }
 };