2013.08.28. 1:27 keltezéssel, Greg Kroah-Hartman írta: > On Tue, Aug 27, 2013 at 10:14:25PM +0200, Gabor Juhos wrote: >> The AR933x UARTs are only used on the Atheros AR933x >> SoCs. The base clock frequency of the UART is passed >> to the driver via platform data. The SoC support code >> implements the generic clock API, and the clock rate >> can be retrieved via that. >> >> Update the code to get the clock rate via the generic >> clock API instead of using the platform data. >> >> Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx> >> --- >> Note: >> >> Because the driver specific platform data only contains >> the clock frequency it can be removed. In order to avoid >> merge conflicts between different trees, it will be removed >> by a later patch once this one is merged upstream. > > I don't understand what you mean by this. Currently the clock frequency is passed to the driver through platform data and the platform data is initialized via platform specific setup code in 'arch/mips/ath79/dev-common.c'. After this patch, the platform data is not used by the driver, so the initialization will be superfluous and it can be removed along with the 'arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h' header file. However those changes would cause merge conflicts with my other patches which are going through the MIPS tree so I kept out that part from the patch. > Also, this patch doesn't even apply to my tty-next tree, so I can't > accept it as-is, so please fix it up, Sorry, it was based on 3.11-rc7. Will rebase it against the tty-next tree. > work with the people whose patches yours is conflicting with, and figure out > how to do this with the least amount of merge issues. Ok. Thanks, Gabor -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html