clk: RK808: Add RK809 and RK817 support.

RK809 and RK817 are power management IC chips for multimedia products.
most of their functions and registers are same, including the clkout
funciton.

Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index fc1e0cf44995d55284f11e2d9430b37ffc6f3df3..2858b7df08f7c49a356c5d1bba823e1093e6caf9 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -53,13 +53,12 @@ config COMMON_CLK_MAX9485
          This driver supports Maxim 9485 Programmable Audio Clock Generator
 
 config COMMON_CLK_RK808
-       tristate "Clock driver for RK805/RK808/RK818"
+       tristate "Clock driver for RK805/RK808/RK809/RK817/RK818"
        depends on MFD_RK808
        ---help---
-         This driver supports RK805, RK808 and RK818 crystal oscillator clock. These
-         multi-function devices have two fixed-rate oscillators,
-         clocked at 32KHz each. Clkout1 is always on, Clkout2 can off
-         by control register.
+         This driver supports RK805, RK809 and RK817, RK808 and RK818 crystal oscillator clock.
+         These multi-function devices have two fixed-rate oscillators, clocked at 32KHz each.
+         Clkout1 is always on, Clkout2 can off by control register.
 
 config COMMON_CLK_HI655X
        tristate "Clock driver for Hi655x" if EXPERT

diff --git a/drivers/clk/clk-rk808.c b/drivers/clk/clk-rk808.c
index 8d90bdf5b946e395b2c44bba06459f99b7cb83dd..75f2cf0dfc9f3831881eda9aff0cf832e5798ee9 100644 (file)
--- a/drivers/clk/clk-rk808.c
+++ b/drivers/clk/clk-rk808.c
@@ -96,6 +96,68 @@ of_clk_rk808_get(struct of_phandle_args *clkspec, void *data)
        return idx ? &rk808_clkout->clkout2_hw : &rk808_clkout->clkout1_hw;
 }
 
+static int rk817_clkout2_enable(struct clk_hw *hw, bool enable)
+{
+       struct rk808_clkout *rk808_clkout = container_of(hw,
+                                                        struct rk808_clkout,
+                                                        clkout2_hw);
+       struct rk808 *rk808 = rk808_clkout->rk808;
+
+       return regmap_update_bits(rk808->regmap, RK817_SYS_CFG(1),
+                                 RK817_CLK32KOUT2_EN,
+                                 enable ? RK817_CLK32KOUT2_EN : 0);
+}
+
+static int rk817_clkout2_prepare(struct clk_hw *hw)
+{
+       return rk817_clkout2_enable(hw, true);
+}
+
+static void rk817_clkout2_unprepare(struct clk_hw *hw)
+{
+       rk817_clkout2_enable(hw, false);
+}
+
+static int rk817_clkout2_is_prepared(struct clk_hw *hw)
+{
+       struct rk808_clkout *rk808_clkout = container_of(hw,
+                                                        struct rk808_clkout,
+                                                        clkout2_hw);
+       struct rk808 *rk808 = rk808_clkout->rk808;
+       unsigned int val;
+
+       int ret = regmap_read(rk808->regmap, RK817_SYS_CFG(1), &val);
+
+       if (ret < 0)
+               return 0;
+
+       return (val & RK817_CLK32KOUT2_EN) ? 1 : 0;
+}
+
+static const struct clk_ops rk817_clkout2_ops = {
+       .prepare = rk817_clkout2_prepare,
+       .unprepare = rk817_clkout2_unprepare,
+       .is_prepared = rk817_clkout2_is_prepared,
+       .recalc_rate = rk808_clkout_recalc_rate,
+};
+
+static const struct clk_ops *rkpmic_get_ops(long variant)
+{
+       switch (variant) {
+       case RK809_ID:
+       case RK817_ID:
+               return &rk817_clkout2_ops;
+       /*
+        * For the default case, it match the following PMIC type.
+        * RK805_ID
+        * RK808_ID
+        * RK818_ID
+        */
+       default:
+               return &rk808_clkout2_ops;
+       }
+}
+
 static int rk808_clkout_probe(struct platform_device *pdev)
 {
        struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent);
@@ -127,7 +189,7 @@ static int rk808_clkout_probe(struct platform_device *pdev)
                return ret;
 
        init.name = "rk808-clkout2";
-       init.ops = &rk808_clkout2_ops;
+       init.ops = rkpmic_get_ops(rk808->variant);
        rk808_clkout->clkout2_hw.init = &init;
 
        /* optional override of the clockname */