Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc

Keystone SOC updates for 3.16

- Drop unused COMMON_CLK_DEBUG option
- Enable MTD_SPI_NOR config needed for M25P80
- Enable coherent higher address memory space

* tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: Update the dma offset for non-dt platform devices
  ARM: keystone: Switch over to coherent memory address space
  ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

7 files changed, 116 insertions, 5 deletions

diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index 5bae19557591..c1f5adc5493e 100644
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -73,7 +73,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PL030=y
-CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_EXT2_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index ec9a41d50680..07b43277ccd3 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -112,6 +112,7 @@ CONFIG_MTD_PLATRAM=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_DAVINCI=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_UBI=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
@@ -146,7 +147,6 @@ CONFIG_USB_DWC3_VERBOSE=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DMADEVICES=y
 CONFIG_TI_EDMA=y
-CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_MEMORY=y
 CONFIG_TI_AEMIF=y
 CONFIG_EXT4_FS=y
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index b5df4a511b0a..28287aebdc15 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -62,7 +62,6 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_COMMON_CLK_DEBUG=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_TMPFS=y
 CONFIG_NFS_FS=y
diff --git a/arch/arm/configs/vt8500_v6_v7_defconfig b/arch/arm/configs/vt8500_v6_v7_defconfig
index f0520176acd0..9e7a25639690 100644
--- a/arch/arm/configs/vt8500_v6_v7_defconfig
+++ b/arch/arm/configs/vt8500_v6_v7_defconfig
@@ -73,7 +73,6 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_VT8500=y
 CONFIG_DMADEVICES=y
-CONFIG_COMMON_CLK_DEBUG=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_VT8500=y
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index e0b9e1b9cf30..59b8383cbdb0 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -20,6 +20,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/smp_plat.h>
+#include <asm/memory.h>
+
+#include "memory.h"
 
 #include "keystone.h"
 
@@ -28,6 +31,27 @@
 #define PLL_RESET                               BIT(16)
 
 static void __iomem *keystone_rstctrl;
