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/sg-regs.h | |
| parent | 3c9cc70d7153da442575112d9a2643eecd17d534 (diff) | |
| parent | 62102bee1ff32e7eda8b31558b0b646df74fecfd (diff) | |
Merge git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/include/mach/sg-regs.h')
| -rw-r--r-- | arch/arm/mach-uniphier/include/mach/sg-regs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/sg-regs.h b/arch/arm/mach-uniphier/include/mach/sg-regs.h index a65f058ee2..43a6c35339 100644 --- a/arch/arm/mach-uniphier/include/mach/sg-regs.h +++ b/arch/arm/mach-uniphier/include/mach/sg-regs.h @@ -55,11 +55,12 @@ #if defined(CONFIG_MACH_PH1_PRO4) # define SG_PINCTRL(n) (SG_PINCTRL_BASE + (n) * 8) -#elif defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8) +#elif defined(CONFIG_MACH_PH1_SLD3) || defined(CONFIG_MACH_PH1_LD4) || \ + defined(CONFIG_MACH_PH1_SLD8) # define SG_PINCTRL(n) (SG_PINCTRL_BASE + (n) * 4) #endif -#if defined(CONFIG_MACH_PH1_PRO4) +#if defined(CONFIG_MACH_PH1_SLD3) || defined(CONFIG_MACH_PH1_PRO4) #define SG_PINSELBITS 4 #elif defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8) #define SG_PINSELBITS 8 |