]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:01:21 +0000 (16:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:01:21 +0000 (16:01 +1000)
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

79 files changed:
1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/bcm11351.dtsi
arch/arm/boot/dts/imx28.dtsi
arch/arm/boot/dts/omap3-devkit8000.dts
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/include/asm/cp15.h
arch/arm/mach-exynos/Kconfig
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mm-imx3.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-msm/io.c
arch/arm/mach-mxs/Kconfig
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/omap_device.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-shmobile/clock-r8a7779.c
arch/arm/mach-spear/spear6xx.c
arch/arm/mach-u300/timer.c
arch/arm/mm/mmu.c
arch/arm/plat-samsung/include/plat/cpu-freq-core.h
drivers/clk/samsung/clk-exynos5250.c
drivers/clocksource/Kconfig
drivers/clocksource/clksrc-dbx500-prcmu.c
drivers/clocksource/dw_apb_timer_of.c
drivers/clocksource/nomadik-mtu.c
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Makefile
drivers/cpufreq/s3c24xx-cpufreq.c
drivers/cpuidle/Kconfig
drivers/crypto/ux500/cryp/cryp_core.c
drivers/dma/Kconfig
drivers/gpio/Kconfig
drivers/gpio/gpio-rcar.c
drivers/i2c/busses/Kconfig
drivers/media/platform/Kconfig
drivers/media/platform/exynos4-is/Kconfig
drivers/mmc/host/davinci_mmc.c
drivers/mtd/nand/Kconfig
drivers/pci/Kconfig
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/pinctrl/pinctrl-coh901.c
drivers/pinctrl/pinctrl-exynos.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/pinctrl-samsung.c
drivers/pinctrl/pinctrl-u300.c
drivers/pinctrl/sh-pfc/core.c
drivers/regulator/ab8500.c
drivers/spi/Kconfig
drivers/thermal/exynos_thermal.c
drivers/tty/serial/Kconfig
drivers/tty/serial/samsung.c
drivers/tty/serial/sh-sci.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/gadget/Kconfig
drivers/usb/host/Kconfig
drivers/usb/host/ehci-platform.c
drivers/usb/musb/ux500.c
drivers/usb/musb/ux500_dma.c
drivers/usb/phy/Kconfig
drivers/watchdog/s3c2410_wdt.c
include/linux/dw_apb_timer.h
include/linux/mfd/davinci_voicecodec.h
include/linux/serial_sci.h
include/uapi/linux/serial_core.h
sound/soc/ux500/ux500_pcm.c

index bebbdf8f0640c20f8af529b9ca0e6a75b7760d9a,db0457d616822429faaefbda7773b13919495751..d5a79caec147d36f993c769ddab2a6c15fb0686a
@@@ -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 MAINTAINERS
Simple merge
Simple merge
index f2623b25ff9a17488e90ba06edf697b53192b243,8dc39fd8ead0289340517fe4bf76943f37bb3859..6760918b5a349db41d41df98ba6473b310882aca
@@@ -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"
index 4b5a8e065dcb60c577bcb138de40ab8141558f1c,04feaf8f142088b9d632bda910627afb86de5949..444b4ede0d6056c878fd992e80d98416b7c94906
  
  &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>;
+ };
index 3ad587b13b408844232db1dff092d0061f6b9eff,a16bb9691cc6832b84e48564781234b17a13f6e5..3aee1a43782db9068ac1d82cdd39216de5535a74
        };
  };
  
+ &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 {
index 4297899a24708a30e13e7cf5e24b99a591fb0eeb,9e00eef9b74b3827faede6e2530c893fac28e4c4..4028ae2f56dc5d7546ffc8ba89519285b7454fab
        };
  };
  
 +&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>;
+ };
index 37ef320badc14b893c41814783622e667f5ad737,0d4df90477f7334f8ec4e25028bb6d4698d6d0e8..02cc0b80d27ceb70c7d9bfd6625946d604aa36ba
                        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";
Simple merge
Simple merge
index 983da33bebaaa0d2914629a01ef03922263de439,82e03d22f9139e9768cab8b8540aaa58145a8926..a726def27fe30c5ca70f02fd7d86c8ec78adfb7b
                                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 {
Simple merge
Simple merge
index 756970f6bd105b3a206a38c89548c1fe9a6815a0,2d503b3684c4a08048795cbd91788824147f6987..f5f65b58181ecd6dd860026b244dff585858cc5a
@@@ -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
Simple merge
Simple merge
index aa4346227c416df8cd9a7d4a3f9df09e6b80a03e,a5b15c4e8def4ec0d833f5224215b8f0ff688d0a..d9e95e612fcbfaecf9855d4a39f5017d236edb6f
@@@ -41,8 -41,6 +41,7 @@@
  #include <linux/stat.h>
  #include <linux/sys_soc.h>
  #include <linux/termios.h>
- #include <video/vga.h>
 +#include <linux/sched_clock.h>
  
  #include <mach/hardware.h>
  #include <mach/platform.h>
Simple merge
index ce6e7d606a7ce9cc1867e0e83263e93610e8445d,616fe0210da1e16b173ca4f79db30c8ce4c70c37..8cde9e05b5d65c17194cb8acee8c19a52d5aa025
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
index ae93f94d15bd65a6c9de847bb95e6d5d2dc0fab1,7fd32d604e342b5ccb6b1e119fb1e4ae1e72a59e..de10fd78bf2b839671ed39331173abf6c6db1d2c
@@@ -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]),
index 9614b07254b2cc1c2d8f90db3c63273749162f03,53798e5037d7a98b24f9a375db35a653d0c5291a..a0e9eb72e46d829f518503e65276e3e4eeb24380
@@@ -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-eth", &mstp_clks[MSTP114]), /* Ether */
+       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("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 */
index 2f7e5245a690f4aebff237cf572a29e7d16b82df,9daeb8c374833b239c8d7bfc95f322c6253369aa..10340f5becbb32400d6f481c8484be3fba54e891
@@@ -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 */
Simple merge
index af771b76fe1caf266ee8a0eb5e10bc5e77891936,390ae5feb1d00f802e117618d75cfae080f74232..bccbd438b23b737c5b72382dc8647a75302ab0ca
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/irq.h>
- #include <mach/hardware.h>
- #include <mach/irqs.h>
 +#include <linux/sched_clock.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>
  
Simple merge
Simple merge
Simple merge
index d9a1e8d5175196d33879c0fff3ca43998f7703b3,cef554432a339822ad6fcf7f280fadb3f060432c..91fb642f3ba02a94b20de605998767ef81917b56
  #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)
  {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 6c9174530422953a2b1294ab0c1cf55d3e128882,a4a3028103e3441c533517da3cdc9ac62ad6eed9..7e4150aa69c65b34c44e526c5633bf456f1abe2f
@@@ -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;
  }
  
Simple merge
Simple merge
Simple merge
index 028ff4d07dc74a3346df56c6a677e4e8d95bbf9e,f0beee7b868e817a7c6d4ca325f8f42917992782..fce71b605936ed228bc104efd2d5d60c0959af2f
@@@ -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;
Simple merge
Simple merge
Simple merge
index b1cd9597c241320a6006f8c771e0a468dde6c52d,07261d52a6dfabee77c5ffbc34953a6faec1fdce..1f79b20918b1eed2b9b1598cf8a6ccf545b23952
@@@ -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__ */
index 810aee7e53eb3f2691e70c4cc94b66ccea5c4e20,7dd6524d2aac9becefa0103c69b60bb241a94bdf..13a1ee95a2334bdda6fed40c3e8dbf36a9784012
  #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.
   */
index 857eec4336e39ea564516aba7bb66b0f459a63db,d34049712a4d7cee24958816840ca1c843e0541f..dca3c08d414112cfb56dbe011db8263c6b81343f
@@@ -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)
index c8eaeb5465ef76e4ec8992f45e6523a72ebc258c,26eee07eeb246ce06eac5c37ced79c3e8765862b..9119cc0977bf42a36f2ae8aa51123c99b0b5f9d7
  /* Rocketport EXPRESS/INFINITY */
  #define PORT_RP2      102
  
 -#define PORT_HSCIF    103
 +/* Freescale lpuart */
 +#define PORT_LPUART   103
 +
+ /* SH-SCI */
++#define PORT_HSCIF    104
  #endif /* _UAPILINUX_SERIAL_CORE_H */
Simple merge