From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 16/19] clk: at91: add PMC smd clock
Date: Tue, 8 Oct 2013 18:22:22 +0200 [thread overview]
Message-ID: <5254313E.90007@atmel.com> (raw)
In-Reply-To: <1375946243-9736-1-git-send-email-b.brezillon@overkiz.com>
On 08/08/2013 09:17, Boris BREZILLON :
> This patch adds at91 smd (Soft Modem) clock implementation using common clk
> framework.
>
> Not used by any driver right now.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> ---
> arch/arm/mach-at91/Kconfig | 5 ++
> drivers/clk/at91/Makefile | 1 +
> drivers/clk/at91/clk-smd.c | 171 ++++++++++++++++++++++++++++++++++++++++++++
> drivers/clk/at91/pmc.c | 7 ++
> drivers/clk/at91/pmc.h | 5 ++
> 5 files changed, 189 insertions(+)
> create mode 100644 drivers/clk/at91/clk-smd.c
>
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index b76dc4c..97033f7 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -39,6 +39,9 @@ config AT91_SAM9G45_RESET
> config AT91_SAM9_TIME
> bool
>
> +config HAVE_AT91_SMD
> + bool
> +
> config SOC_AT91SAM9
> bool
> select AT91_SAM9_TIME
> @@ -85,6 +88,7 @@ config SOC_SAMA5D3
> select HAVE_AT91_DBGU1
> select AT91_USE_OLD_CLK
> select HAVE_AT91_UTMI
> + select HAVE_AT91_SMD
> select HAVE_AT91_USB_CLK
> help
> Select this if you are using one of Atmel's SAMA5D3 family SoC.
> @@ -157,6 +161,7 @@ config SOC_AT91SAM9X5
> select SOC_AT91SAM9
> select AT91_USE_OLD_CLK
> select HAVE_AT91_UTMI
> + select HAVE_AT91_SMD
> select HAVE_AT91_USB_CLK
> help
> Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
> diff --git a/drivers/clk/at91/Makefile b/drivers/clk/at91/Makefile
> index 61db058..0e92b71 100644
> --- a/drivers/clk/at91/Makefile
> +++ b/drivers/clk/at91/Makefile
> @@ -9,3 +9,4 @@ obj-y += clk-system.o clk-peripheral.o
> obj-$(CONFIG_AT91_PROGRAMMABLE_CLOCKS) += clk-programmable.o
> obj-$(CONFIG_HAVE_AT91_UTMI) += clk-utmi.o
> obj-$(CONFIG_HAVE_AT91_USB_CLK) += clk-usb.o
> +obj-$(CONFIG_HAVE_AT91_SMD) += clk-smd.o
> diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c
> new file mode 100644
> index 0000000..a7cf14a
> --- /dev/null
> +++ b/drivers/clk/at91/clk-smd.c
> @@ -0,0 +1,171 @@
> +/*
> + * drivers/clk/at91/clk-smd.c
> + *
> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
> + *
> + * 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 Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + */
> +
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/clk/at91_pmc.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/io.h>
> +
> +#include "pmc.h"
> +
> +#define SMD_SOURCE_MAX 2
> +
> +#define to_at91sam9x5_clk_smd(hw) \
> + container_of(hw, struct at91sam9x5_clk_smd, hw)
> +struct at91sam9x5_clk_smd {
> + struct clk_hw hw;
> + struct at91_pmc *pmc;
> +};
> +
> +static unsigned long at91sam9x5_clk_smd_recalc_rate(struct clk_hw *hw,
> + unsigned long parent_rate)
> +{
> + u32 tmp;
> + u8 smddiv;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + tmp = pmc_read(pmc, AT91_PMC_SMD);
> + smddiv = (tmp & AT91_PMC_SMD_DIV) >> 8;
> + return parent_rate / (smddiv + 1);
> +}
> +
> +static long at91sam9x5_clk_smd_round_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long *parent_rate)
> +{
> + unsigned long div;
> + unsigned long bestrate;
> + unsigned long tmp;
> +
> + if (rate >= *parent_rate)
> + return *parent_rate;
> +
> + div = *parent_rate / rate;
> + if (div > 15)
> + return *parent_rate / 16;
> +
> + bestrate = *parent_rate / div;
> + tmp = *parent_rate / (div + 1);
> + if (bestrate - rate > rate - tmp)
> + bestrate = tmp;
> +
> + return bestrate;
> +}
> +
> +static int at91sam9x5_clk_smd_set_parent(struct clk_hw *hw, u8 index)
> +{
> + u32 tmp;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + if (index > 1)
> + return -EINVAL;
> + tmp = pmc_read(pmc, AT91_PMC_SMD) & ~AT91_PMC_SMDS;
> + if (index)
> + tmp |= AT91_PMC_SMDS;
> + pmc_write(pmc, AT91_PMC_SMD, tmp);
> + return 0;
> +}
> +
> +static u8 at91sam9x5_clk_smd_get_parent(struct clk_hw *hw)
> +{
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + return pmc_read(pmc, AT91_PMC_SMD) & AT91_PMC_SMDS;
> +}
> +
> +static int at91sam9x5_clk_smd_set_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long parent_rate)
> +{
> + u32 tmp;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> + unsigned long div = parent_rate / rate;
> +
> + if (parent_rate % rate || div < 1 || div > 16)
> + return -EINVAL;
> + tmp = pmc_read(pmc, AT91_PMC_SMD) & ~AT91_PMC_SMD_DIV;
> + tmp |= (div - 1) << 8;
> + pmc_write(pmc, AT91_PMC_SMD, tmp);
> +
> + return 0;
> +}
> +
> +static const struct clk_ops at91sam9x5_smd_ops = {
> + .recalc_rate = at91sam9x5_clk_smd_recalc_rate,
> + .round_rate = at91sam9x5_clk_smd_round_rate,
> + .get_parent = at91sam9x5_clk_smd_get_parent,
> + .set_parent = at91sam9x5_clk_smd_set_parent,
> + .set_rate = at91sam9x5_clk_smd_set_rate,
> +};
> +
> +static struct clk * __init
> +at91sam9x5_clk_register_smd(struct at91_pmc *pmc, const char *name,
> + const char **parent_names, u8 num_parents)
> +{
> + struct at91sam9x5_clk_smd *smd;
> + struct clk *clk = NULL;
> + struct clk_init_data init;
> +
> + smd = kzalloc(sizeof(*smd), GFP_KERNEL);
> + if (!smd)
> + return ERR_PTR(-ENOMEM);
> +
> + init.name = name;
> + init.ops = &at91sam9x5_smd_ops;
> + init.parent_names = parent_names;
> + init.num_parents = num_parents;
> + init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
> +
> + smd->hw.init = &init;
> + smd->pmc = pmc;
> +
> + clk = clk_register(NULL, &smd->hw);
> +
> + if (IS_ERR(clk))
> + kfree(smd);
> +
> + return clk;
> +}
> +
> +void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
> + struct at91_pmc *pmc)
> +{
> + struct clk *clk;
> + int i;
> + int num_parents;
> + const char *parent_names[SMD_SOURCE_MAX];
> + const char *name = np->name;
> +
> + num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells");
> + if (num_parents <= 0 || num_parents >= SMD_SOURCE_MAX)
> + return;
> +
> + for (i = 0; i < num_parents; i++) {
> + parent_names[i] = of_clk_get_parent_name(np, i);
> + if (!parent_names[i])
> + return;
> + }
> +
> + of_property_read_string(np, "clock-output-names", &name);
> +
> + clk = at91sam9x5_clk_register_smd(pmc, name, parent_names,
> + num_parents);
> +
> + if (IS_ERR(clk))
> + return;
> +
> + of_clk_add_provider(np, of_clk_src_simple_get, clk);
> +}
> diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
> index e46de3d..0a731c8 100644
> --- a/drivers/clk/at91/pmc.c
> +++ b/drivers/clk/at91/pmc.c
> @@ -298,6 +298,13 @@ static const struct of_device_id pmc_clk_ids[] __initdata = {
> .data = of_at91sam9x5_clk_usb_setup,
> },
> #endif
> + /* SMD clock */
> +#if defined(CONFIG_HAVE_AT91_SMD)
> + {
> + .compatible = "atmel,at91sam9x5-clk-smd",
> + .data = of_at91sam9x5_clk_smd_setup,
> + },
> +#endif
> { /*sentinel*/ }
> };
>
> diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
> index b2efff5..43f2516 100644
> --- a/drivers/clk/at91/pmc.h
> +++ b/drivers/clk/at91/pmc.h
> @@ -103,4 +103,9 @@ extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
> struct at91_pmc *pmc);
> #endif
>
> +#if defined(CONFIG_HAVE_AT91_SMD)
> +extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
> + struct at91_pmc *pmc);
> +#endif
> +
> #endif /* __PMC_H_ */
>
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
To: Boris BREZILLON
<b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>,
Grant Likely
<grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>,
Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>,
Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org>,
Jean-Christophe Plagniol-Villard
<plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>,
Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
Mike Turquette
<mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>,
Greg Kroah-Hartman
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
Ludovic Desroches
<ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>,
Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>,
Richard Genoud
<richard.genoud-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: Re: [PATCH v3 16/19] clk: at91: add PMC smd clock
Date: Tue, 8 Oct 2013 18:22:22 +0200 [thread overview]
Message-ID: <5254313E.90007@atmel.com> (raw)
In-Reply-To: <1375946243-9736-1-git-send-email-b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>
On 08/08/2013 09:17, Boris BREZILLON :
> This patch adds at91 smd (Soft Modem) clock implementation using common clk
> framework.
>
> Not used by any driver right now.
>
> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>
> ---
> arch/arm/mach-at91/Kconfig | 5 ++
> drivers/clk/at91/Makefile | 1 +
> drivers/clk/at91/clk-smd.c | 171 ++++++++++++++++++++++++++++++++++++++++++++
> drivers/clk/at91/pmc.c | 7 ++
> drivers/clk/at91/pmc.h | 5 ++
> 5 files changed, 189 insertions(+)
> create mode 100644 drivers/clk/at91/clk-smd.c
>
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index b76dc4c..97033f7 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -39,6 +39,9 @@ config AT91_SAM9G45_RESET
> config AT91_SAM9_TIME
> bool
>
> +config HAVE_AT91_SMD
> + bool
> +
> config SOC_AT91SAM9
> bool
> select AT91_SAM9_TIME
> @@ -85,6 +88,7 @@ config SOC_SAMA5D3
> select HAVE_AT91_DBGU1
> select AT91_USE_OLD_CLK
> select HAVE_AT91_UTMI
> + select HAVE_AT91_SMD
> select HAVE_AT91_USB_CLK
> help
> Select this if you are using one of Atmel's SAMA5D3 family SoC.
> @@ -157,6 +161,7 @@ config SOC_AT91SAM9X5
> select SOC_AT91SAM9
> select AT91_USE_OLD_CLK
> select HAVE_AT91_UTMI
> + select HAVE_AT91_SMD
> select HAVE_AT91_USB_CLK
> help
> Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
> diff --git a/drivers/clk/at91/Makefile b/drivers/clk/at91/Makefile
> index 61db058..0e92b71 100644
> --- a/drivers/clk/at91/Makefile
> +++ b/drivers/clk/at91/Makefile
> @@ -9,3 +9,4 @@ obj-y += clk-system.o clk-peripheral.o
> obj-$(CONFIG_AT91_PROGRAMMABLE_CLOCKS) += clk-programmable.o
> obj-$(CONFIG_HAVE_AT91_UTMI) += clk-utmi.o
> obj-$(CONFIG_HAVE_AT91_USB_CLK) += clk-usb.o
> +obj-$(CONFIG_HAVE_AT91_SMD) += clk-smd.o
> diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c
> new file mode 100644
> index 0000000..a7cf14a
> --- /dev/null
> +++ b/drivers/clk/at91/clk-smd.c
> @@ -0,0 +1,171 @@
> +/*
> + * drivers/clk/at91/clk-smd.c
> + *
> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>
> + *
> + * 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 Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + */
> +
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/clk/at91_pmc.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/io.h>
> +
> +#include "pmc.h"
> +
> +#define SMD_SOURCE_MAX 2
> +
> +#define to_at91sam9x5_clk_smd(hw) \
> + container_of(hw, struct at91sam9x5_clk_smd, hw)
> +struct at91sam9x5_clk_smd {
> + struct clk_hw hw;
> + struct at91_pmc *pmc;
> +};
> +
> +static unsigned long at91sam9x5_clk_smd_recalc_rate(struct clk_hw *hw,
> + unsigned long parent_rate)
> +{
> + u32 tmp;
> + u8 smddiv;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + tmp = pmc_read(pmc, AT91_PMC_SMD);
> + smddiv = (tmp & AT91_PMC_SMD_DIV) >> 8;
> + return parent_rate / (smddiv + 1);
> +}
> +
> +static long at91sam9x5_clk_smd_round_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long *parent_rate)
> +{
> + unsigned long div;
> + unsigned long bestrate;
> + unsigned long tmp;
> +
> + if (rate >= *parent_rate)
> + return *parent_rate;
> +
> + div = *parent_rate / rate;
> + if (div > 15)
> + return *parent_rate / 16;
> +
> + bestrate = *parent_rate / div;
> + tmp = *parent_rate / (div + 1);
> + if (bestrate - rate > rate - tmp)
> + bestrate = tmp;
> +
> + return bestrate;
> +}
> +
> +static int at91sam9x5_clk_smd_set_parent(struct clk_hw *hw, u8 index)
> +{
> + u32 tmp;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + if (index > 1)
> + return -EINVAL;
> + tmp = pmc_read(pmc, AT91_PMC_SMD) & ~AT91_PMC_SMDS;
> + if (index)
> + tmp |= AT91_PMC_SMDS;
> + pmc_write(pmc, AT91_PMC_SMD, tmp);
> + return 0;
> +}
> +
> +static u8 at91sam9x5_clk_smd_get_parent(struct clk_hw *hw)
> +{
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + return pmc_read(pmc, AT91_PMC_SMD) & AT91_PMC_SMDS;
> +}
> +
> +static int at91sam9x5_clk_smd_set_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long parent_rate)
> +{
> + u32 tmp;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> + unsigned long div = parent_rate / rate;
> +
> + if (parent_rate % rate || div < 1 || div > 16)
> + return -EINVAL;
> + tmp = pmc_read(pmc, AT91_PMC_SMD) & ~AT91_PMC_SMD_DIV;
> + tmp |= (div - 1) << 8;
> + pmc_write(pmc, AT91_PMC_SMD, tmp);
> +
> + return 0;
> +}
> +
> +static const struct clk_ops at91sam9x5_smd_ops = {
> + .recalc_rate = at91sam9x5_clk_smd_recalc_rate,
> + .round_rate = at91sam9x5_clk_smd_round_rate,
> + .get_parent = at91sam9x5_clk_smd_get_parent,
> + .set_parent = at91sam9x5_clk_smd_set_parent,
> + .set_rate = at91sam9x5_clk_smd_set_rate,
> +};
> +
> +static struct clk * __init
> +at91sam9x5_clk_register_smd(struct at91_pmc *pmc, const char *name,
> + const char **parent_names, u8 num_parents)
> +{
> + struct at91sam9x5_clk_smd *smd;
> + struct clk *clk = NULL;
> + struct clk_init_data init;
> +
> + smd = kzalloc(sizeof(*smd), GFP_KERNEL);
> + if (!smd)
> + return ERR_PTR(-ENOMEM);
> +
> + init.name = name;
> + init.ops = &at91sam9x5_smd_ops;
> + init.parent_names = parent_names;
> + init.num_parents = num_parents;
> + init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
> +
> + smd->hw.init = &init;
> + smd->pmc = pmc;
> +
> + clk = clk_register(NULL, &smd->hw);
> +
> + if (IS_ERR(clk))
> + kfree(smd);
> +
> + return clk;
> +}
> +
> +void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
> + struct at91_pmc *pmc)
> +{
> + struct clk *clk;
> + int i;
> + int num_parents;
> + const char *parent_names[SMD_SOURCE_MAX];
> + const char *name = np->name;
> +
> + num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells");
> + if (num_parents <= 0 || num_parents >= SMD_SOURCE_MAX)
> + return;
> +
> + for (i = 0; i < num_parents; i++) {
> + parent_names[i] = of_clk_get_parent_name(np, i);
> + if (!parent_names[i])
> + return;
> + }
> +
> + of_property_read_string(np, "clock-output-names", &name);
> +
> + clk = at91sam9x5_clk_register_smd(pmc, name, parent_names,
> + num_parents);
> +
> + if (IS_ERR(clk))
> + return;
> +
> + of_clk_add_provider(np, of_clk_src_simple_get, clk);
> +}
> diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
> index e46de3d..0a731c8 100644
> --- a/drivers/clk/at91/pmc.c
> +++ b/drivers/clk/at91/pmc.c
> @@ -298,6 +298,13 @@ static const struct of_device_id pmc_clk_ids[] __initdata = {
> .data = of_at91sam9x5_clk_usb_setup,
> },
> #endif
> + /* SMD clock */
> +#if defined(CONFIG_HAVE_AT91_SMD)
> + {
> + .compatible = "atmel,at91sam9x5-clk-smd",
> + .data = of_at91sam9x5_clk_smd_setup,
> + },
> +#endif
> { /*sentinel*/ }
> };
>
> diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
> index b2efff5..43f2516 100644
> --- a/drivers/clk/at91/pmc.h
> +++ b/drivers/clk/at91/pmc.h
> @@ -103,4 +103,9 @@ extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
> struct at91_pmc *pmc);
> #endif
>
> +#if defined(CONFIG_HAVE_AT91_SMD)
> +extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
> + struct at91_pmc *pmc);
> +#endif
> +
> #endif /* __PMC_H_ */
>
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Boris BREZILLON <b.brezillon@overkiz.com>,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <rob.herring@calxeda.com>,
Rob Landley <rob@landley.net>, Andrew Victor <linux@maxim.org.za>,
"Jean-Christophe Plagniol-Villard" <plagnioj@jcrosoft.com>,
Russell King <linux@arm.linux.org.uk>,
Mike Turquette <mturquette@linaro.org>,
"Felipe Balbi" <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
Josh Wu <josh.wu@atmel.com>,
Richard Genoud <richard.genoud@gmail.com>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v3 16/19] clk: at91: add PMC smd clock
Date: Tue, 8 Oct 2013 18:22:22 +0200 [thread overview]
Message-ID: <5254313E.90007@atmel.com> (raw)
In-Reply-To: <1375946243-9736-1-git-send-email-b.brezillon@overkiz.com>
On 08/08/2013 09:17, Boris BREZILLON :
> This patch adds at91 smd (Soft Modem) clock implementation using common clk
> framework.
>
> Not used by any driver right now.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
> ---
> arch/arm/mach-at91/Kconfig | 5 ++
> drivers/clk/at91/Makefile | 1 +
> drivers/clk/at91/clk-smd.c | 171 ++++++++++++++++++++++++++++++++++++++++++++
> drivers/clk/at91/pmc.c | 7 ++
> drivers/clk/at91/pmc.h | 5 ++
> 5 files changed, 189 insertions(+)
> create mode 100644 drivers/clk/at91/clk-smd.c
>
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index b76dc4c..97033f7 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -39,6 +39,9 @@ config AT91_SAM9G45_RESET
> config AT91_SAM9_TIME
> bool
>
> +config HAVE_AT91_SMD
> + bool
> +
> config SOC_AT91SAM9
> bool
> select AT91_SAM9_TIME
> @@ -85,6 +88,7 @@ config SOC_SAMA5D3
> select HAVE_AT91_DBGU1
> select AT91_USE_OLD_CLK
> select HAVE_AT91_UTMI
> + select HAVE_AT91_SMD
> select HAVE_AT91_USB_CLK
> help
> Select this if you are using one of Atmel's SAMA5D3 family SoC.
> @@ -157,6 +161,7 @@ config SOC_AT91SAM9X5
> select SOC_AT91SAM9
> select AT91_USE_OLD_CLK
> select HAVE_AT91_UTMI
> + select HAVE_AT91_SMD
> select HAVE_AT91_USB_CLK
> help
> Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
> diff --git a/drivers/clk/at91/Makefile b/drivers/clk/at91/Makefile
> index 61db058..0e92b71 100644
> --- a/drivers/clk/at91/Makefile
> +++ b/drivers/clk/at91/Makefile
> @@ -9,3 +9,4 @@ obj-y += clk-system.o clk-peripheral.o
> obj-$(CONFIG_AT91_PROGRAMMABLE_CLOCKS) += clk-programmable.o
> obj-$(CONFIG_HAVE_AT91_UTMI) += clk-utmi.o
> obj-$(CONFIG_HAVE_AT91_USB_CLK) += clk-usb.o
> +obj-$(CONFIG_HAVE_AT91_SMD) += clk-smd.o
> diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c
> new file mode 100644
> index 0000000..a7cf14a
> --- /dev/null
> +++ b/drivers/clk/at91/clk-smd.c
> @@ -0,0 +1,171 @@
> +/*
> + * drivers/clk/at91/clk-smd.c
> + *
> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>
> + *
> + * 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 Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + */
> +
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/clk/at91_pmc.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/io.h>
> +
> +#include "pmc.h"
> +
> +#define SMD_SOURCE_MAX 2
> +
> +#define to_at91sam9x5_clk_smd(hw) \
> + container_of(hw, struct at91sam9x5_clk_smd, hw)
> +struct at91sam9x5_clk_smd {
> + struct clk_hw hw;
> + struct at91_pmc *pmc;
> +};
> +
> +static unsigned long at91sam9x5_clk_smd_recalc_rate(struct clk_hw *hw,
> + unsigned long parent_rate)
> +{
> + u32 tmp;
> + u8 smddiv;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + tmp = pmc_read(pmc, AT91_PMC_SMD);
> + smddiv = (tmp & AT91_PMC_SMD_DIV) >> 8;
> + return parent_rate / (smddiv + 1);
> +}
> +
> +static long at91sam9x5_clk_smd_round_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long *parent_rate)
> +{
> + unsigned long div;
> + unsigned long bestrate;
> + unsigned long tmp;
> +
> + if (rate >= *parent_rate)
> + return *parent_rate;
> +
> + div = *parent_rate / rate;
> + if (div > 15)
> + return *parent_rate / 16;
> +
> + bestrate = *parent_rate / div;
> + tmp = *parent_rate / (div + 1);
> + if (bestrate - rate > rate - tmp)
> + bestrate = tmp;
> +
> + return bestrate;
> +}
> +
> +static int at91sam9x5_clk_smd_set_parent(struct clk_hw *hw, u8 index)
> +{
> + u32 tmp;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + if (index > 1)
> + return -EINVAL;
> + tmp = pmc_read(pmc, AT91_PMC_SMD) & ~AT91_PMC_SMDS;
> + if (index)
> + tmp |= AT91_PMC_SMDS;
> + pmc_write(pmc, AT91_PMC_SMD, tmp);
> + return 0;
> +}
> +
> +static u8 at91sam9x5_clk_smd_get_parent(struct clk_hw *hw)
> +{
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> +
> + return pmc_read(pmc, AT91_PMC_SMD) & AT91_PMC_SMDS;
> +}
> +
> +static int at91sam9x5_clk_smd_set_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long parent_rate)
> +{
> + u32 tmp;
> + struct at91sam9x5_clk_smd *smd = to_at91sam9x5_clk_smd(hw);
> + struct at91_pmc *pmc = smd->pmc;
> + unsigned long div = parent_rate / rate;
> +
> + if (parent_rate % rate || div < 1 || div > 16)
> + return -EINVAL;
> + tmp = pmc_read(pmc, AT91_PMC_SMD) & ~AT91_PMC_SMD_DIV;
> + tmp |= (div - 1) << 8;
> + pmc_write(pmc, AT91_PMC_SMD, tmp);
> +
> + return 0;
> +}
> +
> +static const struct clk_ops at91sam9x5_smd_ops = {
> + .recalc_rate = at91sam9x5_clk_smd_recalc_rate,
> + .round_rate = at91sam9x5_clk_smd_round_rate,
> + .get_parent = at91sam9x5_clk_smd_get_parent,
> + .set_parent = at91sam9x5_clk_smd_set_parent,
> + .set_rate = at91sam9x5_clk_smd_set_rate,
> +};
> +
> +static struct clk * __init
> +at91sam9x5_clk_register_smd(struct at91_pmc *pmc, const char *name,
> + const char **parent_names, u8 num_parents)
> +{
> + struct at91sam9x5_clk_smd *smd;
> + struct clk *clk = NULL;
> + struct clk_init_data init;
> +
> + smd = kzalloc(sizeof(*smd), GFP_KERNEL);
> + if (!smd)
> + return ERR_PTR(-ENOMEM);
> +
> + init.name = name;
> + init.ops = &at91sam9x5_smd_ops;
> + init.parent_names = parent_names;
> + init.num_parents = num_parents;
> + init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
> +
> + smd->hw.init = &init;
> + smd->pmc = pmc;
> +
> + clk = clk_register(NULL, &smd->hw);
> +
> + if (IS_ERR(clk))
> + kfree(smd);
> +
> + return clk;
> +}
> +
> +void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
> + struct at91_pmc *pmc)
> +{
> + struct clk *clk;
> + int i;
> + int num_parents;
> + const char *parent_names[SMD_SOURCE_MAX];
> + const char *name = np->name;
> +
> + num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells");
> + if (num_parents <= 0 || num_parents >= SMD_SOURCE_MAX)
> + return;
> +
> + for (i = 0; i < num_parents; i++) {
> + parent_names[i] = of_clk_get_parent_name(np, i);
> + if (!parent_names[i])
> + return;
> + }
> +
> + of_property_read_string(np, "clock-output-names", &name);
> +
> + clk = at91sam9x5_clk_register_smd(pmc, name, parent_names,
> + num_parents);
> +
> + if (IS_ERR(clk))
> + return;
> +
> + of_clk_add_provider(np, of_clk_src_simple_get, clk);
> +}
> diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
> index e46de3d..0a731c8 100644
> --- a/drivers/clk/at91/pmc.c
> +++ b/drivers/clk/at91/pmc.c
> @@ -298,6 +298,13 @@ static const struct of_device_id pmc_clk_ids[] __initdata = {
> .data = of_at91sam9x5_clk_usb_setup,
> },
> #endif
> + /* SMD clock */
> +#if defined(CONFIG_HAVE_AT91_SMD)
> + {
> + .compatible = "atmel,at91sam9x5-clk-smd",
> + .data = of_at91sam9x5_clk_smd_setup,
> + },
> +#endif
> { /*sentinel*/ }
> };
>
> diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
> index b2efff5..43f2516 100644
> --- a/drivers/clk/at91/pmc.h
> +++ b/drivers/clk/at91/pmc.h
> @@ -103,4 +103,9 @@ extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
> struct at91_pmc *pmc);
> #endif
>
> +#if defined(CONFIG_HAVE_AT91_SMD)
> +extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
> + struct at91_pmc *pmc);
> +#endif
> +
> #endif /* __PMC_H_ */
>
--
Nicolas Ferre
next prev parent reply other threads:[~2013-10-08 16:22 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 4:53 [PATCH v3 00/19] ARM: at91: move to common clk framework Boris BREZILLON
2013-08-08 4:53 ` Boris BREZILLON
2013-08-08 4:59 ` [PATCH v3 01/19] ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h Boris BREZILLON
2013-08-08 4:59 ` Boris BREZILLON
2013-08-08 5:01 ` [PATCH v3 03/19] clk: at91: add PMC base support Boris BREZILLON
2013-08-08 5:01 ` Boris BREZILLON
2013-10-07 15:07 ` Nicolas Ferre
2013-10-07 15:07 ` Nicolas Ferre
2013-10-07 15:07 ` Nicolas Ferre
2013-10-07 15:57 ` boris brezillon
2013-10-07 15:57 ` boris brezillon
2013-08-08 5:02 ` [PATCH v3 02/19] ARM: at91: add Kconfig options for common clk support Boris BREZILLON
2013-08-08 5:02 ` Boris BREZILLON
2013-10-07 15:12 ` Nicolas Ferre
2013-10-07 15:12 ` Nicolas Ferre
2013-10-07 15:12 ` Nicolas Ferre
2013-10-07 16:05 ` boris brezillon
2013-10-07 16:05 ` boris brezillon
2013-10-09 9:56 ` boris brezillon
2013-10-09 9:56 ` boris brezillon
2013-10-09 10:05 ` Nicolas Ferre
2013-10-09 10:05 ` Nicolas Ferre
2013-10-09 10:05 ` Nicolas Ferre
2013-08-08 5:04 ` [PATCH v3 04/19] clk: at91: add PMC macro file for dt definitions Boris BREZILLON
2013-08-08 5:04 ` Boris BREZILLON
2013-10-07 15:17 ` Nicolas Ferre
2013-10-07 15:17 ` Nicolas Ferre
2013-10-07 15:17 ` Nicolas Ferre
2013-10-07 16:06 ` boris brezillon
2013-10-07 16:06 ` boris brezillon
2013-10-07 16:06 ` boris brezillon
2013-08-08 5:06 ` [PATCH v3 05/19] clk: at91: add PMC main clock Boris BREZILLON
2013-08-08 5:06 ` Boris BREZILLON
2013-10-07 16:51 ` Nicolas Ferre
2013-10-07 16:51 ` Nicolas Ferre
2013-10-07 16:51 ` Nicolas Ferre
2013-10-07 19:11 ` boris brezillon
2013-10-07 19:11 ` boris brezillon
2013-10-08 8:24 ` Nicolas Ferre
2013-10-08 8:24 ` Nicolas Ferre
2013-10-08 8:24 ` Nicolas Ferre
2013-10-08 9:00 ` boris brezillon
2013-10-08 9:00 ` boris brezillon
2013-10-08 9:00 ` boris brezillon
2013-08-08 6:07 ` [PATCH v3 06/19] clk: at91: add PMC pll clocks Boris BREZILLON
2013-08-08 6:07 ` Boris BREZILLON
2013-10-08 10:28 ` Nicolas Ferre
2013-10-08 10:28 ` Nicolas Ferre
2013-10-08 10:28 ` Nicolas Ferre
2013-10-08 11:45 ` boris brezillon
2013-10-08 11:45 ` boris brezillon
2013-10-08 11:45 ` boris brezillon
2013-08-08 6:09 ` [PATCH v3 07/19] clk: at91: add pll id macros for pll dt bindings Boris BREZILLON
2013-08-08 6:09 ` Boris BREZILLON
2013-10-08 10:30 ` Nicolas Ferre
2013-10-08 10:30 ` Nicolas Ferre
2013-10-08 10:30 ` Nicolas Ferre
2013-10-08 12:03 ` boris brezillon
2013-10-08 12:03 ` boris brezillon
2013-08-08 6:10 ` [PATCH v3 08/19] clk: at91: add PMC master clock Boris BREZILLON
2013-08-08 6:10 ` Boris BREZILLON
2013-08-08 6:12 ` [PATCH v3 09/19] clk: at91: add PMC system clocks Boris BREZILLON
2013-08-08 6:12 ` Boris BREZILLON
2013-10-08 15:32 ` Nicolas Ferre
2013-10-08 15:32 ` Nicolas Ferre
2013-10-08 15:32 ` Nicolas Ferre
2013-08-08 6:15 ` [PATCH v3 10/19] ARM: at91/dt: add system clk id definitions in dt-bindings include dir Boris BREZILLON
2013-08-08 6:15 ` Boris BREZILLON
2013-10-08 15:36 ` Nicolas Ferre
2013-10-08 15:36 ` Nicolas Ferre
2013-10-08 15:36 ` Nicolas Ferre
2013-08-08 6:16 ` [PATCH v3 11/19] clk: at91: add PMC peripheral clocks Boris BREZILLON
2013-08-08 6:16 ` Boris BREZILLON
2013-10-08 15:43 ` Nicolas Ferre
2013-10-08 15:43 ` Nicolas Ferre
2013-10-08 15:43 ` Nicolas Ferre
2013-08-08 7:10 ` [PATCH v3 12/19] clk: at91: add peripheral clk macros for peripheral clk dt bindings Boris BREZILLON
2013-08-08 7:10 ` Boris BREZILLON
2013-10-08 15:44 ` Nicolas Ferre
2013-10-08 15:44 ` Nicolas Ferre
2013-10-08 15:44 ` Nicolas Ferre
2013-10-08 16:01 ` boris brezillon
2013-10-08 16:01 ` boris brezillon
2013-10-08 16:15 ` Nicolas Ferre
2013-10-08 16:15 ` Nicolas Ferre
2013-10-08 16:15 ` Nicolas Ferre
2013-10-08 16:19 ` boris brezillon
2013-10-08 16:19 ` boris brezillon
2013-08-08 7:12 ` [PATCH v3 13/19] clk: at91: add PMC programmable clocks Boris BREZILLON
2013-08-08 7:12 ` Boris BREZILLON
2013-10-08 16:02 ` Nicolas Ferre
2013-10-08 16:02 ` Nicolas Ferre
2013-10-08 16:02 ` Nicolas Ferre
2013-10-08 16:06 ` Nicolas Ferre
2013-10-08 16:06 ` Nicolas Ferre
2013-10-08 16:06 ` Nicolas Ferre
2013-08-08 7:14 ` [PATCH v3 14/19] clk: at91: add PMC utmi clock Boris BREZILLON
2013-08-08 7:14 ` Boris BREZILLON
2013-10-08 16:08 ` Nicolas Ferre
2013-10-08 16:08 ` Nicolas Ferre
2013-10-08 16:08 ` Nicolas Ferre
2013-08-08 7:15 ` [PATCH v3 15/19] clk: at91: add PMC usb clock Boris BREZILLON
2013-08-08 7:15 ` Boris BREZILLON
2013-10-08 16:20 ` Nicolas Ferre
2013-10-08 16:20 ` Nicolas Ferre
2013-10-08 16:20 ` Nicolas Ferre
2013-08-08 7:17 ` [PATCH v3 16/19] clk: at91: add PMC smd clock Boris BREZILLON
2013-08-08 7:17 ` Boris BREZILLON
2013-10-08 16:22 ` Nicolas Ferre [this message]
2013-10-08 16:22 ` Nicolas Ferre
2013-10-08 16:22 ` Nicolas Ferre
2013-08-08 7:19 ` [PATCH v3 17/19] clk: at91: add PMC clk device tree binding doc Boris BREZILLON
2013-08-08 7:19 ` Boris BREZILLON
2013-10-08 9:44 ` Nicolas Ferre
2013-10-08 9:44 ` Nicolas Ferre
2013-10-08 9:44 ` Nicolas Ferre
2013-10-08 12:37 ` boris brezillon
2013-10-08 12:37 ` boris brezillon
2013-10-08 12:37 ` boris brezillon
2013-10-08 12:42 ` Nicolas Ferre
2013-10-08 12:42 ` Nicolas Ferre
2013-10-08 12:42 ` Nicolas Ferre
2013-08-08 8:17 ` [PATCH v3 18/19] ARM: at91: move pit timer to common clk framework Boris BREZILLON
2013-08-08 8:17 ` Boris BREZILLON
2013-10-08 16:28 ` Nicolas Ferre
2013-10-08 16:28 ` Nicolas Ferre
2013-10-08 16:28 ` Nicolas Ferre
2013-08-08 8:19 ` [PATCH v3 19/19] ARM: at91: add new compatible strings for pmc driver Boris BREZILLON
2013-08-08 8:19 ` Boris BREZILLON
2013-10-08 16:29 ` Nicolas Ferre
2013-10-08 16:29 ` Nicolas Ferre
2013-10-08 16:29 ` Nicolas Ferre
2013-08-20 10:21 ` [PATCH v3 00/19] ARM: at91: move to common clk framework boris brezillon
2013-08-20 10:21 ` boris brezillon
2013-10-07 20:06 ` Mike Turquette
2013-10-07 20:06 ` Mike Turquette
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=5254313E.90007@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be 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.