From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 06:01:21 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20130628~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5231e7c235a64f01facac5763d9da14f28f1042b;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/boot/dts/am335x-evmsk.dts
	arch/arm/boot/dts/am33xx.dtsi
	arch/arm/boot/dts/sun4i-a10.dtsi
	arch/arm/mach-exynos/mach-universal_c210.c
	arch/arm/mach-integrator/integrator_ap.c
	arch/arm/mach-mxs/Kconfig
	arch/arm/mach-shmobile/clock-r8a7740.c
	arch/arm/mach-shmobile/clock-r8a7778.c
	arch/arm/mach-u300/timer.c
	drivers/clocksource/dw_apb_timer_of.c
	drivers/tty/serial/xilinx_uartps.c
	drivers/usb/Kconfig
	drivers/usb/phy/phy-rcar-usb.c
	include/linux/mfd/davinci_voicecodec.h
	include/linux/serial_sci.h
	include/uapi/linux/serial_core.h
---

5231e7c235a64f01facac5763d9da14f28f1042b
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index bebbdf8f0640,db0457d61682..d5a79caec147
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -58,9 -58,9 +59,10 @@@ snps 	Synopsys, Inc
  st	STMicroelectronics
  ste	ST-Ericsson
  stericsson	ST-Ericsson
 +toumaz	Toumaz
  ti	Texas Instruments
  toshiba	Toshiba Corporation
+ v3	V3 Semiconductor
  via	VIA Technologies, Inc.
  wlf	Wolfson Microelectronics
  wm	Wondermedia Technologies, Inc.
diff --cc arch/arm/Kconfig.debug
index f2623b25ff9a,8dc39fd8ead0..6760918b5a34
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -646,14 -780,16 +787,17 @@@ config DEBUG_LL_INCLUD
  	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
  	default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
  				 DEBUG_MMP_UART3
+ 	default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
  	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
+ 	default "debug/sti.S" if DEBUG_STI_UART
  	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
  	default "debug/tegra.S" if DEBUG_TEGRA_UART
+ 	default "debug/u300.S" if DEBUG_U300_UART
  	default "debug/ux500.S" if DEBUG_UX500_UART
  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 -		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 +		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \
 +		DEBUG_VEXPRESS_UART0_CRX
  	default "debug/vt8500.S" if DEBUG_VT8500_UART0
  	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
  	default "mach/debug-macro.S"
diff --cc arch/arm/boot/dts/am335x-bone.dts
index 4b5a8e065dcb,04feaf8f1420..444b4ede0d60
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@@ -136,5 -218,17 +219,18 @@@
  
  &cpsw_emac1 {
  	phy_id = <&davinci_mdio>, <1>;
 +	phy-mode = "mii";
  };
+ 
+ &mac {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&cpsw_default>;
+ 	pinctrl-1 = <&cpsw_sleep>;
+ 
+ };
+ 
+ &davinci_mdio {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&davinci_mdio_default>;
+ 	pinctrl-1 = <&davinci_mdio_sleep>;
+ };
diff --cc arch/arm/boot/dts/am335x-evm.dts
index 3ad587b13b40,a16bb9691cc6..3aee1a43782d
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@@ -237,9 -453,20 +453,21 @@@
  	};
  };
  
+ &mac {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&cpsw_default>;
+ 	pinctrl-1 = <&cpsw_sleep>;
+ };
+ 
+ &davinci_mdio {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&davinci_mdio_default>;
+ 	pinctrl-1 = <&davinci_mdio_sleep>;
+ };
+ 
  &cpsw_emac0 {
  	phy_id = <&davinci_mdio>, <0>;
 +	phy-mode = "rgmii-txid";
  };
  
  &cpsw_emac1 {
diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index 4297899a2470,9e00eef9b74b..4028ae2f56dc
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -249,12 -381,14 +381,24 @@@
  	};
  };
  
 +&cpsw_emac0 {
 +	phy_id = <&davinci_mdio>, <0>;
 +	phy-mode = "rgmii-txid";
 +};
 +
 +&cpsw_emac1 {
 +	phy_id = <&davinci_mdio>, <1>;
 +	phy-mode = "rgmii-txid";
 +};
