ARM: imx: add imx5x usb controller clock lookups

Message ID	1345718328-6547-1-git-send-email-m.grzeschik@pengutronix.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> From: Michael Grzeschik <m.grzeschik@pengutronix.de> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: imx: add imx5x usb controller clock lookups Date: Thu, 23 Aug 2012 12:38:48 +0200 Message-Id: <1345718328-6547-1-git-send-email-m.grzeschik@pengutronix.de> summary: Content analysis details: (-2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: shawn.guo@linaro.org, richard.zhao@linaro.org, kernel@pengutronix.de Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Message ID

1345718328-6547-1-git-send-email-m.grzeschik@pengutronix.de (mailing list archive)

State

New, archived

Headers

From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: imx: add imx5x usb controller clock lookups
Date: Thu, 23 Aug 2012 12:38:48 +0200
Message-Id: <1345718328-6547-1-git-send-email-m.grzeschik@pengutronix.de>
Cc: shawn.guo@linaro.org, richard.zhao@linaro.org, kernel@pengutronix.de
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: linux-arm-kernel-bounces@lists.infradead.org
Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Comments

Shawn Guo Aug. 23, 2012, 2:18 p.m. UTC | #1

On Thu, Aug 23, 2012 at 12:38:48PM +0200, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ---
>  arch/arm/mach-imx/clk-imx51-imx53.c |   36 +++++++++++++++++++++++------------
>  1 file changed, 24 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
> index 4bdcaa9..6ce49b1 100644
> --- a/arch/arm/mach-imx/clk-imx51-imx53.c
> +++ b/arch/arm/mach-imx/clk-imx51-imx53.c
> @@ -258,18 +258,6 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
>  	clk_register_clkdev(clk[pwm2_ipg_gate], "pwm", "mxc_pwm.1");
>  	clk_register_clkdev(clk[i2c1_gate], NULL, "imx-i2c.0");
>  	clk_register_clkdev(clk[i2c2_gate], NULL, "imx-i2c.1");
> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.0");
> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.0");
> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.0");
> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.1");
> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.1");
> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.1");
> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2");
> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2");
> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2");
> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "fsl-usb2-udc");
> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "fsl-usb2-udc");
> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "fsl-usb2-udc");

Removing those will break some in-tree users, right?

>  	clk_register_clkdev(clk[nfc_gate], NULL, "mxc_nand");
>  	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");
>  	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
> @@ -351,6 +339,18 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
>  	clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx51-ipu");
>  	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx51-ipu");
>  	clk_register_clkdev(clk[ipu_gate], "hsp", "imx51-ipu");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80600.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80600.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80600.usb");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80400.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80400.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80400.usb");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80200.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80200.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80200.usb");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80000.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80000.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80000.usb");

I haven't seen new driver requesting these clocks, so would postpone
the changes until the driver actually requests them.

Regards,
Shawn

>  	clk_register_clkdev(clk[usb_phy_gate], "phy", "mxc-ehci.0");
>  	clk_register_clkdev(clk[esdhc1_ipg_gate], "ipg", "sdhci-esdhc-imx51.0");
>  	clk_register_clkdev(clk[dummy], "ahb", "sdhci-esdhc-imx51.0");
> @@ -439,6 +439,18 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
>  	clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx53-ipu");
>  	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx53-ipu");
>  	clk_register_clkdev(clk[ipu_gate], "hsp", "imx53-ipu");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80600.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80600.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80600.usb");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80400.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80400.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80400.usb");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80200.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80200.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80200.usb");
> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80000.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80000.usb");
> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80000.usb");
>  	clk_register_clkdev(clk[usb_phy1_gate], "usb_phy1", "mxc-ehci.0");
>  	clk_register_clkdev(clk[esdhc1_ipg_gate], "ipg", "sdhci-esdhc-imx53.0");
>  	clk_register_clkdev(clk[dummy], "ahb", "sdhci-esdhc-imx53.0");
> -- 
> 1.7.10.4
>

Marc Kleine-Budde Aug. 23, 2012, 2:41 p.m. UTC | #2

