Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / drivers / clk / ingenic / jz4740-cgu.c

diff --git a/drivers/clk/ingenic/jz4740-cgu.c b/drivers/clk/ingenic/jz4740-cgu.c
index 4f0e92c..c0ac919 100644 (file)
--- a/drivers/clk/ingenic/jz4740-cgu.c
+++ b/drivers/clk/ingenic/jz4740-cgu.c
@@ -10,7 +10,9 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/of.h>
+
 #include <dt-bindings/clock/jz4740-cgu.h>
+
 #include "cgu.h"
 #include "pm.h"
 
@@ -69,6 +71,7 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
                .parents = { JZ4740_CLK_EXT, -1, -1, -1 },
                .pll = {
                        .reg = CGU_REG_CPPCR,
+                       .rate_multiplier = 1,
                        .m_shift = 23,
                        .m_bits = 9,
                        .m_offset = 2,
@@ -80,6 +83,7 @@ static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
                        .od_max = 4,
                        .od_encoding = pll_od_encoding,
                        .stable_bit = 10,
+                       .bypass_reg = CGU_REG_CPPCR,
                        .bypass_bit = 9,
                        .enable_bit = 8,
                },