diff options
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/da830.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 3d70eae19b59..f52174af06c2 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c | |||
@@ -1178,7 +1178,6 @@ static struct davinci_timer_info da830_timer_info = { | |||
1178 | static struct davinci_soc_info davinci_soc_info_da830 = { | 1178 | static struct davinci_soc_info davinci_soc_info_da830 = { |
1179 | .io_desc = da830_io_desc, | 1179 | .io_desc = da830_io_desc, |
1180 | .io_desc_num = ARRAY_SIZE(da830_io_desc), | 1180 | .io_desc_num = ARRAY_SIZE(da830_io_desc), |
1181 | .jtag_id_base = IO_ADDRESS(DA8XX_JTAG_ID_REG), | ||
1182 | .ids = da830_ids, | 1181 | .ids = da830_ids, |
1183 | .ids_num = ARRAY_SIZE(da830_ids), | 1182 | .ids_num = ARRAY_SIZE(da830_ids), |
1184 | .cpu_clks = da830_clks, | 1183 | .cpu_clks = da830_clks, |
@@ -1204,6 +1203,8 @@ void __init da830_init(void) | |||
1204 | if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module")) | 1203 | if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module")) |
1205 | return; | 1204 | return; |
1206 | 1205 | ||
1206 | davinci_soc_info_da830.jtag_id_base = | ||
1207 | DA8XX_SYSCFG_VIRT(DA8XX_JTAG_ID_REG); | ||
1207 | davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG_VIRT(0x120); | 1208 | davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG_VIRT(0x120); |
1208 | 1209 | ||
1209 | davinci_common_init(&davinci_soc_info_da830); | 1210 | davinci_common_init(&davinci_soc_info_da830); |
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 54d1836f1224..f5c3a6a71315 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -793,7 +793,6 @@ static struct davinci_timer_info da850_timer_info = { | |||
793 | static struct davinci_soc_info davinci_soc_info_da850 = { | 793 | static struct davinci_soc_info davinci_soc_info_da850 = { |
794 | .io_desc = da850_io_desc, | 794 | .io_desc = da850_io_desc, |
795 | .io_desc_num = ARRAY_SIZE(da850_io_desc), | 795 | .io_desc_num = ARRAY_SIZE(da850_io_desc), |
796 | .jtag_id_base = IO_ADDRESS(DA8XX_JTAG_ID_REG), | ||
797 | .ids = da850_ids, | 796 | .ids = da850_ids, |
798 | .ids_num = ARRAY_SIZE(da850_ids), | 797 | .ids_num = ARRAY_SIZE(da850_ids), |
799 | .cpu_clks = da850_clks, | 798 | .cpu_clks = da850_clks, |
@@ -819,6 +818,8 @@ void __init da850_init(void) | |||
819 | if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module")) | 818 | if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module")) |
820 | return; | 819 | return; |
821 | 820 | ||
821 | davinci_soc_info_da850.jtag_id_base = | ||
822 | DA8XX_SYSCFG_VIRT(DA8XX_JTAG_ID_REG); | ||
822 | davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG_VIRT(0x120); | 823 | davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG_VIRT(0x120); |
823 | 824 | ||
824 | davinci_common_init(&davinci_soc_info_da850); | 825 | davinci_common_init(&davinci_soc_info_da850); |
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index 11d2079a8203..6f036506bc68 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h | |||
@@ -33,10 +33,10 @@ extern void __iomem *da8xx_syscfg_base; | |||
33 | 33 | ||
34 | #define DA8XX_SYSCFG_BASE (IO_PHYS + 0x14000) | 34 | #define DA8XX_SYSCFG_BASE (IO_PHYS + 0x14000) |
35 | #define DA8XX_SYSCFG_VIRT(x) (da8xx_syscfg_base + (x)) | 35 | #define DA8XX_SYSCFG_VIRT(x) (da8xx_syscfg_base + (x)) |
36 | #define DA8XX_JTAG_ID_REG 0x18 | ||
36 | 37 | ||
37 | #define DA8XX_PSC0_BASE 0x01c10000 | 38 | #define DA8XX_PSC0_BASE 0x01c10000 |
38 | #define DA8XX_PLL0_BASE 0x01c11000 | 39 | #define DA8XX_PLL0_BASE 0x01c11000 |
39 | #define DA8XX_JTAG_ID_REG 0x01c14018 | ||
40 | #define DA8XX_TIMER64P0_BASE 0x01c20000 | 40 | #define DA8XX_TIMER64P0_BASE 0x01c20000 |
41 | #define DA8XX_TIMER64P1_BASE 0x01c21000 | 41 | #define DA8XX_TIMER64P1_BASE 0x01c21000 |
42 | #define DA8XX_GPIO_BASE 0x01e26000 | 42 | #define DA8XX_GPIO_BASE 0x01e26000 |