Here is a collection of cleanup patches. Among the pieces that stand out are:
 
 - The deletion of h720x platforms
 - Split of at91 non-dt platforms to their own Kconfig file to keep them separate
 - General cleanups and refactoring of i.MX and MXS platforms
 - Some restructuring of clock tables for OMAP
 - Convertion of PMC driver for Tegra to dt-only
 - Some renames of sunxi -> sun4i (Allwinner A10)
 - ... plus a bunch of other stuff that I haven't mentioned
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRggUqAAoJEIwa5zzehBx3HjEQAJwp7heRs/HwTDzmzcyHkRMV
 usbaa9dHBuAZ0DzsWjLK99xEn8VWD9TvbeP6hN5gNhxko06UVza3o8PI2iV1ztMB
 9K3u2+LS5on/5cOxnsU1va16h5hBZ0ZIgNx5NY+PZ5mBY6v1U3qTjljPP62iXp63
 w+sdXeZDe/c5JvuoDRbY0OBR++3Jp8cQg7KbU78jWz3r5D2rC1zwhkf2audcRY6b
 jIWTj9M8CHynh/D6OzKqDcOYorBHNSRj0YbiWS2nnMfm+0V8nya00EPRpCPRiBUb
 sobSy1CI9Qxiih3bOf6QCfzCRzJ5hbtE0zlI8g3bqtEZ1yOsE949HrKapWHJJdIU
 JNTXrxXORAnaRhbzvSPNpp/iJBSDQRsfEETgv5BuHg/4lzTQfzElySbcgb4EeoHr
 7Zt8ZR2/Du+u76qIPqs19ES3Wx+nOEOfSDAgZmlfPvlwmlGDYvqAXoeJ006VXnhG
 JacLuD/cFnJ1w00Bcl48ZXMIsVkoRqjvsCG5q688HGXMM1lU8DfgUpQY6OCWAbdu
 kFnBinJZk+HbE8FGS8O0BoQ+oiC0YIr2XhATL66PGHq7bLHb5ycwvZ7mrfC0AN9j
 M9hqTFednwfo9wF8vSj5nMsxXwP8/mky4ECGoFvLsMYDosunrNVnAHtTgDSE+ZgO
 6kQJ1P8jBBXn2LyjF88W
 =xCAx
 -----END PGP SIGNATURE-----
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanup from Olof Johansson:
 "Here is a collection of cleanup patches.  Among the pieces that stand
  out are:
   - The deletion of h720x platforms
   - Split of at91 non-dt platforms to their own Kconfig file to keep
     them separate
   - General cleanups and refactoring of i.MX and MXS platforms
   - Some restructuring of clock tables for OMAP
   - Convertion of PMC driver for Tegra to dt-only
   - Some renames of sunxi -> sun4i (Allwinner A10)
   - ... plus a bunch of other stuff that I haven't mentioned"
* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
  ARM: i.MX: remove unused ARCH_* configs
  ARM i.MX53: remove platform ahci support
  ARM: sunxi: Rework the restart code
  irqchip: sunxi: Rename sunxi to sun4i
  irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
  clocksource: sunxi: Rename sunxi to sun4i
  clocksource: sunxi: make use of CLKSRC_OF
  clocksource: sunxi: Cleanup the timer code
  ARM: at91: remove trailing semicolon from macros
  ARM: at91/setup: fix trivial typos
  ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
  ARM: EXYNOS: change the name of USB ohci header
  ARM: SAMSUNG: Remove unnecessary code for dma
  ARM: S3C24XX: Remove unused GPIO drive strength register definitions
  ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
  ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
  ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
  ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
  ...
		
	
			
		
			
				
	
	
		
			357 lines
		
	
	
	
		
			8.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			357 lines
		
	
	
	
		
			8.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * OMAP4 specific common source file.
 | 
						|
 *
 | 
						|
 * Copyright (C) 2010 Texas Instruments, Inc.
 | 
						|
 * Author:
 | 
						|
 *	Santosh Shilimkar <santosh.shilimkar@ti.com>
 | 
						|
 *
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/io.h>
 | 
						|
#include <linux/irq.h>
 | 
						|
#include <linux/irqchip.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <linux/memblock.h>
 | 
						|
#include <linux/of_irq.h>
 | 
						|
#include <linux/of_platform.h>
 | 
						|
#include <linux/export.h>
 | 
						|
#include <linux/irqchip/arm-gic.h>
 | 
						|
#include <linux/of_address.h>
 | 
						|
 | 
						|
#include <asm/hardware/cache-l2x0.h>
 | 
						|
#include <asm/mach/map.h>
 | 
						|
