Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c

2 files changed, 0 insertions, 62 deletions

diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h
deleted file mode 100644
index 36d3551173b2..000000000000
--- a/arch/arm/plat-s5p/include/plat/map-s5p.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* linux/arch/arm/plat-s5p/include/plat/map-s5p.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_PLAT_MAP_S5P_H
-#define __ASM_PLAT_MAP_S5P_H __FILE__
-
-#define S5P_VA_CHIPID           S3C_ADDR(0x02000000)
-#define S5P_VA_CMU              S3C_ADDR(0x02100000)
-#define S5P_VA_PMU              S3C_ADDR(0x02180000)
-#define S5P_VA_GPIO             S3C_ADDR(0x02200000)
-#define S5P_VA_GPIO1            S5P_VA_GPIO
-#define S5P_VA_GPIO2            S3C_ADDR(0x02240000)
-#define S5P_VA_GPIO3            S3C_ADDR(0x02280000)
-
-#define S5P_VA_SYSRAM           S3C_ADDR(0x02400000)
-#define S5P_VA_DMC0             S3C_ADDR(0x02440000)
-#define S5P_VA_DMC1             S3C_ADDR(0x02480000)
-#define S5P_VA_SROMC            S3C_ADDR(0x024C0000)
-
-#define S5P_VA_SYSTIMER         S3C_ADDR(0x02500000)
-#define S5P_VA_L2CC             S3C_ADDR(0x02600000)
-
-#define S5P_VA_COMBINER_BASE    S3C_ADDR(0x02700000)
-#define S5P_VA_COMBINER(x)      (S5P_VA_COMBINER_BASE + ((x) >> 2) * 0x10)
-
-#define S5P_VA_COREPERI_BASE    S3C_ADDR(0x02800000)
-#define S5P_VA_COREPERI(x)      (S5P_VA_COREPERI_BASE + (x))
-#define S5P_VA_SCU              S5P_VA_COREPERI(0x0)
-#define S5P_VA_TWD              S5P_VA_COREPERI(0x600)
-
-#define S5P_VA_GIC_CPU          S3C_ADDR(0x02810000)
-#define S5P_VA_GIC_DIST         S3C_ADDR(0x02820000)
-
-#define S3C_VA_USB_HSPHY        S3C_ADDR(0x02900000)
-
-#define VA_VIC(x)               (S3C_VA_IRQ + ((x) * 0x10000))
-#define VA_VIC0                 VA_VIC(0)
-#define VA_VIC1                 VA_VIC(1)
-#define VA_VIC2                 VA_VIC(2)
-#define VA_VIC3                 VA_VIC(3)
-
-#define S5P_VA_UART(x)          (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
-#define S5P_VA_UART0            S5P_VA_UART(0)
-#define S5P_VA_UART1            S5P_VA_UART(1)
-#define S5P_VA_UART2            S5P_VA_UART(2)
-#define S5P_VA_UART3            S5P_VA_UART(3)
-
-#ifndef S3C_UART_OFFSET
-#define S3C_UART_OFFSET         (0x400)
-#endif
-
-#endif /* __ASM_PLAT_MAP_S5P_H */
diff --git a/arch/arm/plat-s5p/include/plat/pll.h b/arch/arm/plat-s5p/include/plat/pll.h
index bf28fadee7ae..ebc142c5c84c 100644
--- a/arch/arm/plat-s5p/include/plat/pll.h
+++ b/arch/arm/plat-s5p/include/plat/pll.h
@@ -72,7 +72,6 @@ static inline unsigned long s5p_get_pll46xx(unsigned long baseclk,
         mdiv = (pll_con0 >> PLL46XX_MDIV_SHIFT) & PLL46XX_MDIV_MASK;
         pdiv = (pll_con0 >> PLL46XX_PDIV_SHIFT) & PLL46XX_PDIV_MASK;
         sdiv = (pll_con0 >> PLL46XX_SDIV_SHIFT) & PLL46XX_SDIV_MASK;
-        kdiv = pll_con1 & PLL46XX_KDIV_MASK;
 
         if (pll_type == pll_4650c)
                 kdiv = pll_con1 & PLL4650C_KDIV_MASK;