From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 06:26:19 +0000 (+1000)
Subject: Merge remote-tracking branch 'renesas/next'
X-Git-Tag: next-20130619~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d3f1f7b77ff5c893fa5cdfba6719a28b4b132bc1;p=karo-tx-linux.git

Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/clock-r8a7778.c
	arch/arm/mach-shmobile/include/mach/r8a7778.h
	include/linux/serial_sci.h
	include/uapi/linux/serial_core.h
---

d3f1f7b77ff5c893fa5cdfba6719a28b4b132bc1
diff --cc include/linux/serial_sci.h
index 857eec4336e3,d34049712a4d..dca3c08d4141
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -18,8 -16,7 +18,9 @@@ enum 
  	SCBRR_ALGO_3,		/* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
  	SCBRR_ALGO_4,		/* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
  	SCBRR_ALGO_5,		/* (((clk * 1000 / 32) / bps) - 1) */
+ 	SCBRR_ALGO_6,		/* HSCIF variable sample rate algorithm */
 +
 +	SCBRR_NR_ALGOS,
  };
  
  #define SCSCR_TIE	(1 << 7)
diff --cc include/uapi/linux/serial_core.h
index c8eaeb5465ef,26eee07eeb24..9119cc0977bf
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -226,7 -226,7 +226,10 @@@
  /* Rocketport EXPRESS/INFINITY */
  #define PORT_RP2	102
  
 +/* Freescale lpuart */
 +#define PORT_LPUART	103
 +
+ /* SH-SCI */
 -#define PORT_HSCIF	103
++#define PORT_HSCIF	104
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */