On Tue, Mar 18, 2014 at 6:09 PM, Mike Turquette <mturquette@xxxxxxxxxx> wrote:
> Quoting Krzysztof Kozlowski (2014-03-17 02:19:16)
>> This patch adds support for S2MPS14 PMIC clocks (BT and AP) to the
>> s2mps11 clock driver.
>>
>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
>> Reviewed-by: Yadwinder Singh Brar <yadi.brar@xxxxxxxxxxx>
>> Reviewed-by: Tomasz Figa <t.figa@xxxxxxxxxxx>
>
> Taken into clk-next.
Oops. Please disregard. My auto patch application script sent his by
accident. I have not applied this patches, as indicated in my previous
mail were I gave out an Ack.
Regards,
Mike
>
> Regards,
> Mike
>
>> ---
>> drivers/clk/Kconfig | 8 +++---
>> drivers/clk/clk-s2mps11.c | 61 ++++++++++++++++++++++++++++++++++-----------
>> 2 files changed, 50 insertions(+), 19 deletions(-)
>>
>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>> index 6f56d3a4f010..8f9ce8ba036d 100644
>> --- a/drivers/clk/Kconfig
>> +++ b/drivers/clk/Kconfig
>> @@ -65,12 +65,12 @@ config COMMON_CLK_SI570
>> clock generators.
>>
>> config COMMON_CLK_S2MPS11
>> - tristate "Clock driver for S2MPS11/S5M8767 MFD"
>> + tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>> depends on MFD_SEC_CORE
>> ---help---
>> - This driver supports S2MPS11/S5M8767 crystal oscillator clock. These
>> - multi-function devices have 3 fixed-rate oscillators, clocked at
>> - 32KHz each.
>> + This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>> + clock. These multi-function devices have two (S2MPS14) or three
>> + (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>>
>> config CLK_TWL6040
>> tristate "External McPDM functional clock from twl6040"
>> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
>> index 508875535e1e..8dafb552274f 100644
>> --- a/drivers/clk/clk-s2mps11.c
>> +++ b/drivers/clk/clk-s2mps11.c
>> @@ -1,7 +1,7 @@
>> /*
>> * clk-s2mps11.c - Clock driver for S2MPS11.
>> *
>> - * Copyright (C) 2013 Samsung Electornics
>> + * Copyright (C) 2013,2014 Samsung Electornics
>> *
>> * This program is free software; you can redistribute it and/or modify it
>> * under the terms of the GNU General Public License as published by the
>> @@ -13,10 +13,6 @@
>> * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> * GNU General Public License for more details.
>> *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, write to the Free Software
>> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>> - *
>> */
>>
>> #include <linux/module.h>
>> @@ -27,6 +23,7 @@
>> #include <linux/clk-provider.h>
>> #include <linux/platform_device.h>
>> #include <linux/mfd/samsung/s2mps11.h>
>> +#include <linux/mfd/samsung/s2mps14.h>
>> #include <linux/mfd/samsung/s5m8767.h>
>> #include <linux/mfd/samsung/core.h>
>>
>> @@ -125,7 +122,21 @@ static struct clk_init_data s2mps11_clks_init[S2MPS11_CLKS_NUM] = {
>> },
>> };
>>
>> -static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev)
>> +static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>> + [S2MPS11_CLK_AP] = {
>> + .name = "s2mps14_ap",
>> + .ops = &s2mps11_clk_ops,
>> + .flags = CLK_IS_ROOT,
>> + },
>> + [S2MPS11_CLK_BT] = {
>> + .name = "s2mps14_bt",
>> + .ops = &s2mps11_clk_ops,
>> + .flags = CLK_IS_ROOT,
>> + },
>> +};
>> +
>> +static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>> + struct clk_init_data *clks_init)
>> {
>> struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
>> struct device_node *clk_np;
>> @@ -145,9 +156,12 @@ static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev)
>> if (!clk_table)
>> return ERR_PTR(-ENOMEM);
>>
>> - for (i = 0; i < S2MPS11_CLKS_NUM; i++)
>> + for (i = 0; i < S2MPS11_CLKS_NUM; i++) {
>> + if (!clks_init[i].name)
>> + continue; /* Skip clocks not present in some devices */
>> of_property_read_string_index(clk_np, "clock-output-names", i,
>> - &s2mps11_clks_init[i].name);
>> + &clks_init[i].name);
>> + }
>>
>> return clk_np;
>> }
>> @@ -158,6 +172,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>> struct s2mps11_clk *s2mps11_clks, *s2mps11_clk;
>> struct device_node *clk_np = NULL;
>> unsigned int s2mps11_reg;
>> + struct clk_init_data *clks_init;
>> int i, ret = 0;
>> u32 val;
>>
>> @@ -168,25 +183,33 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>>
>> s2mps11_clk = s2mps11_clks;
>>
>> - clk_np = s2mps11_clk_parse_dt(pdev);
>> - if (IS_ERR(clk_np))
>> - return PTR_ERR(clk_np);
>> -
>> switch (platform_get_device_id(pdev)->driver_data) {
>> case S2MPS11X:
>> s2mps11_reg = S2MPS11_REG_RTC_CTRL;
>> + clks_init = s2mps11_clks_init;
>> + break;
>> + case S2MPS14X:
>> + s2mps11_reg = S2MPS14_REG_RTCCTRL;
>> + clks_init = s2mps14_clks_init;
>> break;
>> case S5M8767X:
>> s2mps11_reg = S5M8767_REG_CTRL1;
>> + clks_init = s2mps11_clks_init;
>> break;
>> default:
>> dev_err(&pdev->dev, "Invalid device type\n");
>> return -EINVAL;
>> };
>>
>> + clk_np = s2mps11_clk_parse_dt(pdev, clks_init);
>> + if (IS_ERR(clk_np))
>> + return PTR_ERR(clk_np);
>> +
>> for (i = 0; i < S2MPS11_CLKS_NUM; i++, s2mps11_clk++) {
>> + if (!clks_init[i].name)
>> + continue; /* Skip clocks not present in some devices */
>> s2mps11_clk->iodev = iodev;
>> - s2mps11_clk->hw.init = &s2mps11_clks_init[i];
>> + s2mps11_clk->hw.init = &clks_init[i];
>> s2mps11_clk->mask = 1 << i;
>> s2mps11_clk->reg = s2mps11_reg;
>>
>> @@ -220,8 +243,12 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>> }
>>
>> if (clk_table) {
>> - for (i = 0; i < S2MPS11_CLKS_NUM; i++)
>> + for (i = 0; i < S2MPS11_CLKS_NUM; i++) {
>> + /* Skip clocks not present on S2MPS14 */
>> + if (!clks_init[i].name)
>> + continue;
>> clk_table[i] = s2mps11_clks[i].clk;
>> + }
>>
>> clk_data.clks = clk_table;
>> clk_data.clk_num = S2MPS11_CLKS_NUM;
>> @@ -250,14 +277,18 @@ static int s2mps11_clk_remove(struct platform_device *pdev)
>> struct s2mps11_clk *s2mps11_clks = platform_get_drvdata(pdev);
>> int i;
>>
>> - for (i = 0; i < S2MPS11_CLKS_NUM; i++)
>> + for (i = 0; i < S2MPS11_CLKS_NUM; i++) {
>> + if (!s2mps11_clks[i].lookup)
>> + continue; /* Skip clocks not present in some devices */
>> clkdev_drop(s2mps11_clks[i].lookup);
>> + }
>>
>> return 0;
>> }
>>
>> static const struct platform_device_id s2mps11_clk_id[] = {
>> { "s2mps11-clk", S2MPS11X},
>> + { "s2mps14-clk", S2MPS14X},
>> { "s5m8767-clk", S5M8767X},
>> { },
>> };
>> --
>> 1.7.9.5
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
