Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / mach-integrator / integrator_cp.c

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index a9e3cb5..772a7cf 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -7,63 +7,40 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License.
  */
-#include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/string.h>
-#include <linux/device.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/kmi.h>
 #include <linux/amba/mmci.h>
 #include <linux/io.h>
 #include <linux/irqchip.h>
-#include <linux/gfp.h>
 #include <linux/of_irq.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/sched_clock.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
 
-#include <asm/setup.h>
-#include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/irq.h>
 #include <asm/mach/map.h>
-#include <asm/mach/time.h>
 
 #include "hardware.h"
 #include "cm.h"
 #include "common.h"
 
+/* Base address to the core module header */
+static struct regmap *cm_map;
 /* Base address to the CP controller */
 static void __iomem *intcp_con_base;
 
+#define CM_COUNTER_OFFSET 0x28
+
 /*
  * Logical      Physical
- * f1000000    10000000        Core module registers
- * f1300000    13000000        Counter/Timer
  * f1400000    14000000        Interrupt controller
  * f1600000    16000000        UART 0
- * f1700000    17000000        UART 1
- * f1a00000    1a000000        Debug LEDs
- * fc900000    c9000000        GPIO
  * fca00000    ca000000        SIC
  */
 
 static struct map_desc intcp_io_desc[] __initdata __maybe_unused = {
        {
-               .virtual        = IO_ADDRESS(INTEGRATOR_HDR_BASE),
-               .pfn            = __phys_to_pfn(INTEGRATOR_HDR_BASE),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE
-       }, {
-               .virtual        = IO_ADDRESS(INTEGRATOR_CT_BASE),
-               .pfn            = __phys_to_pfn(INTEGRATOR_CT_BASE),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE
-       }, {
                .virtual        = IO_ADDRESS(INTEGRATOR_IC_BASE),
                .pfn            = __phys_to_pfn(INTEGRATOR_IC_BASE),
                .length         = SZ_4K,
@@ -73,16 +50,6 @@ static struct map_desc intcp_io_desc[] __initdata __maybe_unused = {
                .pfn            = __phys_to_pfn(INTEGRATOR_UART0_BASE),
                .length         = SZ_4K,
                .type           = MT_DEVICE
-       }, {
-               .virtual        = IO_ADDRESS(INTEGRATOR_DBG_BASE),
-               .pfn            = __phys_to_pfn(INTEGRATOR_DBG_BASE),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE
-       }, {
-               .virtual        = IO_ADDRESS(INTEGRATOR_CP_GPIO_BASE),
-               .pfn            = __phys_to_pfn(INTEGRATOR_CP_GPIO_BASE),
-               .length         = SZ_4K,
-               .type           = MT_DEVICE
        }, {
                .virtual        = IO_ADDRESS(INTEGRATOR_CP_SIC_BASE),
                .pfn            = __phys_to_pfn(INTEGRATOR_CP_SIC_BASE),
@@ -117,15 +84,20 @@ static struct mmci_platform_data mmc_data = {
        .gpio_cd        = -1,
 };
 
-#define REFCOUNTER (__io_address(INTEGRATOR_HDR_BASE) + 0x28)
-
 static u64 notrace intcp_read_sched_clock(void)
 {
-       return readl(REFCOUNTER);
+       unsigned int val;
+
+       /* MMIO so discard return code */
+       regmap_read(cm_map, CM_COUNTER_OFFSET, &val);
+       return val;
 }
 
 static void __init intcp_init_early(void)
 {
+       cm_map = syscon_regmap_lookup_by_compatible("arm,core-module-integrator");
+       if (IS_ERR(cm_map))
+               return;
        sched_clock_register(intcp_read_sched_clock, 32, 24000000);
 }
 
@@ -140,20 +112,8 @@ static void __init intcp_init_irq_of(void)
  * and enforce the bus names since these are used for clock lookups.
  */
 static struct of_dev_auxdata intcp_auxdata_lookup[] __initdata = {
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_RTC_BASE,
-               "rtc", NULL),
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART0_BASE,
-               "uart0", NULL),
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART1_BASE,
-               "uart1", NULL),
-       OF_DEV_AUXDATA("arm,primecell", KMI0_BASE,
-               "kmi0", NULL),
-       OF_DEV_AUXDATA("arm,primecell", KMI1_BASE,
-               "kmi1", NULL),
        OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_CP_MMC_BASE,
                "mmci", &mmc_data),
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_CP_AACI_BASE,
-               "aaci", &mmc_data),
        { /* sentinel */ },
 };