diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-davinci/da830.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 19b2748357fc..c2224b968311 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c | |||
@@ -1184,7 +1184,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = { | |||
1184 | .cpu_clks = da830_clks, | 1184 | .cpu_clks = da830_clks, |
1185 | .psc_bases = da830_psc_bases, | 1185 | .psc_bases = da830_psc_bases, |
1186 | .psc_bases_num = ARRAY_SIZE(da830_psc_bases), | 1186 | .psc_bases_num = ARRAY_SIZE(da830_psc_bases), |
1187 | .pinmux_base = IO_ADDRESS(DA8XX_BOOT_CFG_BASE + 0x120), | 1187 | .pinmux_base = IO_ADDRESS(DA8XX_SYSCFG_BASE + 0x120), |
1188 | .pinmux_pins = da830_pins, | 1188 | .pinmux_pins = da830_pins, |
1189 | .pinmux_pins_num = ARRAY_SIZE(da830_pins), | 1189 | .pinmux_pins_num = ARRAY_SIZE(da830_pins), |
1190 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, | 1190 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, |
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 192d719a47df..18c33b6cbfdd 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -799,7 +799,7 @@ static struct davinci_soc_info davinci_soc_info_da850 = { | |||
799 | .cpu_clks = da850_clks, | 799 | .cpu_clks = da850_clks, |
800 | .psc_bases = da850_psc_bases, | 800 | .psc_bases = da850_psc_bases, |
801 | .psc_bases_num = ARRAY_SIZE(da850_psc_bases), | 801 | .psc_bases_num = ARRAY_SIZE(da850_psc_bases), |
802 | .pinmux_base = IO_ADDRESS(DA8XX_BOOT_CFG_BASE + 0x120), | 802 | .pinmux_base = IO_ADDRESS(DA8XX_SYSCFG_BASE + 0x120), |
803 | .pinmux_pins = da850_pins, | 803 | .pinmux_pins = da850_pins, |
804 | .pinmux_pins_num = ARRAY_SIZE(da850_pins), | 804 | .pinmux_pins_num = ARRAY_SIZE(da850_pins), |
805 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, | 805 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, |
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index 7576e8cb6d3b..1c42379a390d 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #define DA8XX_CP_INTC_SIZE SZ_8K | 29 | #define DA8XX_CP_INTC_SIZE SZ_8K |
30 | #define DA8XX_CP_INTC_VIRT (IO_VIRT - DA8XX_CP_INTC_SIZE - SZ_4K) | 30 | #define DA8XX_CP_INTC_VIRT (IO_VIRT - DA8XX_CP_INTC_SIZE - SZ_4K) |
31 | 31 | ||
32 | #define DA8XX_BOOT_CFG_BASE (IO_PHYS + 0x14000) | 32 | #define DA8XX_SYSCFG_BASE (IO_PHYS + 0x14000) |
33 | 33 | ||
34 | #define DA8XX_PSC0_BASE 0x01c10000 | 34 | #define DA8XX_PSC0_BASE 0x01c10000 |
35 | #define DA8XX_PLL0_BASE 0x01c11000 | 35 | #define DA8XX_PLL0_BASE 0x01c11000 |