7 files changed, 34 insertions, 20 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 34e1569a11ee..688dc7b0d951 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -611,6 +611,7 @@ config ARCH_PXA
         select AUTO_ZRELADDR
         select COMMON_CLK
         select CLKDEV_LOOKUP
+        select CLKSRC_PXA
         select CLKSRC_MMIO
         select CLKSRC_OF
         select GENERIC_CLOCKEVENTS
@@ -650,6 +651,8 @@ config ARCH_SA1100
         select ARCH_SPARSEMEM_ENABLE
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select CLKSRC_PXA
+        select CLKSRC_OF if OF
         select CPU_FREQ
         select CPU_SA1100
         select GENERIC_CLOCKEVENTS
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 3a10f1a8317a..ff105399aae4 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -27,6 +27,7 @@ menuconfig ARCH_EXYNOS
         select SRAM
         select THERMAL
         select MFD_SYSCON
+        select CLKSRC_EXYNOS_MCT
         help
           Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
 
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 125865daaf17..12dd1dc0a041 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -3,6 +3,7 @@ menuconfig ARCH_STI
         select ARM_GIC
         select ST_IRQCHIP
         select ARM_GLOBAL_TIMER
+        select CLKSRC_ST_LPC
         select PINCTRL
         select PINCTRL_ST
         select MFD_SYSCON
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index c9ac19b24e5a..5eacdd61e61c 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -32,6 +32,7 @@ config UX500_SOC_DB8500
         select PINCTRL_AB8540
         select REGULATOR
         select REGULATOR_DB8500_PRCMU
+        select CLKSRC_DBX500_PRCMU
         select PM_GENERIC_DOMAINS if PM
 
 config MACH_MOP500
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index dd3ac75776ad..2e20333cbce9 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -17,6 +17,7 @@ config H8300
         select HAVE_MEMBLOCK
         select HAVE_DMA_ATTRS
         select CLKSRC_OF
+        select H8300_TMR8
 
 config RWSEM_GENERIC_SPINLOCK
         def_bool y
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h
index bb837cded268..f0e14f3a800d 100644
--- a/arch/h8300/include/asm/io.h
+++ b/arch/h8300/include/asm/io.h
@@ -3,40 +3,45 @@
 
 #ifdef __KERNEL__
 
-#include <asm-generic/io.h>
-
 /* H8/300 internal I/O functions */
-static inline unsigned char ctrl_inb(unsigned long addr)
+
+#define __raw_readb __raw_readb
+static inline u8 __raw_readb(const volatile void __iomem *addr)
 {
-        return *(volatile unsigned char *)addr;
+        return *(volatile u8 *)addr;
 }
 
-static inline unsigned short ctrl_inw(unsigned long addr)
+#define __raw_readw __raw_readw
+static inline u16 __raw_readw(const volatile void __iomem *addr)
 {
-        return *(volatile unsigned short *)addr;
+        return *(volatile u16 *)addr;
 }
 
-static inline unsigned long ctrl_inl(unsigned long addr)
+#define __raw_readl __raw_readl
+static inline u32  __raw_readl(const volatile void __iomem *addr)
 {
-        return *(volatile unsigned long *)addr;
+        return *(volatile u32 *)addr;
 }
 
-static inline void ctrl_outb(unsigned char b, unsigned long addr)
+#define __raw_writeb __raw_writeb
+static inline void __raw_writeb(u8 b, const volatile void __iomem *addr)
 {
-        *(volatile unsigned char *)addr = b;
+        *(volatile u8 *)addr = b;
 }
 
-static inline void ctrl_outw(unsigned short b, unsigned long addr)
+#define __raw_writew __raw_writew
+static inline void __raw_writew(u16 b, const volatile void __iomem *addr)
 {
-        *(volatile unsigned short *)addr = b;
+        *(volatile u16 *)addr = b;
 }
 
-static inline void ctrl_outl(unsigned long b, unsigned long addr)
+#define __raw_writel __raw_writel
+static inline void __raw_writel(u32 b, const volatile void __iomem *addr)
 {
-        *(volatile unsigned long *)addr = b;
+        *(volatile u32 *)addr = b;
 }
 
-static inline void ctrl_bclr(int b, unsigned char *addr)
+static inline void ctrl_bclr(int b, void __iomem *addr)
 {
         if (__builtin_constant_p(b))
                 __asm__("bclr %1,%0" : "+WU"(*addr): "i"(b));
@@ -44,7 +49,7 @@ static inline void ctrl_bclr(int b, unsigned char *addr)
                 __asm__("bclr %w1,%0" : "+WU"(*addr): "r"(b));
 }
 
-static inline void ctrl_bset(int b, unsigned char *addr)
+static inline void ctrl_bset(int b, void __iomem *addr)
 {
         if (__builtin_constant_p(b))
                 __asm__("bset %1,%0" : "+WU"(*addr): "i"(b));
@@ -52,6 +57,8 @@ static inline void ctrl_bset(int b, unsigned char *addr)
                 __asm__("bset %w1,%0" : "+WU"(*addr): "r"(b));
 }
 
+#include <asm-generic/io.h>
+
 #endif /* __KERNEL__ */
 
 #endif /* _H8300_IO_H */
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index c772abe6d19c..e4985dfa91dc 100644
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -207,14 +207,14 @@ device_initcall(device_probe);
 #define get_wait(base, addr) ({         \
         int baddr;                      \
         baddr = ((addr) / 0x200000 * 2);                             \
-        w *= (ctrl_inw((unsigned long)(base) + 2) & (3 << baddr)) + 1;  \
+        w *= (readw((base) + 2) & (3 << baddr)) + 1;                 \
         })
 #endif
 #if defined(CONFIG_CPU_H8S)
 #define get_wait(base, addr) ({         \
         int baddr;                      \
         baddr = ((addr) / 0x200000 * 16);                            \
-        w *= (ctrl_inl((unsigned long)(base) + 2) & (7 << baddr)) + 1;  \
+        w *= (readl((base) + 2) & (7 << baddr)) + 1;    \
         })
 #endif
 
@@ -228,8 +228,8 @@ static __init int access_timing(void)
 
         bsc = of_find_compatible_node(NULL, NULL, "renesas,h8300-bsc");
         base = of_iomap(bsc, 0);
-        w = (ctrl_inb((unsigned long)base + 0) & bit)?2:1;
-        if (ctrl_inb((unsigned long)base + 1) & bit)
+        w = (readb(base + 0) & bit)?2:1;
+        if (readb(base + 1) & bit)
                 w *= get_wait(base, addr);
         else
                 w *= 2;