On 08/23/2012 04:18 PM, Shawn Guo wrote:
> On Thu, Aug 23, 2012 at 12:38:48PM +0200, Michael Grzeschik wrote:
>> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
>> ---
>>  arch/arm/mach-imx/clk-imx51-imx53.c |   36 +++++++++++++++++++++++------------
>>  1 file changed, 24 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
>> index 4bdcaa9..6ce49b1 100644
>> --- a/arch/arm/mach-imx/clk-imx51-imx53.c
>> +++ b/arch/arm/mach-imx/clk-imx51-imx53.c
>> @@ -258,18 +258,6 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
>>  	clk_register_clkdev(clk[pwm2_ipg_gate], "pwm", "mxc_pwm.1");
>>  	clk_register_clkdev(clk[i2c1_gate], NULL, "imx-i2c.0");
>>  	clk_register_clkdev(clk[i2c2_gate], NULL, "imx-i2c.1");
>> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.0");
>> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.0");
>> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.0");
>> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.1");
>> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.1");
>> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.1");
>> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2");
>> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2");
>> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2");
>> -	clk_register_clkdev(clk[usboh3_per_gate], "per", "fsl-usb2-udc");
>> -	clk_register_clkdev(clk[usboh3_gate], "ipg", "fsl-usb2-udc");
>> -	clk_register_clkdev(clk[usboh3_gate], "ahb", "fsl-usb2-udc");
> 
> Removing those will break some in-tree users, right?

Yes, there was a v2 fixing this.

>>  	clk_register_clkdev(clk[nfc_gate], NULL, "mxc_nand");
>>  	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");
>>  	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
>> @@ -351,6 +339,18 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
>>  	clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx51-ipu");
>>  	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx51-ipu");
>>  	clk_register_clkdev(clk[ipu_gate], "hsp", "imx51-ipu");
>> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80600.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80600.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80600.usb");
>> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80400.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80400.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80400.usb");
>> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80200.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80200.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80200.usb");
>> +	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80000.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80000.usb");
>> +	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80000.usb");
> 
> I haven't seen new driver requesting these clocks, so would postpone
> the changes until the driver actually requests them.

I'm going to post a driver ci13xxx_imx driver update in a few minutes.

Marc

diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 4bdcaa9..6ce49b1 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -258,18 +258,6 @@  static void __init mx5_clocks_common_init(unsigned long rate_ckil,
 	clk_register_clkdev(clk[pwm2_ipg_gate], "pwm", "mxc_pwm.1");
 	clk_register_clkdev(clk[i2c1_gate], NULL, "imx-i2c.0");
 	clk_register_clkdev(clk[i2c2_gate], NULL, "imx-i2c.1");
-	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.0");
-	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.0");
-	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.0");
-	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.1");
-	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.1");
-	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.1");
-	clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2");
-	clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2");
-	clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2");
-	clk_register_clkdev(clk[usboh3_per_gate], "per", "fsl-usb2-udc");
-	clk_register_clkdev(clk[usboh3_gate], "ipg", "fsl-usb2-udc");
-	clk_register_clkdev(clk[usboh3_gate], "ahb", "fsl-usb2-udc");
 	clk_register_clkdev(clk[nfc_gate], NULL, "mxc_nand");
 	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");
 	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
@@ -351,6 +339,18 @@  int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
 	clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx51-ipu");
 	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx51-ipu");
 	clk_register_clkdev(clk[ipu_gate], "hsp", "imx51-ipu");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80600.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80600.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80600.usb");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80400.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80400.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80400.usb");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80200.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80200.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80200.usb");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "73f80000.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "73f80000.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "73f80000.usb");
 	clk_register_clkdev(clk[usb_phy_gate], "phy", "mxc-ehci.0");
 	clk_register_clkdev(clk[esdhc1_ipg_gate], "ipg", "sdhci-esdhc-imx51.0");
 	clk_register_clkdev(clk[dummy], "ahb", "sdhci-esdhc-imx51.0");
@@ -439,6 +439,18 @@  int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
 	clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx53-ipu");
 	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx53-ipu");
 	clk_register_clkdev(clk[ipu_gate], "hsp", "imx53-ipu");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80600.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80600.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80600.usb");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80400.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80400.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80400.usb");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80200.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80200.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80200.usb");
+	clk_register_clkdev(clk[usboh3_per_gate], "per", "53f80000.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ipg", "53f80000.usb");
+	clk_register_clkdev(clk[usboh3_gate], "ahb", "53f80000.usb");
 	clk_register_clkdev(clk[usb_phy1_gate], "usb_phy1", "mxc-ehci.0");
 	clk_register_clkdev(clk[esdhc1_ipg_gate], "ipg", "sdhci-esdhc-imx53.0");
 	clk_register_clkdev(clk[dummy], "ahb", "sdhci-esdhc-imx53.0");

ARM: imx: add imx5x usb controller clock lookups

Commit Message

Comments

Patch