#include <asm/memblock.h>
 | 
						|
#include <asm/smp_twd.h>
 | 
						|
 | 
						|
#include "omap-wakeupgen.h"
 | 
						|
#include "soc.h"
 | 
						|
#include "iomap.h"
 | 
						|
#include "common.h"
 | 
						|
#include "mmc.h"
 | 
						|
#include "hsmmc.h"
 | 
						|
#include "prminst44xx.h"
 | 
						|
#include "prcm_mpu44xx.h"
 | 
						|
#include "omap4-sar-layout.h"
 | 
						|
#include "omap-secure.h"
 | 
						|
#include "sram.h"
 | 
						|
 | 
						|
#ifdef CONFIG_CACHE_L2X0
 | 
						|
static void __iomem *l2cache_base;
 | 
						|
#endif
 | 
						|
 | 
						|
static void __iomem *sar_ram_base;
 | 
						|
static void __iomem *gic_dist_base_addr;
 | 
						|
static void __iomem *twd_base;
 | 
						|
 | 
						|
#define IRQ_LOCALTIMER		29
 | 
						|
 | 
						|
#ifdef CONFIG_OMAP4_ERRATA_I688
 | 
						|
/* Used to implement memory barrier on DRAM path */
 | 
						|
#define OMAP4_DRAM_BARRIER_VA			0xfe600000
 | 
						|
 | 
						|
void __iomem *dram_sync, *sram_sync;
 | 
						|
 | 
						|
static phys_addr_t paddr;
 | 
						|
static u32 size;
 | 
						|
 | 
						|
void omap_bus_sync(void)
 | 
						|
{
 | 
						|
	if (dram_sync && sram_sync) {
 | 
						|
		writel_relaxed(readl_relaxed(dram_sync), dram_sync);
 | 
						|
		writel_relaxed(readl_relaxed(sram_sync), sram_sync);
 | 
						|
		isb();
 | 
						|
	}
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(omap_bus_sync);
 | 
						|
 | 
						|
/* Steal one page physical memory for barrier implementation */
 | 
						|
int __init omap_barrier_reserve_memblock(void)
 | 
						|
{
 | 
						|
 | 
						|
	size = ALIGN(PAGE_SIZE, SZ_1M);
 | 
						|
	paddr = arm_memblock_steal(size, SZ_1M);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
void __init omap_barriers_init(void)
 | 
						|
{
 | 
						|
	struct map_desc dram_io_desc[1];
 | 
						|
 | 
						|
	dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;
 | 
						|
	dram_io_desc[0].pfn = __phys_to_pfn(paddr);
 | 
						|
	dram_io_desc[0].length = size;
 | 
						|
	dram_io_desc[0].type = MT_MEMORY_SO;
 | 
						|
	iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));
 | 
						|
	dram_sync = (void __iomem *) dram_io_desc[0].virtual;
 | 
						|
	sram_sync = (void __iomem *) OMAP4_SRAM_VA;
 | 
						|
 | 
						|
	pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",
 | 
						|
		(long long) paddr, dram_io_desc[0].virtual);
 | 
						|
 | 
						|
}
 | 
						|
#else
 | 
						|
void __init omap_barriers_init(void)
 | 
						|
{}
 | 
						|
#endif
 | 
						|
 | 
						|
void __init gic_init_irq(void)
 | 
						|
{
 | 
						|
	void __iomem *omap_irq_base;
 | 
						|
 | 
						|
	/* Static mapping, never released */
 | 
						|
	gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);
 | 
						|
	BUG_ON(!gic_dist_base_addr);
 | 
						|
 | 
						|
	twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_4K);
 | 
						|
	BUG_ON(!twd_base);
 | 
						|
 | 
						|
	/* Static mapping, never released */
 | 
						|
	omap_irq_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);
 | 
						|
	BUG_ON(!omap_irq_base);
 | 
						|
 | 
						|
	omap_wakeupgen_init();
 | 
						|
 | 
						|
	gic_init(0, 29, gic_dist_base_addr, omap_irq_base);
 | 
						|
}
 | 
						|
 | 
						|
void gic_dist_disable(void)
 | 
						|
{
 | 
						|
	if (gic_dist_base_addr)
 | 
						|
		__raw_writel(0x0, gic_dist_base_addr + GIC_DIST_CTRL);
 | 
						|
}
 | 
						|
 | 
						|
bool gic_dist_disabled(void)
 | 
						|
{
 | 
						|
	return !(__raw_readl(gic_dist_base_addr + GIC_DIST_CTRL) & 0x1);
 | 
						|
}
 | 
						|
 | 
						|
void gic_timer_retrigger(void)
 | 
						|
{
 | 
						|
	u32 twd_int = __raw_readl(twd_base + TWD_TIMER_INTSTAT);
 | 
						|
	u32 gic_int = __raw_readl(gic_dist_base_addr + GIC_DIST_PENDING_SET);
 | 
						|
	u32 twd_ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL);
 | 
						|
 | 
						|
	if (twd_int && !(gic_int & BIT(IRQ_LOCALTIMER))) {
 | 
						|
		/*
 | 
						|
		 * The local timer interrupt got lost while the distributor was
 | 
						|
		 * disabled.  Ack the pending interrupt, and retrigger it.
 | 
						|
		 */
 | 
						|
		pr_warn("%s: lost localtimer interrupt\n", __func__);
 | 
						|
		__raw_writel(1, twd_base + TWD_TIMER_INTSTAT);
 | 
						|
		if (!(twd_ctrl & TWD_TIMER_CONTROL_PERIODIC)) {
 | 
						|
			__raw_writel(1, twd_base + TWD_TIMER_COUNTER);
 | 
						|
			twd_ctrl |= TWD_TIMER_CONTROL_ENABLE;
 | 
						|
			__raw_writel(twd_ctrl, twd_base + TWD_TIMER_CONTROL);
 | 
						|
		}
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
#ifdef CONFIG_CACHE_L2X0
 | 
						|
 | 
						|
void __iomem *omap4_get_l2cache_base(void)
 | 
						|
{
 | 
						|
	return l2cache_base;
 | 
						|
}
 | 
						|
 | 
						|
static void omap4_l2x0_disable(void)
 | 
						|
{
 | 
						|
	/* Disable PL310 L2 Cache controller */
 | 
						|
	omap_smc1(0x102, 0x0);
 | 
						|
}
 | 
						|
 | 
						|
static void omap4_l2x0_set_debug(unsigned long val)
 | 
						|
{
 | 
						|
	/* Program PL310 L2 Cache controller debug register */
 | 
						|
	omap_smc1(0x100, val);
 | 
						|
}
 | 
						|
 | 
						|
static int __init omap_l2_cache_init(void)
 | 
						|
{
 | 
						|
	u32 aux_ctrl = 0;
 | 
						|
 | 
						|
	/*
 | 
						|
	 * To avoid code running on other OMAPs in
 | 
						|
	 * multi-omap builds
 | 
						|
	 */
 | 
						|
	if (!cpu_is_omap44xx())
 | 
						|
		return -ENODEV;
 | 
						|
 | 
						|
	/* Static mapping, never released */
 | 
						|
	l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);
 | 
						|
	if (WARN_ON(!l2cache_base))
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	/*
 | 
						|
	 * 16-way associativity, parity disabled
 | 
						|
	 * Way size - 32KB (es1.0)
 | 
						|
	 * Way size - 64KB (es2.0 +)
 | 
						|
	 */
 | 
						|
	aux_ctrl = ((1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT) |
 | 
						|
			(0x1 << 25) |
 | 
						|
			(0x1 << L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT) |
 | 
						|
			(0x1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT));
 | 
						|
 | 
						|
	if (omap_rev() == OMAP4430_REV_ES1_0) {
 | 
						|
		aux_ctrl |= 0x2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;
 | 
						|
	} else {
 | 
						|
		aux_ctrl |= ((0x3 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) |
 | 
						|
			(1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT) |
 | 
						|
			(1 << L2X0_AUX_CTRL_DATA_PREFETCH_SHIFT) |
 | 
						|
			(1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT) |
 | 
						|
			(1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT));
 | 
						|
	}
 | 
						|
	if (omap_rev() != OMAP4430_REV_ES1_0)
 | 
						|
		omap_smc1(0x109, aux_ctrl);
 | 
						|
 | 
						|
	/* Enable PL310 L2 Cache controller */
 | 
						|
	omap_smc1(0x102, 0x1);
 | 
						|
 | 
						|
	if (of_have_populated_dt())
 | 
						|
		l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK);
 | 
						|
	else
 | 
						|
		l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK);
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Override default outer_cache.disable with a OMAP4
 | 
						|
	 * specific one
 | 
						|
	*/
 | 
						|
	outer_cache.disable = omap4_l2x0_disable;
 | 
						|
	outer_cache.set_debug = omap4_l2x0_set_debug;
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
omap_early_initcall(omap_l2_cache_init);
 | 
						|
#endif
 | 
						|
 | 
						|
void __iomem *omap4_get_sar_ram_base(void)
 | 
						|
{
 | 
						|
	return sar_ram_base;
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
 * SAR RAM used to save and restore the HW
 | 
						|
 * context in low power modes
 | 
						|
 */
 | 
						|
static int __init omap4_sar_ram_init(void)
 | 
						|
{
 | 
						|
	unsigned long sar_base;
 | 
						|
 | 
						|
	/*
 | 
						|
	 * To avoid code running on other OMAPs in
 | 
						|
	 * multi-omap builds
 | 
						|
	 */
 | 
						|
	if (cpu_is_omap44xx())
 | 
						|
		sar_base = OMAP44XX_SAR_RAM_BASE;
 | 
						|
	else if (soc_is_omap54xx())
 | 
						|
		sar_base = OMAP54XX_SAR_RAM_BASE;
 | 
						|
	else
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	/* Static mapping, never released */
 | 
						|
	sar_ram_base = ioremap(sar_base, SZ_16K);
 | 
						|
	if (WARN_ON(!sar_ram_base))
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
omap_early_initcall(omap4_sar_ram_init);
 | 
						|
 | 
						|
void __init omap_gic_of_init(void)
 | 
						|
{
 | 
						|
	struct device_node *np;
 | 
						|
 | 
						|
	/* Extract GIC distributor and TWD bases for OMAP4460 ROM Errata WA */
 | 
						|
	if (!cpu_is_omap446x())
 | 
						|
		goto skip_errata_init;
 | 
						|
 | 
						|
	np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-gic");
 | 
						|
	gic_dist_base_addr = of_iomap(np, 0);
 | 
						|
	WARN_ON(!gic_dist_base_addr);
 | 
						|
 | 
						|
	np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-twd-timer");
 | 
						|
	twd_base = of_iomap(np, 0);
 | 
						|
	WARN_ON(!twd_base);
 | 
						|
 | 
						|
skip_errata_init:
 | 
						|
	omap_wakeupgen_init();
 | 
						|
	irqchip_init();
 | 
						|
}
 | 
						|
 | 
						|
#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
 | 
						|
static int omap4_twl6030_hsmmc_late_init(struct device *dev)
 | 
						|
{
 | 
						|
	int irq = 0;
 | 
						|
	struct platform_device *pdev = container_of(dev,
 | 
						|
				struct platform_device, dev);
 | 
						|
	struct omap_mmc_platform_data *pdata = dev->platform_data;
 | 
						|
 | 
						|
	/* Setting MMC1 Card detect Irq */
 | 
						|
	if (pdev->id == 0) {
 | 
						|
		irq = twl6030_mmc_card_detect_config();
 | 
						|
		if (irq < 0) {
 | 
						|
			dev_err(dev, "%s: Error card detect config(%d)\n",
 | 
						|
				__func__, irq);
 | 
						|
			return irq;
 | 
						|
		}
 | 
						|
		pdata->slots[0].card_detect_irq = irq;
 | 
						|
		pdata->slots[0].card_detect = twl6030_mmc_card_detect;
 | 
						|
	}
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
 | 
						|
{
 | 
						|
	struct omap_mmc_platform_data *pdata;
 | 
						|
 | 
						|
	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */
 | 
						|
	if (!dev) {
 | 
						|
		pr_err("Failed %s\n", __func__);
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	pdata = dev->platform_data;
 | 
						|
	pdata->init =	omap4_twl6030_hsmmc_late_init;
 | 
						|
}
 | 
						|
 | 
						|
int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)
 | 
						|
{
 | 
						|
	struct omap2_hsmmc_info *c;
 | 
						|
 | 
						|
	omap_hsmmc_init(controllers);
 | 
						|
	for (c = controllers; c->mmc; c++) {
 | 
						|
		/* pdev can be null if CONFIG_MMC_OMAP_HS is not set */
 | 
						|
		if (!c->pdev)
 | 
						|
			continue;
 | 
						|
		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
#else
 | 
						|
int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
/**
 | 
						|
 * omap44xx_restart - trigger a software restart of the SoC
 | 
						|
 * @mode: the "reboot mode", see arch/arm/kernel/{setup,process}.c
 | 
						|
 * @cmd: passed from the userspace program rebooting the system (if provided)
 | 
						|
 *
 | 
						|
 * Resets the SoC.  For @cmd, see the 'reboot' syscall in
 | 
						|
 * kernel/sys.c.  No return value.
 | 
						|
 */
 | 
						|
void omap44xx_restart(char mode, const char *cmd)
 | 
						|
{
 | 
						|
	/* XXX Should save 'cmd' into scratchpad for use after reboot */
 | 
						|
	omap4_prminst_global_warm_sw_reset(); /* never returns */
 | 
						|
	while (1);
 | 
						|
}
 | 
						|
 |