From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Feb 2015 17:27:54 +0000 (-0800)
Subject: Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.0-rc1~70
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=878ba61aa98cbb97a513757800e77613f856a029;p=linux-2.6-block.git

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

Pull ARM SoC platform changes from Olof Johansson:
 "New and updated SoC support.  Also included are some cleanups where
  the platform maintainers hadn't separated cleanups from new developent
  in separate branches.

  Some of the larger things worth pointing out:

   - A large set of changes from Alexandre Belloni and Nicolas Ferre
     preparing at91 platforms for multiplatform and cleaning up quite a
     bit in the process.

   - Removal of CSR's "Marco" SoC platform that never made it out to the
     market.  We love seeing these since it means the vendor published
     support before product was out, which is exactly what we want!

  New platforms this release are:

   - Conexant Digicolor (CX92755 SoC)
   - Hisilicon HiP01 SoC
   - CSR/sirf Atlas7 SoC
   - ST STiH418 SoC
   - Common code changes for Nvidia Tegra132 (64-bit SoC)

  We're seeing more and more platforms having a harder time labelling
  changes as cleanups vs new development -- which is a good sign that
  we've come quite far on the cleanup effort.  So over time we might
  start combining the cleanup and new-development branches more"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (124 commits)
  ARM: at91/trivial: unify functions and machine names
  ARM: at91: remove at91_dt_initialize and machine init_early()
  ARM: at91: change board files into SoC files
  ARM: at91: remove at91_boot_soc
  ARM: at91: move alternative initial mapping to board-dt-sama5.c
  ARM: at91: merge all SOC_AT91SAM9xxx
  ARM: at91: at91rm9200: set idle and restart from rm9200_dt_device_init()
  ARM: digicolor: select syscon and timer
  ARM: zynq: Simplify SLCR initialization
  ARM: zynq: PM: Fixed simple typo.
  ARM: zynq: Setup default gpio number for Xilinx Zynq
  ARM: digicolor: add low level debug support
  ARM: initial support for Conexant Digicolor CX92755 SoC
  ARM: OMAP2+: Add dm816x hwmod support
  ARM: OMAP2+: Add clock domain support for dm816x
  ARM: OMAP2+: Add board-generic.c entry for ti81xx
  ARM: at91: pm: remove warning to remove SOC_AT91SAM9263 usage
  ARM: at91: remove unused mach/system_rev.h
  ARM: at91: stop using HAVE_AT91_DBGUx
  ARM: at91: fix ordering of SRAM and PM initialization
  ...
---

878ba61aa98cbb97a513757800e77613f856a029
diff --cc arch/arm/Kconfig.debug
index 8fecefe881cd,b6a073de1559..970de7518341
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1453,17 -1461,15 +1517,19 @@@ config DEBUG_UART_VIR
  	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
  	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
  	default 0xfef36000 if DEBUG_HIGHBANK_UART
 +	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
 +	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
 +	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
  	default 0xfefff700 if ARCH_IOP33X
  	default 0xff003000 if DEBUG_U300_UART
+ 	default 0xffd01000 if DEBUG_HIP01_UART
  	default DEBUG_UART_PHYS if !MMU
  	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
  		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
 -		DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
 +		DEBUG_MSM_UART || DEBUG_NETX_UART || \
 +		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
- 		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
+ 		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+ 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0
  
  config DEBUG_UART_8250_SHIFT
  	int "Register offset shift for the 8250 debug UART"
diff --cc arch/arm/mach-rockchip/rockchip.c
index a611f4852582,f70861174cbb..d360ec044b66
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@@ -27,31 -23,11 +27,33 @@@
  #include <asm/mach/map.h>
  #include <asm/hardware/cache-l2x0.h>
  #include "core.h"
+ #include "pm.h"
  
 +#define RK3288_GRF_SOC_CON0 0x244
 +
 +static void __init rockchip_timer_init(void)
 +{
 +	if (of_machine_is_compatible("rockchip,rk3288")) {
 +		struct regmap *grf;
 +
 +		/*
 +		 * Disable auto jtag/sdmmc switching that causes issues
 +		 * with the mmc controllers making them unreliable
 +		 */
 +		grf = syscon_regmap_lookup_by_compatible("rockchip,rk3288-grf");
 +		if (!IS_ERR(grf))
 +			regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000);
 +		else
 +			pr_err("rockchip: could not get grf syscon\n");
 +	}
 +
 +	of_clk_init(NULL);
 +	clocksource_of_init();
 +}
 +
  static void __init rockchip_dt_init(void)
  {
+ 	rockchip_suspend_init();
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  	platform_device_register_simple("cpufreq-dt", 0, NULL, 0);
  }
@@@ -65,10 -41,9 +67,10 @@@ static const char * const rockchip_boar
  	NULL,
  };
  
- DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)")
+ DT_MACHINE_START(ROCKCHIP_DT, "Rockchip (Device Tree)")
  	.l2c_aux_val	= 0,
  	.l2c_aux_mask	= ~0,
 +	.init_time	= rockchip_timer_init,
  	.dt_compat	= rockchip_board_dt_compat,
  	.init_machine	= rockchip_dt_init,
  MACHINE_END