summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Sperl <kernel@martin.sperl.org>2016-02-29 12:51:43 +0000
committerEric Anholt <eric@anholt.net>2016-03-17 10:42:17 -0700
commit33b689600f43094a9316a1b582f2286d17bc737b (patch)
tree4629e75429101a9191ded31016f6fad5e7b36eb7
parent3b15afefbef9b5952e3d68ad73d93f981b9faca8 (diff)
downloadblackbird-obmc-linux-33b689600f43094a9316a1b582f2286d17bc737b.tar.gz
blackbird-obmc-linux-33b689600f43094a9316a1b582f2286d17bc737b.zip
clk: bcm2835: enable management of PCM clock
Enable the PCM clock in the SOC, which is used by the bcm2835-i2s driver. Signed-off-by: Martin Sperl <kernel@martin.sperl.org> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/clk/bcm/clk-bcm2835.c7
-rw-r--r--include/dt-bindings/clock/bcm2835.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index a4b91a4233af..156ce548ebf5 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1622,6 +1622,13 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
.div_reg = CM_HSMDIV,
.int_bits = 4,
.frac_bits = 8),
+ [BCM2835_CLOCK_PCM] = REGISTER_PER_CLK(
+ .name = "pcm",
+ .ctl_reg = CM_PCMCTL,
+ .div_reg = CM_PCMDIV,
+ .int_bits = 12,
+ .frac_bits = 12,
+ .is_mash_clock = true),
[BCM2835_CLOCK_PWM] = REGISTER_PER_CLK(
.name = "pwm",
.ctl_reg = CM_PWMCTL,
diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h
index 87235ac76ef1..9a7b4a5cd6e6 100644
--- a/include/dt-bindings/clock/bcm2835.h
+++ b/include/dt-bindings/clock/bcm2835.h
@@ -44,3 +44,4 @@
#define BCM2835_CLOCK_EMMC 28
#define BCM2835_CLOCK_PERI_IMAGE 29
#define BCM2835_CLOCK_PWM 30
+#define BCM2835_CLOCK_PCM 31
OpenPOWER on IntegriCloud