mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] at91: add spi clock connection id entries
@ 2011-09-15 16:57 Hubert Feurstein
  2011-09-15 16:57 ` [PATCH 2/3] at91: add missing clkdev changes Hubert Feurstein
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Hubert Feurstein @ 2011-09-15 16:57 UTC (permalink / raw)
  To: barebox

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
 arch/arm/mach-at91/at91sam9260.c |    7 +++++++
 arch/arm/mach-at91/at91sam9261.c |    7 +++++++
 arch/arm/mach-at91/at91sam9263.c |    2 ++
 arch/arm/mach-at91/at91sam9g45.c |    2 ++
 4 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index c1f08e7..3af5747 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -169,6 +169,11 @@ static struct clk *periph_clocks[] = {
 	// irq0 .. irq2
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
+};
+
 static struct clk_lookup usart_clocks_lookups[] = {
 	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
 	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
@@ -203,6 +208,8 @@ static void __init at91sam9260_register_clocks(void)
 	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
 		clk_register(periph_clocks[i]);
 
+	clkdev_add_table(periph_clocks_lookups,
+			 ARRAY_SIZE(periph_clocks_lookups));
 	clkdev_add_table(usart_clocks_lookups,
 			 ARRAY_SIZE(usart_clocks_lookups));
 
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index fbb8058..b1e09ef 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -133,6 +133,11 @@ static struct clk *periph_clocks[] = {
 	// irq0 .. irq2
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
+};
+
 static struct clk_lookup usart_clocks_lookups[] = {
 	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
 	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
@@ -190,6 +195,8 @@ static void at91sam9261_register_clocks(void)
 	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
 		clk_register(periph_clocks[i]);
 
+	clkdev_add_table(periph_clocks_lookups,
+			 ARRAY_SIZE(periph_clocks_lookups));
 	clkdev_add_table(usart_clocks_lookups,
 			 ARRAY_SIZE(usart_clocks_lookups));
 
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 12a7868..df2df7e 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -166,6 +166,8 @@ static struct clk *periph_clocks[] = {
 static struct clk_lookup periph_clocks_lookups[] = {
 	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci0", &mmc0_clk),
 	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci1", &mmc1_clk),
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index d4c27f8..9c478cd 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -191,6 +191,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
 	CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
 	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci0", &mmc0_clk),
 	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci1", &mmc1_clk),
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
+	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
-- 
1.7.4.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 2/3] at91: add missing clkdev changes
  2011-09-15 16:57 [PATCH 1/3] at91: add spi clock connection id entries Hubert Feurstein
@ 2011-09-15 16:57 ` Hubert Feurstein
  2011-09-15 16:57 ` [PATCH 3/3] at91sam9260ek: fix broken defconfig Hubert Feurstein
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Hubert Feurstein @ 2011-09-15 16:57 UTC (permalink / raw)
  To: barebox

This fixes the following compile errors
  arch/arm/mach-at91/at91sam9g45.c:185:3: error: 'ohci_clk' undeclared here (not in a function)
  arch/arm/mach-at91/at91sam9g45.c:186:3: error: 'tcb1_clk' undeclared here (not in a function)
  arch/arm/mach-at91/at91sam9g45_devices.c: In function 'at91_add_device_mci':
  arch/arm/mach-at91/at91sam9g45_devices.c:258:2: warning: implicit declaration of function 'at91_clock_associate'
    [...]
  arch/arm/mach-at91/built-in.o: In function `at91_add_device_mci':
  sam9_smc.c:(.text.at91_add_device_mci+0x1d0): undefined reference to `at91_clock_associate'

  arch/arm/mach-at91/at91sam9260_devices.c: In function 'at91_add_device_mci':
  arch/arm/mach-at91/at91sam9260_devices.c:251:2: warning: implicit declaration of function 'at91_clock_associate'

which were introduced in commit:
  "at91: swtich to clkdev" (ae19fe26cc230bc38238c2d66b8f464761286316)

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/mach-at91/at91sam9260_devices.c |    1 -
 arch/arm/mach-at91/at91sam9g45.c         |    3 ---
 arch/arm/mach-at91/at91sam9g45_devices.c |    7 +------
 3 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 4540f4b..44d3f1e 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -248,7 +248,6 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
 
 	dev = add_generic_device("atmel_mci", 0, NULL, AT91SAM9260_BASE_MCI, SZ_16K,
 			   IORESOURCE_MEM, data);
-	at91_clock_associate("mci_clk", dev, "mci_clk");
 }
 #else
 void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 9c478cd..6b9fbc5 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -181,9 +181,6 @@ static struct clk *periph_clocks[] __initdata = {
 	&isi_clk,
 	&udphs_clk,
 	&mmc1_clk,
-	// irq0
-	&ohci_clk,
-	&tcb1_clk,
 };
 
 static struct clk_lookup periph_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index f311b62..ac95260 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -188,8 +188,6 @@ void at91_register_uart(unsigned id, unsigned pins)
 void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
 {
 	resource_size_t start;
-	struct device_d *dev;
-	char* clk_name;
 
 	if (!data)
 		return;
@@ -209,7 +207,6 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
 
 	if (mmc_id == 0) {		/* MCI0 */
 		start = AT91SAM9G45_BASE_MCI0;
-		clk_name = "mci0_clk";
 		/* CLK */
 		at91_set_A_periph(AT91_PIN_PA0, 0);
 
@@ -231,7 +228,6 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
 		}
 	} else {			/* MCI1 */
 		start = AT91SAM9G45_BASE_MCI1;
-		clk_name = "mci1_clk";
 		/* CLK */
 		at91_set_A_periph(AT91_PIN_PA31, 0);
 
@@ -253,9 +249,8 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
 		}
 	}
 
-	dev = add_generic_device("atmel_mci", mmc_id, NULL, start, 4096,
+	add_generic_device("atmel_mci", mmc_id, NULL, start, 4096,
 			   IORESOURCE_MEM, data);
-	at91_clock_associate(clk_name, dev, "mci_clk");
 }
 #else
 void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
-- 
1.7.4.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 3/3] at91sam9260ek: fix broken defconfig
  2011-09-15 16:57 [PATCH 1/3] at91: add spi clock connection id entries Hubert Feurstein
  2011-09-15 16:57 ` [PATCH 2/3] at91: add missing clkdev changes Hubert Feurstein
