From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 22:37:41 +0000 (-0800)
Subject: Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.3-rc1~140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d889d03ab1417645e76e129834f76204bae37c0;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'boards' of git://git./linux/kernel/git/arm/arm-soc

Board-level changes

This adds and extends support for specific boards on a number of
ARM platforms:  omap, imx, samsung, tegra, ...

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
  Enable 32 bit flash support for iMX21ADS board
  ARM: mx31pdk: Add MC13783 RTC support
  iomux-mx25: configuration to support CSPI3 on CSI pins
  MX1:apf9328: Add i2c support
  mioa701: add newly available DoC G3 chip
  arm/tegra: remove __initdata annotation from pinmux tables
  arm/tegra: Use bus notifiers to trigger pinmux setup
  arm/tegra: Refactor board-*-pinmux.c to share code
  arm/tegra: Fix mistake in Trimslice's pinmux
  arm/tegra: Rework Seaboard-vs-Ventana pinmux table
  arm/tegra: Remove useless entries from ventana_pinmux[]
  arm/tegra: PCIe: Remove include of mach/pinmux.h
  arm/tegra: Harmony PCIe: Don't touch pinmux
  arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
  arm/tegra: Split Seaboard GPIO table to allow for Ventana
  ARM: imx6q: generate imx6q dtb files
  arm/imx6q: Rename Sabreauto to Armadillo2
  arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
  arm/imx6: add imx6q sabrelite board support
  dts/imx: rename uart labels to consistent with hw spec
  ...
---

6d889d03ab1417645e76e129834f76204bae37c0
diff --cc arch/arm/mach-s3c64xx/pm.c
index 7d3e81b,0868d13..055dac9
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@@ -325,27 -181,10 +325,29 @@@ static void s3c64xx_pm_prepare(void
  	__raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);
  }
  
 -static int s3c64xx_pm_init(void)
 +int __init s3c64xx_pm_init(void)
 +{
 +	int i;
 +
 +	s3c_pm_init();
 +
 +	for (i = 0; i < ARRAY_SIZE(s3c64xx_always_on_pm_domains); i++)
 +		pm_genpd_init(&s3c64xx_always_on_pm_domains[i]->pd,
 +			      &pm_domain_always_on_gov, false);
 +
 +	for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++)
 +		pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false);
 +
 +	if (dev_get_platdata(&s3c_device_fb.dev))
 +		pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev);
 +
 +	return 0;
 +}
 +
 +static __init int s3c64xx_pm_initcall(void)
  {
+ 	u32 val;
+ 
  	pm_cpu_prep = s3c64xx_pm_prepare;
  	pm_cpu_sleep = s3c64xx_cpu_suspend;
  	pm_uart_udivslot = 1;