+static struct notifier_block platform_nb;
+static unsigned long keystone_dma_pfn_offset __read_mostly;
+
+static int keystone_platform_notifier(struct notifier_block *nb,
+                                      unsigned long event, void *data)
+{
+        struct device *dev = data;
+
+        if (event != BUS_NOTIFY_ADD_DEVICE)
+                return NOTIFY_DONE;
+
+        if (!dev)
+                return NOTIFY_BAD;
+
+        if (!dev->of_node) {
+                dev->dma_pfn_offset = keystone_dma_pfn_offset;
+                dev_err(dev, "set dma_pfn_offset%08lx\n",
+                        dev->dma_pfn_offset);
+        }
+        return NOTIFY_OK;
+}
 
 static void __init keystone_init(void)
 {
@@ -42,9 +66,58 @@ static void __init keystone_init(void)
                 pr_warn("ti,keystone-reset iomap error\n");
 
         keystone_pm_runtime_init();
+        if (platform_nb.notifier_call)
+                bus_register_notifier(&platform_bus_type, &platform_nb);
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
+static phys_addr_t keystone_virt_to_idmap(unsigned long x)
+{
+        return (phys_addr_t)(x) - CONFIG_PAGE_OFFSET + KEYSTONE_LOW_PHYS_START;
+}
+
+static void __init keystone_init_meminfo(void)
+{
+        bool lpae = IS_ENABLED(CONFIG_ARM_LPAE);
+        bool pvpatch = IS_ENABLED(CONFIG_ARM_PATCH_PHYS_VIRT);
+        phys_addr_t offset = PHYS_OFFSET - KEYSTONE_LOW_PHYS_START;
+        phys_addr_t mem_start, mem_end;
+
+        BUG_ON(meminfo.nr_banks < 1);
+        mem_start = meminfo.bank[0].start;
+        mem_end = mem_start + meminfo.bank[0].size - 1;
+
+        /* nothing to do if we are running out of the <32-bit space */
+        if (mem_start >= KEYSTONE_LOW_PHYS_START &&
+            mem_end   <= KEYSTONE_LOW_PHYS_END)
+                return;
+
+        if (!lpae || !pvpatch) {
+                pr_crit("Enable %s%s%s to run outside 32-bit space\n",
+                      !lpae ? __stringify(CONFIG_ARM_LPAE) : "",
+                      (!lpae && !pvpatch) ? " and " : "",
+                      !pvpatch ? __stringify(CONFIG_ARM_PATCH_PHYS_VIRT) : "");
+        }
+
+        if (mem_start < KEYSTONE_HIGH_PHYS_START ||
+            mem_end   > KEYSTONE_HIGH_PHYS_END) {
+                pr_crit("Invalid address space for memory (%08llx-%08llx)\n",
+                      (u64)mem_start, (u64)mem_end);
+        }
+
+        offset += KEYSTONE_HIGH_PHYS_START;
+        __pv_phys_pfn_offset = PFN_DOWN(offset);
+        __pv_offset = (offset - PAGE_OFFSET);
+
+        /* Populate the arch idmap hook */
+        arch_virt_to_idmap = keystone_virt_to_idmap;
+        platform_nb.notifier_call = keystone_platform_notifier;
+        keystone_dma_pfn_offset = PFN_DOWN(KEYSTONE_HIGH_PHYS_START -
+                                                KEYSTONE_LOW_PHYS_START);
+
+        pr_info("Switching to high address space at 0x%llx\n", (u64)offset);
+}
+
 static const char *keystone_match[] __initconst = {
         "ti,keystone",
         NULL,
@@ -76,4 +149,5 @@ DT_MACHINE_START(KEYSTONE, "Keystone")
         .init_machine   = keystone_init,
         .dt_compat      = keystone_match,
         .restart        = keystone_restart,
+        .init_meminfo   = keystone_init_meminfo,
 MACHINE_END
diff --git a/arch/arm/mach-keystone/memory.h b/arch/arm/mach-keystone/memory.h
new file mode 100644
index 000000000000..b854fb18eef1
--- /dev/null
+++ b/arch/arm/mach-keystone/memory.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+#ifndef __MEMORY_H
+#define __MEMORY_H
+
+#define MAX_PHYSMEM_BITS        36
+#define SECTION_SIZE_BITS       34
+
+#define KEYSTONE_LOW_PHYS_START         0x80000000ULL
+#define KEYSTONE_LOW_PHYS_SIZE          0x80000000ULL /* 2G */
+#define KEYSTONE_LOW_PHYS_END           (KEYSTONE_LOW_PHYS_START + \
+                                         KEYSTONE_LOW_PHYS_SIZE - 1)
+
+#define KEYSTONE_HIGH_PHYS_START        0x800000000ULL
+#define KEYSTONE_HIGH_PHYS_SIZE         0x400000000ULL  /* 16G */
+#define KEYSTONE_HIGH_PHYS_END          (KEYSTONE_HIGH_PHYS_START + \
+                                         KEYSTONE_HIGH_PHYS_SIZE - 1)
+#endif /* __MEMORY_H */
diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c
index 5cf0683577ea..5f46a7cf907b 100644
--- a/arch/arm/mach-keystone/platsmp.c
+++ b/arch/arm/mach-keystone/platsmp.c
@@ -17,13 +17,16 @@
 #include <linux/io.h>
 
 #include <asm/smp_plat.h>
+#include <asm/prom.h>
+#include <asm/tlbflush.h>
+#include <asm/pgtable.h>
 
 #include "keystone.h"
 
 static int keystone_smp_boot_secondary(unsigned int cpu,
                                                 struct task_struct *idle)
 {
-        unsigned long start = virt_to_phys(&secondary_startup);
+        unsigned long start = virt_to_idmap(&secondary_startup);
         int error;
 
         pr_debug("keystone-smp: booting cpu %d, vector %08lx\n",
@@ -36,6 +39,19 @@ static int keystone_smp_boot_secondary(unsigned int cpu,
         return error;
 }
 
+#ifdef CONFIG_ARM_LPAE
+static void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu)
+{
+        pgd_t *pgd0 = pgd_offset_k(0);
+        cpu_set_ttbr(1, __pa(pgd0) + TTBR1_OFFSET);
+        local_flush_tlb_all();
+}
+#else
+static inline void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu)
+{}
+#endif
+
 struct smp_operations keystone_smp_ops __initdata = {
         .smp_boot_secondary     = keystone_smp_boot_secondary,
+        .smp_secondary_init     = keystone_smp_secondary_initmem,
 };