@ 2011-09-15 16:57 ` Hubert Feurstein
  2011-09-20  7:18 ` [PATCH 1/3] at91: add spi clock connection id entries Sascha Hauer
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Hubert Feurstein @ 2011-09-15 16:57 UTC (permalink / raw)
  To: barebox

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
 arch/arm/configs/at91sam9260ek_defconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
index 6038aec..2d04206 100644
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -1,3 +1,4 @@
+CONFIG_ARCH_AT91SAM9260=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_LONGHELP=y
 CONFIG_GLOB=y
-- 
1.7.4.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] at91: add spi clock connection id entries
  2011-09-15 16:57 [PATCH 1/3] at91: add spi clock connection id entries Hubert Feurstein
  2011-09-15 16:57 ` [PATCH 2/3] at91: add missing clkdev changes Hubert Feurstein
  2011-09-15 16:57 ` [PATCH 3/3] at91sam9260ek: fix broken defconfig Hubert Feurstein
@ 2011-09-20  7:18 ` Sascha Hauer
  2011-09-20 13:27 ` Jean-Christophe PLAGNIOL-VILLARD
  2011-09-20 19:36 ` Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2011-09-20  7:18 UTC (permalink / raw)
  To: Hubert Feurstein; +Cc: barebox

Jean-Christophe,

Are you ok with these?

Sascha

On Thu, Sep 15, 2011 at 06:57:05PM +0200, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
>  arch/arm/mach-at91/at91sam9260.c |    7 +++++++
>  arch/arm/mach-at91/at91sam9261.c |    7 +++++++
>  arch/arm/mach-at91/at91sam9263.c |    2 ++
>  arch/arm/mach-at91/at91sam9g45.c |    2 ++
>  4 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index c1f08e7..3af5747 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -169,6 +169,11 @@ static struct clk *periph_clocks[] = {
>  	// irq0 .. irq2
>  };
>  
> +static struct clk_lookup periph_clocks_lookups[] = {
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
> +};
> +
>  static struct clk_lookup usart_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
> @@ -203,6 +208,8 @@ static void __init at91sam9260_register_clocks(void)
>  	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
>  		clk_register(periph_clocks[i]);
>  
> +	clkdev_add_table(periph_clocks_lookups,
> +			 ARRAY_SIZE(periph_clocks_lookups));
>  	clkdev_add_table(usart_clocks_lookups,
>  			 ARRAY_SIZE(usart_clocks_lookups));
>  
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index fbb8058..b1e09ef 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -133,6 +133,11 @@ static struct clk *periph_clocks[] = {
>  	// irq0 .. irq2
>  };
>  
> +static struct clk_lookup periph_clocks_lookups[] = {
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
> +};
> +
>  static struct clk_lookup usart_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
> @@ -190,6 +195,8 @@ static void at91sam9261_register_clocks(void)
>  	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
>  		clk_register(periph_clocks[i]);
>  
> +	clkdev_add_table(periph_clocks_lookups,
> +			 ARRAY_SIZE(periph_clocks_lookups));
>  	clkdev_add_table(usart_clocks_lookups,
>  			 ARRAY_SIZE(usart_clocks_lookups));
>  
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 12a7868..df2df7e 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -166,6 +166,8 @@ static struct clk *periph_clocks[] = {
>  static struct clk_lookup periph_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci0", &mmc0_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci1", &mmc1_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
>  };
>  
>  static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index d4c27f8..9c478cd 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -191,6 +191,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>  	CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci0", &mmc0_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci1", &mmc1_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
>  };
>  
>  static struct clk_lookup usart_clocks_lookups[] = {
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] at91: add spi clock connection id entries
  2011-09-15 16:57 [PATCH 1/3] at91: add spi clock connection id entries Hubert Feurstein
                   ` (2 preceding siblings ...)
  2011-09-20  7:18 ` [PATCH 1/3] at91: add spi clock connection id entries Sascha Hauer
@ 2011-09-20 13:27 ` Jean-Christophe PLAGNIOL-VILLARD
  2011-09-20 19:36 ` Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-09-20 13:27 UTC (permalink / raw)
  To: Hubert Feurstein; +Cc: barebox

Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Best Regards,
J.
On 18:57 Thu 15 Sep     , Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
>  arch/arm/mach-at91/at91sam9260.c |    7 +++++++
>  arch/arm/mach-at91/at91sam9261.c |    7 +++++++
>  arch/arm/mach-at91/at91sam9263.c |    2 ++
>  arch/arm/mach-at91/at91sam9g45.c |    2 ++
>  4 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index c1f08e7..3af5747 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -169,6 +169,11 @@ static struct clk *periph_clocks[] = {
>  	// irq0 .. irq2
>  };
>  
> +static struct clk_lookup periph_clocks_lookups[] = {
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
> +};
> +
>  static struct clk_lookup usart_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
> @@ -203,6 +208,8 @@ static void __init at91sam9260_register_clocks(void)
>  	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
>  		clk_register(periph_clocks[i]);
>  
> +	clkdev_add_table(periph_clocks_lookups,
> +			 ARRAY_SIZE(periph_clocks_lookups));
>  	clkdev_add_table(usart_clocks_lookups,
>  			 ARRAY_SIZE(usart_clocks_lookups));
>  
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index fbb8058..b1e09ef 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -133,6 +133,11 @@ static struct clk *periph_clocks[] = {
>  	// irq0 .. irq2
>  };
>  
> +static struct clk_lookup periph_clocks_lookups[] = {
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
> +};
> +
>  static struct clk_lookup usart_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
> @@ -190,6 +195,8 @@ static void at91sam9261_register_clocks(void)
>  	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
>  		clk_register(periph_clocks[i]);
>  
> +	clkdev_add_table(periph_clocks_lookups,
> +			 ARRAY_SIZE(periph_clocks_lookups));
>  	clkdev_add_table(usart_clocks_lookups,
>  			 ARRAY_SIZE(usart_clocks_lookups));
>  
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 12a7868..df2df7e 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -166,6 +166,8 @@ static struct clk *periph_clocks[] = {
>  static struct clk_lookup periph_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci0", &mmc0_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci1", &mmc1_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
>  };
>  
>  static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index d4c27f8..9c478cd 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -191,6 +191,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>  	CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci0", &mmc0_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci1", &mmc1_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
>  };
>  
>  static struct clk_lookup usart_clocks_lookups[] = {
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] at91: add spi clock connection id entries
  2011-09-15 16:57 [PATCH 1/3] at91: add spi clock connection id entries Hubert Feurstein
                   ` (3 preceding siblings ...)
  2011-09-20 13:27 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2011-09-20 19:36 ` Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2011-09-20 19:36 UTC (permalink / raw)
  To: Hubert Feurstein; +Cc: barebox

Applied this series to next.

Sascha

On Thu, Sep 15, 2011 at 06:57:05PM +0200, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
>  arch/arm/mach-at91/at91sam9260.c |    7 +++++++
>  arch/arm/mach-at91/at91sam9261.c |    7 +++++++
>  arch/arm/mach-at91/at91sam9263.c |    2 ++
>  arch/arm/mach-at91/at91sam9g45.c |    2 ++
>  4 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index c1f08e7..3af5747 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -169,6 +169,11 @@ static struct clk *periph_clocks[] = {
>  	// irq0 .. irq2
>  };
>  
> +static struct clk_lookup periph_clocks_lookups[] = {
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
> +};
> +
>  static struct clk_lookup usart_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
> @@ -203,6 +208,8 @@ static void __init at91sam9260_register_clocks(void)
>  	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
>  		clk_register(periph_clocks[i]);
>  
> +	clkdev_add_table(periph_clocks_lookups,
> +			 ARRAY_SIZE(periph_clocks_lookups));
>  	clkdev_add_table(usart_clocks_lookups,
>  			 ARRAY_SIZE(usart_clocks_lookups));
>  
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index fbb8058..b1e09ef 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -133,6 +133,11 @@ static struct clk *periph_clocks[] = {
>  	// irq0 .. irq2
>  };
>  
> +static struct clk_lookup periph_clocks_lookups[] = {
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
> +};
> +
>  static struct clk_lookup usart_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart0", &mck),
>  	CLKDEV_CON_DEV_ID("usart", "atmel_usart1", &usart0_clk),
> @@ -190,6 +195,8 @@ static void at91sam9261_register_clocks(void)
>  	for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
>  		clk_register(periph_clocks[i]);
>  
> +	clkdev_add_table(periph_clocks_lookups,
> +			 ARRAY_SIZE(periph_clocks_lookups));
>  	clkdev_add_table(usart_clocks_lookups,
>  			 ARRAY_SIZE(usart_clocks_lookups));
>  
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 12a7868..df2df7e 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -166,6 +166,8 @@ static struct clk *periph_clocks[] = {
>  static struct clk_lookup periph_clocks_lookups[] = {
>  	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci0", &mmc0_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci1", &mmc1_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
>  };
>  
>  static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index d4c27f8..9c478cd 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -191,6 +191,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>  	CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci0", &mmc0_clk),
>  	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci1", &mmc1_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi0", &spi0_clk),
> +	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi1", &spi1_clk),
>  };
>  
>  static struct clk_lookup usart_clocks_lookups[] = {
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-20 19:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-15 16:57 [PATCH 1/3] at91: add spi clock connection id entries Hubert Feurstein
2011-09-15 16:57 ` [PATCH 2/3] at91: add missing clkdev changes Hubert Feurstein
2011-09-15 16:57 ` [PATCH 3/3] at91sam9260ek: fix broken defconfig Hubert Feurstein
2011-09-20  7:18 ` [PATCH 1/3] at91: add spi clock connection id entries Sascha Hauer
2011-09-20 13:27 ` Jean-Christophe PLAGNIOL-VILLARD
2011-09-20 19:36 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox