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"
  ...
		
	
			
		
			
				
	
	
		
			213 lines
		
	
	
	
		
			5.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			213 lines
		
	
	
	
		
			5.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * OMAP4 Power Management Routines
 | 
						|
 *
 | 
						|
 * Copyright (C) 2010-2011 Texas Instruments, Inc.
 | 
						|
 * Rajendra Nayak <rnayak@ti.com>
 | 
						|
 * 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/pm.h>
 | 
						|
#include <linux/suspend.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/list.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <asm/system_misc.h>
 | 
						|
 | 
						|
#include "soc.h"
 | 
						|
#include "common.h"
 | 
						|
#include "clockdomain.h"
 | 
						|
#include "powerdomain.h"
 | 
						|
#include "pm.h"
 | 
						|
 | 
						|
struct power_state {
 | 
						|
	struct powerdomain *pwrdm;
 | 
						|
	u32 next_state;
 | 
						|
#ifdef CONFIG_SUSPEND
 | 
						|
	u32 saved_state;
 | 
						|
	u32 saved_logic_state;
 | 
						|
#endif
 | 
						|
	struct list_head node;
 | 
						|
};
 | 
						|
 | 
						|
static LIST_HEAD(pwrst_list);
 | 
						|
 | 
						|
#ifdef CONFIG_SUSPEND
 | 
						|
static int omap4_pm_suspend(void)
 | 
						|
{
 | 
						|
	struct power_state *pwrst;
 | 
						|
	int state, ret = 0;
 | 
						|
	u32 cpu_id = smp_processor_id();
 | 
						|
 | 
						|
	/* Save current powerdomain state */
 | 
						|
	list_for_each_entry(pwrst, &pwrst_list, node) {
 | 
						|
		pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm);
 | 
						|
		pwrst->saved_logic_state = pwrdm_read_logic_retst(pwrst->pwrdm);
 | 
						|
	}
 | 
						|
 | 
						|
	/* Set targeted power domain states by suspend */
 | 
						|
	list_for_each_entry(pwrst, &pwrst_list, node) {
 | 
						|
		omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
 | 
						|
		pwrdm_set_logic_retst(pwrst->pwrdm, PWRDM_POWER_OFF);
 | 
						|
	}
 | 
						|
 | 
						|
	/*
 | 
						|
	 * For MPUSS to hit power domain retention(CSWR or OSWR),
 | 
						|
	 * CPU0 and CPU1 power domains need to be in OFF or DORMANT state,
 | 
						|
	 * since CPU power domain CSWR is not supported by hardware
 | 
						|
	 * Only master CPU follows suspend path. All other CPUs follow
 | 
						|
	 * CPU hotplug path in system wide suspend. On OMAP4, CPU power
 | 
						|
	 * domain CSWR is not supported by hardware.
 | 
						|
	 * More details can be found in OMAP4430 TRM section 4.3.4.2.
 | 
						|
	 */
 | 
						|
	omap4_enter_lowpower(cpu_id, PWRDM_POWER_OFF);
 | 
						|
 | 
						|
	/* Restore next powerdomain state */
 | 
						|
	list_for_each_entry(pwrst, &pwrst_list, node) {
 | 
						|
		state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
 | 
						|
		if (state > pwrst->next_state) {
 | 
						|
			pr_info("Powerdomain (%s) didn't enter target state %d\n",
 | 
						|
				pwrst->pwrdm->name, pwrst->next_state);
 | 
						|
			ret = -1;
 | 
						|
		}
 | 
						|
		omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
 | 
						|
		pwrdm_set_logic_retst(pwrst->pwrdm, pwrst->saved_logic_state);
 | 
						|
	}
 | 
						|
	if (ret) {
 | 
						|
		pr_crit("Could not enter target state in pm_suspend\n");
 | 
						|
		/*
 | 
						|
		 * OMAP4 chip PM currently works only with certain (newer)
 | 
						|
		 * versions of bootloaders. This is due to missing code in the
 | 
						|
		 * kernel to properly reset and initialize some devices.
 | 
						|
		 * Warn the user about the bootloader version being one of the
 | 
						|
		 * possible causes.
 | 
						|
		 * http://www.spinics.net/lists/arm-kernel/msg218641.html
 | 
						|
		 */
 | 
						|
		pr_warn("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
 | 
						|
	} else {
 | 
						|
		pr_info("Successfully put all powerdomains to target state\n");
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
#endif /* CONFIG_SUSPEND */
 | 
						|
 | 
						|
static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
 | 
						|
{
 | 
						|
	struct power_state *pwrst;
 | 
						|
 | 
						|
	if (!pwrdm->pwrsts)
 | 
						|
		return 0;
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Skip CPU0 and CPU1 power domains. CPU1 is programmed
 | 
						|
	 * through hotplug path and CPU0 explicitly programmed
 | 
						|
	 * further down in the code path
 | 
						|
	 */
 | 
						|
	if (!strncmp(pwrdm->name, "cpu", 3))
 | 
						|
		return 0;
 | 
						|
 | 
						|
	pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC);
 | 
						|
	if (!pwrst)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	pwrst->pwrdm = pwrdm;
 | 
						|
	pwrst->next_state = PWRDM_POWER_RET;
 | 
						|
	list_add(&pwrst->node, &pwrst_list);
 | 
						|
 | 
						|
	return omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
 | 
						|
}
 | 
						|
 | 
						|
/**
 | 
						|
 * omap_default_idle - OMAP4 default ilde routine.'
 | 
						|
 *
 | 
						|
 * Implements OMAP4 memory, IO ordering requirements which can't be addressed
 | 
						|
 * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPU_IDLE and
 | 
						|
 * by secondary CPU with CONFIG_CPU_IDLE.
 | 
						|
 */
 | 
						|
static void omap_default_idle(void)
 | 
						|
{
 | 
						|
	omap_do_wfi();
 | 
						|
}
 | 
						|
 | 
						|
/**
 | 
						|
 * omap4_pm_init - Init routine for OMAP4 PM
 | 
						|
 *
 | 
						|
 * Initializes all powerdomain and clockdomain target states
 | 
						|
 * and all PRCM settings.
 | 
						|
 */
 | 
						|
int __init omap4_pm_init(void)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
	struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;
 | 
						|
	struct clockdomain *ducati_clkdm, *l3_2_clkdm;
 | 
						|
 | 
						|
	if (omap_rev() == OMAP4430_REV_ES1_0) {
 | 
						|
		WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
 | 
						|
		return -ENODEV;
 | 
						|
	}
 | 
						|
 | 
						|
	pr_err("Power Management for TI OMAP4.\n");
 | 
						|
	/*
 | 
						|
	 * OMAP4 chip PM currently works only with certain (newer)
 | 
						|
	 * versions of bootloaders. This is due to missing code in the
 | 
						|
	 * kernel to properly reset and initialize some devices.
 | 
						|
	 * http://www.spinics.net/lists/arm-kernel/msg218641.html
 | 
						|
	 */
 | 
						|
	pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
 | 
						|
 | 
						|
	ret = pwrdm_for_each(pwrdms_setup, NULL);
 | 
						|
	if (ret) {
 | 
						|
		pr_err("Failed to setup powerdomains\n");
 | 
						|
		goto err2;
 | 
						|
	}
 | 
						|
 | 
						|
	/*
 | 
						|
	 * The dynamic dependency between MPUSS -> MEMIF and
 | 
						|
	 * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as
 | 
						|
	 * expected. The hardware recommendation is to enable static
 | 
						|
	 * dependencies for these to avoid system lock ups or random crashes.
 | 
						|
	 */
 | 
						|
	mpuss_clkdm = clkdm_lookup("mpuss_clkdm");
 | 
						|
	emif_clkdm = clkdm_lookup("l3_emif_clkdm");
 | 
						|
	l3_1_clkdm = clkdm_lookup("l3_1_clkdm");
 | 
						|
	l3_2_clkdm = clkdm_lookup("l3_2_clkdm");
 | 
						|
	ducati_clkdm = clkdm_lookup("ducati_clkdm");
 | 
						|
	if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) ||
 | 
						|
		(!l3_2_clkdm) || (!ducati_clkdm))
 | 
						|
		goto err2;
 | 
						|
 | 
						|
	ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);
 | 
						|
	ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);
 | 
						|
	ret |= clkdm_add_wkdep(mpuss_clkdm, l3_2_clkdm);
 | 
						|
	ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm);
 | 
						|
	ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);
 | 
						|
	if (ret) {
 | 
						|
		pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\n");
 | 
						|
		goto err2;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = omap4_mpuss_init();
 | 
						|
	if (ret) {
 | 
						|
		pr_err("Failed to initialise OMAP4 MPUSS\n");
 | 
						|
		goto err2;
 | 
						|
	}
 | 
						|
 | 
						|
	(void) clkdm_for_each(omap_pm_clkdms_setup, NULL);
 | 
						|
 | 
						|
#ifdef CONFIG_SUSPEND
 | 
						|
	omap_pm_suspend = omap4_pm_suspend;
 | 
						|
#endif
 | 
						|
 | 
						|
	/* Overwrite the default cpu_do_idle() */
 | 
						|
	arm_pm_idle = omap_default_idle;
 | 
						|
 | 
						|
	omap4_idle_init();
 | 
						|
 | 
						|
err2:
 | 
						|
	return ret;
 | 
						|
}
 |