From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Nov 2012 06:47:30 +0000 (-0800)
Subject: Merge branch 'next/dt' into next/pm2
X-Git-Tag: firefly_0821_release~3680^2~1477^2^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77f9db89c928773e5fb1df0df4d13d5cc8abd178;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next/dt' into next/pm2

By Lee Jones (42) and others
via Olof Johansson (13) and others
* next/dt: (249 commits)
  ARM: ux500: Rename dbx500 cpufreq code to be more generic
  ARM: dts: add missing ux500 device trees
  ARM: ux500: Stop registering the PCM driver from platform code
  ARM: ux500: Move board specific GPIO info out to subordinate DTS files
  ARM: ux500: Disable the MMCI gpio-regulator by default
  ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
  ARM: Kirkwood: Add support LED of OpenBlocks A6
  ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
  ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
  ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
  ARM: kirkwood: Add support DT of second I2C bus
  ARM: kirkwood: Convert mplcec4 board to pinctrl
  ARM: Kirkwood: Convert km_kirkwood to pinctrl
  ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
  ARM: Kirkwood: Convert IX2-200 to pinctrl.
  ARM: Kirkwood: Convert lsxl boards to pinctrl.
  ARM: Kirkwood: Convert ib62x0 to pinctrl.
  ARM: Kirkwood: Convert GoFlex Net to pinctrl.
  ARM: Kirkwood: Convert dreamplug to pinctrl.
  ARM: Kirkwood: Convert dockstar to pinctrl.
  ...
---

77f9db89c928773e5fb1df0df4d13d5cc8abd178
diff --cc arch/arm/mach-exynos/include/mach/map.h
index 872840b2ff45,772acd344cbd..9f180aa3a848
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@@ -88,9 -88,10 +88,11 @@@
  #define EXYNOS4_PA_TWD			0x10500600
  #define EXYNOS4_PA_L2CC			0x10502000
  
+ #define EXYNOS4_PA_TMU			0x100C0000
+ 
  #define EXYNOS4_PA_MDMA0		0x10810000
  #define EXYNOS4_PA_MDMA1		0x12850000
 +#define EXYNOS4_PA_S_MDMA1		0x12840000
  #define EXYNOS4_PA_PDMA0		0x12680000
  #define EXYNOS4_PA_PDMA1		0x12690000
  #define EXYNOS5_PA_MDMA0		0x10800000