[PATCH 2/2] stm8815: fix the uart device clock match

[Marc Kleine-Budde]

Jean-Christophe PLAGNIOL-VILLARD wrote:
> that use the device name + id to found it's clock
> to use the right match as we fix the dev_name macro
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
>  arch/arm/mach-nomadik/8815.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
> index 8598f14..f1d5e8c 100644
> --- a/arch/arm/mach-nomadik/8815.c
> +++ b/arch/arm/mach-nomadik/8815.c
> @@ -50,12 +50,14 @@ void st8815_add_device_sdram(u32 size)
>  }
>  
>  static struct device_d uart0_serial_device = {
> +	id = 0,
        ^

you missed a dot, here.
>  	.name = "uart-pl011",
>  	.map_base = NOMADIK_UART0_BASE,
>  	.size = 4096,
>  };
>  
>  static struct device_d uart1_serial_device = {
> +	id = 1,
dito
>  	.name = "uart-pl011",
>  	.map_base = NOMADIK_UART1_BASE,
>  	.size = 4096,
> @@ -65,12 +67,12 @@ void st8815_register_uart(unsigned id)
>  {
>  	switch (id) {
>  	case 0:
> -		nmdk_clk_create(&st8815_clk_48, uart0_serial_device.name);
>  		register_device(&uart0_serial_device);
> +		nmdk_clk_create(&st8815_clk_48, dev_name(uart0_serial_device));
>  		break;
>  	case 1:
> -		nmdk_clk_create(&st8815_clk_48, uart1_serial_device.name);
>  		register_device(&uart1_serial_device);
> +		nmdk_clk_create(&st8815_clk_48, dev_name(uart0_serial_device));
>  		break;
>  	}
>  }

cheers, Marc


-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/barebox/attachments/20100830/4fff0d91/attachment.sig>