++
+ &mac {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&cpsw_default>;
+ 	pinctrl-1 = <&cpsw_sleep>;
+ };
+ 
+ &davinci_mdio {
+ 	pinctrl-names = "default", "sleep";
+ 	pinctrl-0 = <&davinci_mdio_default>;
+ 	pinctrl-1 = <&davinci_mdio_sleep>;
+ };
diff --cc arch/arm/boot/dts/am33xx.dtsi
index 37ef320badc1,0d4df90477f7..02cc0b80d27c
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc@44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm@48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc@50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";
diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
index 983da33bebaa,82e03d22f913..a726def27fe3
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@@ -214,18 -204,28 +220,39 @@@
  				allwinner,function = "uart1";
  				allwinner,drive = <0>;
  				allwinner,pull = <0>;
 +			};
 +
 +			emac_pins_a: emac0@0 {
 +				allwinner,pins = "PA0", "PA1", "PA2",
 +						"PA3", "PA4", "PA5", "PA6",
 +						"PA7", "PA8", "PA9", "PA10",
 +						"PA11", "PA12", "PA13", "PA14",
 +						"PA15", "PA16";
 +				allwinner,function = "emac";
 +				allwinner,drive = <0>;
 +				allwinner,pull = <0>;
  			};
+ 
+ 			i2c0_pins_a: i2c0@0 {
+ 				allwinner,pins = "PB0", "PB1";
+ 				allwinner,function = "i2c0";
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
+ 
+ 			i2c1_pins_a: i2c1@0 {
+ 				allwinner,pins = "PB18", "PB19";
+ 				allwinner,function = "i2c1";
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
+ 
+ 			i2c2_pins_a: i2c2@0 {
+ 				allwinner,pins = "PB20", "PB21";
+ 				allwinner,function = "i2c2";
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
  		};
  
  		timer@01c20c00 {
diff --cc arch/arm/mach-exynos/Kconfig
index 756970f6bd10,2d503b3684c4..f5f65b58181e
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -76,9 -93,10 +93,10 @@@ config SOC_EXYNOS544
  	default y
  	depends on ARCH_EXYNOS5
  	select ARCH_HAS_OPP
 -	select ARM_ARCH_TIMER
 +	select HAVE_ARM_ARCH_TIMER
  	select AUTO_ZRELADDR
- 	select PINCTRL
+ 	select MIGHT_HAVE_PCI
+ 	select PCI_DOMAINS if PCI
  	select PINCTRL_EXYNOS5440
  	select PM_OPP
  	help
diff --cc arch/arm/mach-integrator/integrator_ap.c
index aa4346227c41,a5b15c4e8def..d9e95e612fcb
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -41,8 -41,6 +41,7 @@@
  #include <linux/stat.h>
  #include <linux/sys_soc.h>
  #include <linux/termios.h>
 +#include <linux/sched_clock.h>
- #include <video/vga.h>
  
  #include <mach/hardware.h>
  #include <mach/platform.h>
diff --cc arch/arm/mach-mxs/Kconfig
index ce6e7d606a7c,616fe0210da1..8cde9e05b5d6
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@@ -11,7 -10,7 +10,6 @@@ config SOC_IMX2
  	select ARM_AMBA
  	select ARM_CPU_SUSPEND if PM
  	select CPU_ARM926T
- 	select HAVE_PWM
 -	select HAVE_CAN_FLEXCAN if CAN
  	select PINCTRL_IMX28
  
  config ARCH_MXS
diff --cc arch/arm/mach-shmobile/clock-r8a7740.c
index ae93f94d15bd,7fd32d604e34..de10fd78bf2b
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@@ -591,7 -594,9 +594,9 @@@ static struct clk_lookup lookups[] = 
  	CLKDEV_DEV_ID("e6860000.sdhi",          &mstp_clks[MSTP313]),
  	CLKDEV_DEV_ID("sh_mmcif",		&mstp_clks[MSTP312]),
  	CLKDEV_DEV_ID("e6bd0000.mmcif",         &mstp_clks[MSTP312]),
 -	CLKDEV_DEV_ID("sh-eth",			&mstp_clks[MSTP309]),
 +	CLKDEV_DEV_ID("r8a7740-gether",		&mstp_clks[MSTP309]),
+ 	CLKDEV_DEV_ID("e9a00000.sh-eth",	&mstp_clks[MSTP309]),
+ 	CLKDEV_DEV_ID("renesas_tpu_pwm",	&mstp_clks[MSTP304]),
  
  	CLKDEV_DEV_ID("sh_mobile_sdhi.2",	&mstp_clks[MSTP415]),
  	CLKDEV_DEV_ID("e6870000.sdhi",          &mstp_clks[MSTP415]),
diff --cc arch/arm/mach-shmobile/clock-r8a7778.c
index 9614b07254b2,53798e5037d7..a0e9eb72e46d
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@@ -76,8 -136,22 +136,22 @@@ static struct clk mstp_clks[MSTP_NR] = 
  };
  
  static struct clk_lookup lookups[] = {
+ 	/* main */
+ 	CLKDEV_CON_ID("shyway_clk",	&s_clk),
+ 	CLKDEV_CON_ID("peripheral_clk",	&p_clk),
+ 
  	/* MSTP32 clocks */
+ 	CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP331]), /* MMC */
+ 	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
+ 	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
+ 	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */
 -	CLKDEV_DEV_ID("sh-eth",	&mstp_clks[MSTP114]), /* Ether */
 +	CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */
+ 	CLKDEV_DEV_ID("ehci-platform", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
+ 	CLKDEV_DEV_ID("ohci-platform", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */
+ 	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
+ 	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */
+ 	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */
+ 	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
  	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
  	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
  	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
diff --cc arch/arm/mach-shmobile/clock-r8a7779.c
index 2f7e5245a690,9daeb8c37483..10340f5becbb
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@@ -161,9 -162,10 +162,10 @@@ static struct clk_lookup lookups[] = 
  	CLKDEV_CON_ID("peripheral_clk",	&clkp_clk),
  
  	/* MSTP32 clocks */
+ 	CLKDEV_DEV_ID("rcar-pcie", &mstp_clks[MSTP116]), /* PCIe */
  	CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */
  	CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */
 -	CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */
 +	CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */
  	CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
  	CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */
  	CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
diff --cc arch/arm/mach-u300/timer.c
index af771b76fe1c,390ae5feb1d0..bccbd438b23b
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@@ -18,12 -18,12 +18,12 @@@
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/irq.h>
 +#include <linux/sched_clock.h>
- 
- #include <mach/hardware.h>
- #include <mach/irqs.h>
+ #include <linux/delay.h>
+ #include <linux/of_address.h>
+ #include <linux/of_irq.h>
  
  /* Generic stuff */
 -#include <asm/sched_clock.h>
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
  
diff --cc drivers/clocksource/dw_apb_timer_of.c
index d9a1e8d51751,cef554432a33..91fb642f3ba0
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@@ -20,8 -20,11 +20,9 @@@
  #include <linux/of.h>
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
 +#include <linux/sched_clock.h>
+ #include <linux/clk.h>
  
 -#include <asm/mach/time.h>
 -#include <asm/sched_clock.h>
 -
  static void timer_get_base_and_rate(struct device_node *np,
  				    void __iomem **base, u32 *rate)
  {
diff --cc drivers/tty/serial/xilinx_uartps.c
index 6c9174530422,a4a3028103e3..7e4150aa69c6
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@@ -972,14 -1004,15 +1004,14 @@@ static int xuartps_probe(struct platfor
  		port->mapbase = res->start;
  		port->irq = res2->start;
  		port->dev = &pdev->dev;
- 		port->uartclk = clk_get_rate(clk);
- 		port->private_data = clk;
+ 		port->uartclk = clk_get_rate(xuartps_data->refclk);
+ 		port->private_data = xuartps_data;
 -		dev_set_drvdata(&pdev->dev, port);
 +		platform_set_drvdata(pdev, port);
  		rc = uart_add_one_port(&xuartps_uart_driver, port);
  		if (rc) {
  			dev_err(&pdev->dev,
  				"uart_add_one_port() failed; err=%i\n", rc);
- 			return rc;
 -			dev_set_drvdata(&pdev->dev, NULL);
+ 			goto err_out_clk_disable;
  		}
  		return 0;
  	}
@@@ -993,14 -1039,19 +1038,18 @@@ err_out_free
   **/
  static int xuartps_remove(struct platform_device *pdev)
  {
 -	struct uart_port *port = dev_get_drvdata(&pdev->dev);
 +	struct uart_port *port = platform_get_drvdata(pdev);
- 	struct clk *clk = port->private_data;
+ 	struct xuartps *xuartps_data = port->private_data;
  	int rc;
  
  	/* Remove the xuartps port from the serial core */
  	rc = uart_remove_one_port(&xuartps_uart_driver, port);
 -	dev_set_drvdata(&pdev->dev, NULL);
  	port->mapbase = 0;
- 	clk_disable_unprepare(clk);
+ 	clk_disable_unprepare(xuartps_data->refclk);
+ 	clk_disable_unprepare(xuartps_data->aperclk);
+ 	clk_put(xuartps_data->refclk);
+ 	clk_put(xuartps_data->aperclk);
+ 	kfree(xuartps_data);
  	return rc;
  }
  
diff --cc drivers/usb/musb/ux500.c
index 028ff4d07dc7,f0beee7b868e..fce71b605936
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@@ -187,10 -195,39 +195,40 @@@ static const struct musb_platform_ops u
  	.set_vbus	= ux500_musb_set_vbus,
  };
  
+ static struct musb_hdrc_platform_data *
+ ux500_of_probe(struct platform_device *pdev, struct device_node *np)
+ {
+ 	struct musb_hdrc_platform_data *pdata;
+ 	const char *mode;
+ 	int strlen;
+ 
+ 	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+ 	if (!pdata)
+ 		return NULL;
+ 
+ 	mode = of_get_property(np, "dr_mode", &strlen);
+ 	if (!mode) {
+ 		dev_err(&pdev->dev, "No 'dr_mode' property found\n");
+ 		return NULL;
+ 	}
+ 
+ 	if (strlen > 0) {
+ 		if (!strcmp(mode, "host"))
+ 			pdata->mode = MUSB_HOST;
+ 		if (!strcmp(mode, "otg"))
+ 			pdata->mode = MUSB_OTG;
+ 		if (!strcmp(mode, "peripheral"))
+ 			pdata->mode = MUSB_PERIPHERAL;
+ 	}
+ 
+ 	return pdata;
+ }
+ 
  static int ux500_probe(struct platform_device *pdev)
  {
 +	struct resource musb_resources[2];
  	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct device_node		*np = pdev->dev.of_node;
  	struct platform_device		*musb;
  	struct ux500_glue		*glue;
  	struct clk			*clk;
diff --cc include/linux/dw_apb_timer.h
index b1cd9597c241,07261d52a6df..1f79b20918b1
--- a/include/linux/dw_apb_timer.h
+++ b/include/linux/dw_apb_timer.h
@@@ -51,6 -51,6 +51,5 @@@ dw_apb_clocksource_init(unsigned rating
  void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs);
  void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs);
  cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs);
 -void dw_apb_clocksource_unregister(struct dw_apb_clocksource *dw_cs);
  
- extern void dw_apb_timer_init(void);
  #endif /* __DW_APB_TIMER_H__ */
diff --cc include/linux/mfd/davinci_voicecodec.h
index 810aee7e53eb,7dd6524d2aac..13a1ee95a233
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@@ -26,10 -26,8 +26,10 @@@
  #include <linux/kernel.h>
  #include <linux/platform_device.h>
  #include <linux/mfd/core.h>
+ #include <linux/platform_data/edma.h>
  
- #include <mach/edma.h>
 +#include <mach/hardware.h>
 +
  /*
   * Register values.
   */
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 */