diff options
author | Tom Rini <trini@konsulko.com> | 2015-07-23 11:46:05 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-07-23 11:46:05 -0400 |
commit | 413978d118bb7d7b0a8488d97d802f2899cd81ce (patch) | |
tree | a0a42850eb5a9a13f2afa837b23582e23b4018a1 /arch/arm/mach-uniphier/include/mach/sc-regs.h | |
parent | 3c9cc70d7153da442575112d9a2643eecd17d534 (diff) | |
parent | 62102bee1ff32e7eda8b31558b0b646df74fecfd (diff) | |
download | talos-obmc-uboot-413978d118bb7d7b0a8488d97d802f2899cd81ce.tar.gz talos-obmc-uboot-413978d118bb7d7b0a8488d97d802f2899cd81ce.zip |
Merge git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/include/mach/sc-regs.h')
-rw-r--r-- | arch/arm/mach-uniphier/include/mach/sc-regs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/sc-regs.h b/arch/arm/mach-uniphier/include/mach/sc-regs.h index 20878e2d1c..df50294077 100644 --- a/arch/arm/mach-uniphier/include/mach/sc-regs.h +++ b/arch/arm/mach-uniphier/include/mach/sc-regs.h @@ -1,7 +1,7 @@ /* * UniPhier SC (System Control) block registers * - * Copyright (C) 2011-2015 Panasonic Corporation + * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,7 +9,11 @@ #ifndef ARCH_SC_REGS_H #define ARCH_SC_REGS_H +#if defined(CONFIG_MACH_PH1_SLD3) +#define SC_BASE_ADDR 0xf1840000 +#else #define SC_BASE_ADDR 0x61840000 +#endif #define SC_DPLLCTRL (SC_BASE_ADDR | 0x1200) #define SC_DPLLCTRL_SSC_EN (0x1 << 31) |