From: Tony Xie <tony.xie@rock-chips.com> To: heiko@sntech.de Cc: broonie@kernel.org, lee.jones@linaro.org, a.zummo@towertech.it, alexandre.belloni@bootlin.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-rtc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, chenjh@rock-chips.com, xsf@rock-chips.com, zhangqing@rock-chips.com, huangtao@rock-chips.com, tony.xie@rock-chips.com Subject: [PATCH v2 5/5] clk: RK808: add RK809 and RK817 support. Date: Tue, 31 Jul 2018 16:00:29 +0800 [thread overview] Message-ID: <1533024029-30273-1-git-send-email-tony.xie@rock-chips.com> (raw) In-Reply-To: <1533023850-29004-1-git-send-email-tony.xie@rock-chips.com> 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> --- drivers/clk/Kconfig | 6 ++--- drivers/clk/clk-rk808.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 721572a..fc1427c 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -46,11 +46,11 @@ config COMMON_CLK_MAX77686 clock. 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, + 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. diff --git a/drivers/clk/clk-rk808.c b/drivers/clk/clk-rk808.c index 6461f28..c5d3492 100644 --- a/drivers/clk/clk-rk808.c +++ b/drivers/clk/clk-rk808.c @@ -96,6 +96,66 @@ static int rk808_clkout2_is_prepared(struct clk_hw *hw) 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 ret; + + 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; + case RK805_ID: + case RK808_ID: + case RK818_ID: + return &rk808_clkout2_ops; + } + + return &rk808_clkout2_ops; +} + static int rk808_clkout_probe(struct platform_device *pdev) { struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent); @@ -127,7 +187,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 */ -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: tony.xie@rock-chips.com (Tony Xie) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/5] clk: RK808: add RK809 and RK817 support. Date: Tue, 31 Jul 2018 16:00:29 +0800 [thread overview] Message-ID: <1533024029-30273-1-git-send-email-tony.xie@rock-chips.com> (raw) In-Reply-To: <1533023850-29004-1-git-send-email-tony.xie@rock-chips.com> 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> --- drivers/clk/Kconfig | 6 ++--- drivers/clk/clk-rk808.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 721572a..fc1427c 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -46,11 +46,11 @@ config COMMON_CLK_MAX77686 clock. 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, + 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. diff --git a/drivers/clk/clk-rk808.c b/drivers/clk/clk-rk808.c index 6461f28..c5d3492 100644 --- a/drivers/clk/clk-rk808.c +++ b/drivers/clk/clk-rk808.c @@ -96,6 +96,66 @@ static int rk808_clkout2_is_prepared(struct clk_hw *hw) 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 ret; + + 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; + case RK805_ID: + case RK808_ID: + case RK818_ID: + return &rk808_clkout2_ops; + } + + return &rk808_clkout2_ops; +} + static int rk808_clkout_probe(struct platform_device *pdev) { struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent); @@ -127,7 +187,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 */ -- 1.9.1
next prev parent reply other threads:[~2018-07-31 7:59 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-31 7:57 [PATCH v2 0/5] support a new type of PMIC,including two chips(rk817 and rk809) Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-07-31 7:57 ` [PATCH v2 1/5] mfd: rk808: Add RK817 and RK809 support Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-07-31 7:57 ` [PATCH v2 2/5] regulator: rk808: add RK809 and RK817 support Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-08-01 9:25 ` Mark Brown 2018-08-01 9:25 ` Mark Brown 2018-08-01 9:25 ` Mark Brown 2018-07-31 7:57 ` [PATCH v2 3/5] dt-bindings: mfd: rk808: Add binding informations for RK809 and RK817 Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-08-02 11:16 ` Heiko Stuebner 2018-08-02 11:16 ` Heiko Stuebner 2018-08-02 11:16 ` Heiko Stuebner 2018-07-31 7:57 ` [PATCH v2 4/5] RTC: RK808: add RK809 and RK817 support Tony Xie 2018-07-31 7:57 ` Tony Xie 2018-07-31 8:10 ` Alexandre Belloni 2018-07-31 8:10 ` Alexandre Belloni 2018-07-31 8:00 ` Tony Xie [this message] 2018-07-31 8:00 ` [PATCH v2 5/5] clk: " Tony Xie 2018-08-01 15:18 ` Stephen Boyd 2018-08-01 15:18 ` Stephen Boyd 2018-08-01 15:18 ` Stephen Boyd 2018-08-01 15:18 ` Stephen Boyd
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1533024029-30273-1-git-send-email-tony.xie@rock-chips.com \ --to=tony.xie@rock-chips.com \ --cc=a.zummo@towertech.it \ --cc=alexandre.belloni@bootlin.com \ --cc=broonie@kernel.org \ --cc=chenjh@rock-chips.com \ --cc=devicetree@vger.kernel.org \ --cc=heiko@sntech.de \ --cc=huangtao@rock-chips.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-rtc@vger.kernel.org \ --cc=sboyd@kernel.org \ --cc=xsf@rock-chips.com \ --cc=zhangqing@rock-chips.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.