diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:59:12 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 23:00:19 +0200 |
| commit | a1acbbf4adcd346f12fc567143eac90ef33f29b0 (patch) | |
| tree | 87b85a007a27f22958a4665536ad08962c53d6f7 /arch/arm/mach-dove/include/mach/dove.h | |
| parent | e190df2400db9ac749c77ffc054b8d8ec5cf3c47 (diff) | |
| parent | 6bba0caf5883ebc1430df38551bbb77ce05d4659 (diff) | |
| download | talos-op-linux-a1acbbf4adcd346f12fc567143eac90ef33f29b0.tar.gz talos-op-linux-a1acbbf4adcd346f12fc567143eac90ef33f29b0.zip | |
Merge branch 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards
From Kukjin Kim <kgene.kim@samsung.com>:
The branch includes updating each Samsung boards such as SMDK4X12,
Aquila, Goni and so on, and it is for audio platform device and
supporting of HSOTG or framebuffer.
* 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: S5PV210: Add audio platform device in Goni board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-dove/include/mach/dove.h')
| -rw-r--r-- | arch/arm/mach-dove/include/mach/dove.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h index ad1165d488c1..d52b0ef313b7 100644 --- a/arch/arm/mach-dove/include/mach/dove.h +++ b/arch/arm/mach-dove/include/mach/dove.h @@ -78,6 +78,7 @@ /* North-South Bridge */ #define BRIDGE_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0x20000) +#define BRIDGE_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0x20000) /* Cryptographic Engine */ #define DOVE_CRYPT_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE | 0x30000) |
