Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1358947
| From | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 2/5] ARM: davinci: da8xx: add usb phy clocks |
| Date | 2016-03-16 13:30 +0100 |
| Message-ID | <rdiKm-rP-3@gated-at.bofh.it> (permalink) |
| References | <rd5N8-8tc-11@gated-at.bofh.it> <rd5N9-8tc-33@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Hello.
On 3/16/2016 1:37 AM, David Lechner wrote:
> Up to this point, the USB phy clock configuration was handled manually in
> the board files and in the usb drivers. This adds proper clocks so that
> the usb drivers can use clk_get and clk_enable and not have to worry about
> the details. Also, the related code is removed from the board files.
>
> Signed-off-by: David Lechner <david@lechnology.com>
[...]
> diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
> index 7187e7f..213fb17e 100644
> --- a/arch/arm/mach-davinci/da830.c
> +++ b/arch/arm/mach-davinci/da830.c
[...]
> @@ -346,6 +340,12 @@ static struct clk i2c1_clk = {
> .gpsc = 1,
> };
>
> +static struct clk usb_ref_clk = {
> + .name = "usb_ref_clk",
> + .rate = 48000000,
> + .set_rate = davinci_simple_set_rate,
> +};
> +
> static struct clk usb11_clk = {
> .name = "usb11",
> .parent = &pll0_sysclk4,
> @@ -353,6 +353,115 @@ static struct clk usb11_clk = {
> .gpsc = 1,
> };
>
> +static struct clk usb20_clk = {
> + .name = "usb20",
> + .parent = &pll0_sysclk2,
> + .lpsc = DA8XX_LPSC1_USB20,
> + .gpsc = 1,
> +};
Why move it?
> +
> +static void usb20_phy_clk_enable(struct clk *clk)
> +{
> + u32 val;
> +
> + val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
> +
> + /*
> + * Turn on the USB 2.0 PHY, but just the PLL, and not OTG. The USB 1.1
> + * host may use the PLL clock without USB 2.0 OTG being used.
> + */
> + val &= ~(CFGCHIP2_RESET | CFGCHIP2_PHYPWRDN);
> + val |= CFGCHIP2_PHY_PLLON;
Wrong indentation.
> +
> + /* Set the mux depending on the parent clock. */
> + if (clk->parent == &pll0_aux_clk)
> + val |= CFGCHIP2_USB2PHYCLKMUX;
> + else if (clk->parent == &usb_ref_clk)
> + val &= ~CFGCHIP2_USB2PHYCLKMUX;
Don't we have clk_set_parent()for that?
> + else
> + pr_err("Bad parent on USB 2.0 PHY clock.\n");
> +
[...]
> + writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
Wrong indentation again.
> +
> + pr_info("Waiting for USB 2.0 PHY clock good...\n");
> + while (!(readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG))
> + & CFGCHIP2_PHYCLKGD))
> + cpu_relax();
And again.
> + }
> +
> +static void usb20_phy_clk_disable(struct clk *clk)
> +{
> + u32 val;
> +
> + val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
> + val |= CFGCHIP2_PHYPWRDN;
I'm not sure that powering down the PHY can be regarded as disabling the
clock...
> + __raw_writel(val, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
Please don't mix readl() and __raw_writel().
[...]
> +static void usb11_phy_clk_enable(struct clk *clk)
> +{
> + u32 val;
> +
> + val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
> +
> + /* Set the USB 1.1 PHY clock mux based on the parent clock. */
> + if (clk->parent == &usb20_phy_clk)
> + val &= ~CFGCHIP2_USB1PHYCLKMUX;
> + else if (clk->parent == &usb_ref_clk)
> + val &= ~CFGCHIP2_USB1PHYCLKMUX;
Huh? When do you set this bit?
[...]
> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
> index 97d8779..649d3fa 100644
> --- a/arch/arm/mach-davinci/da850.c
> +++ b/arch/arm/mach-davinci/da850.c
> @@ -19,6 +19,7 @@
> #include <linux/cpufreq.h>
> #include <linux/regulator/consumer.h>
> #include <linux/platform_data/gpio-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include <asm/mach/map.h>
>
> @@ -333,6 +334,12 @@ static struct clk aemif_clk = {
> .flags = ALWAYS_ENABLED,
> };
>
> +static struct clk usb_ref_clk = {
> + .name = "usb_ref_clk",
> + .rate = 48000000,
> + .set_rate = davinci_simple_set_rate,
> +};
> +
> static struct clk usb11_clk = {
> .name = "usb11",
> .parent = &pll0_sysclk4,
> @@ -347,6 +354,109 @@ static struct clk usb20_clk = {
[...]
> +static void usb11_phy_clk_enable(struct clk *clk)
> +{
> + u32 val;
> +
> + val = readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
> +
> + /* Set the USB 1.1 PHY clock mux based on the parent clock. */
> + if (clk->parent == &usb20_phy_clk)
> + val &= ~CFGCHIP2_USB1PHYCLKMUX;
> + else if (clk->parent == &usb_ref_clk)
> + val &= ~CFGCHIP2_USB1PHYCLKMUX;
When do you set this bit?
[...]
MBR, Sergei
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 1/5] ARM: davinci: defined missing CFGCHIP2_REFFREQ_* macros for MUSB PHY David Lechner <david@lechnology.com> - 2016-03-15 23:40 +0100
[PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources David Lechner <david@lechnology.com> - 2016-03-15 23:40 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-15 23:50 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources David Lechner <david@lechnology.com> - 2016-03-16 04:50 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources David Lechner <david@lechnology.com> - 2016-03-16 06:00 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 18:40 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources David Lechner <david@lechnology.com> - 2016-03-16 19:20 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 19:30 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources David Lechner <david@lechnology.com> - 2016-03-16 19:30 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 19:30 +0100
Re: [PATCH 3/5] ARM: davinci: da8xx: add cfgchip2 to resources Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 12:40 +0100
[PATCH 5/5] usb: musb-da8xx: remove board-specific clock handling David Lechner <david@lechnology.com> - 2016-03-15 23:40 +0100
Re: [PATCH 5/5] usb: musb-da8xx: remove board-specific clock handling Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 13:00 +0100
[PATCH 4/5] usb: ohci-da8xx: Remove clock code that references mach David Lechner <david@lechnology.com> - 2016-03-15 23:40 +0100
Re: [PATCH 4/5] usb: ohci-da8xx: Remove clock code that references mach Alan Stern <stern@rowland.harvard.edu> - 2016-03-16 16:00 +0100
Re: [PATCH 4/5] usb: ohci-da8xx: Remove clock code that references mach David Lechner <david@lechnology.com> - 2016-03-16 19:10 +0100
[PATCH 2/5] ARM: davinci: da8xx: add usb phy clocks David Lechner <david@lechnology.com> - 2016-03-15 23:40 +0100
Re: [PATCH 2/5] ARM: davinci: da8xx: add usb phy clocks Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 13:30 +0100
Re: [PATCH 2/5] ARM: davinci: da8xx: add usb phy clocks David Lechner <david@lechnology.com> - 2016-03-16 19:00 +0100
Re: [PATCH 2/5] ARM: davinci: da8xx: add usb phy clocks Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-16 19:10 +0100
Re: [PATCH 2/5] ARM: davinci: da8xx: add usb phy clocks David Lechner <david@lechnology.com> - 2016-03-16 19:30 +0100
csiph-web