Re: [PATCH v3] pch_uart: reference clock on CM-iTC

[Greg KH <greg@kroah.com>]

On Thu, Mar 10, 2011 at 03:14:00PM +0200, Denis Turischev wrote:
> Default clock source for UARTs on Topcliff is external UART_CLK.
> On CM-iTC USB_48MHz is used instead. After VCO2PLL and DIV
> manipulations UARTs will receive 192 MHz.
> Clock manipulations on Topcliff are controlled in pch_phub.c
> 
> v2: redone against the linux-next tree
> v3: redone against linux/kernel/git/next/linux-next.git snapshot
> 
> Signed-off-by: Denis Turischev <denis@compulab.co.il>
> ---
> diff -Nru linux-next-20110310.orig/drivers/misc/pch_phub.c linux-next-20110310/drivers/misc/pch_phub.c
> --- linux-next-20110310.orig/drivers/misc/pch_phub.c	2011-03-10 08:31:30.000000000 +0200
> +++ linux-next-20110310/drivers/misc/pch_phub.c	2011-03-10 14:42:05.110978473 +0200
> @@ -618,6 +626,14 @@
>  					       CLKCFG_CAN_50MHZ,
>  					       CLKCFG_CANCLK_MASK);
> 
> +		/* quirk for CM-iTC board */
> +		if (strstr(dmi_get_system_info(DMI_BOARD_NAME), "CM-iTC"))
> +			pch_phub_read_modify_write_reg(chip,
> +						(unsigned int)CLKCFG_REG_OFFSET,
> +						CLKCFG_UART_48MHZ | CLKCFG_BAUDDIV |
> +						CLKCFG_PLL2VCO | CLKCFG_UARTCLKSEL,
> +						CLKCFG_UART_MASK);
> +

This is the chunk that is causing problems.  I guess someone else
modified this file in the linux-next tree, and I can't apply it in mine.
Any ideas who did this change?  Can you look at the linux-next tree and
see what caused this merge issue?

thanks,

greg k-h