LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?I 

Mostly automatic with:
    sed -i -e 's/CONFIG_\(SUN[45678]I\)/CONFIG_MACH_\1/g' $(git grep -l CONFIG_SUN[45678]I)
followed by removing the relevant #defines from include/configs/sun?i.h by
hand.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Ian Campbell 2014-10-24 21:20:47 +01:00 committed by Hans de Goede
parent 4ce9941d2d
commit ed41e62f51
17 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/cpu/armv7/sunxi/Makefile
View File

@ -11,13 +11,13 @@ obj-y += timer.o
obj-y += board.o obj-y += board.o
obj-y += clock.o obj-y += clock.o
obj-y += pinmux.o obj-y += pinmux.o
obj-$(CONFIG_SUN6I) += prcm.o obj-$(CONFIG_MACH_SUN6I) += prcm.o
obj-$(CONFIG_SUN8I) += prcm.o obj-$(CONFIG_MACH_SUN8I) += prcm.o
obj-$(CONFIG_SUN4I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o
obj-$(CONFIG_SUN5I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN5I) += clock_sun4i.o
obj-$(CONFIG_SUN6I) += clock_sun6i.o obj-$(CONFIG_MACH_SUN6I) += clock_sun6i.o
obj-$(CONFIG_SUN7I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN7I) += clock_sun4i.o
obj-$(CONFIG_SUN8I) += clock_sun6i.o obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
obj-y += cpu_info.o obj-y += cpu_info.o
@ -27,9 +27,9 @@ endif
endif endif
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SUN4I) += dram.o obj-$(CONFIG_MACH_SUN4I) += dram.o
obj-$(CONFIG_SUN5I) += dram.o obj-$(CONFIG_MACH_SUN5I) += dram.o
obj-$(CONFIG_SUN7I) += dram.o obj-$(CONFIG_MACH_SUN7I) += dram.o
ifdef CONFIG_SPL_FEL ifdef CONFIG_SPL_FEL
obj-y += start.o obj-y += start.o
endif endif

20
arch/arm/cpu/armv7/sunxi/board.c
View File

@ -51,7 +51,7 @@ u32 spl_boot_mode(void)
int gpio_init(void) int gpio_init(void)
{ {
#if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F) #if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F)
#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I)
/* disable GPB22,23 as uart0 tx,rx to avoid conflict */ /* disable GPB22,23 as uart0 tx,rx to avoid conflict */
sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUNXI_GPIO_INPUT); sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUNXI_GPIO_INPUT);
sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUNXI_GPIO_INPUT); sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUNXI_GPIO_INPUT);
@ -59,23 +59,23 @@ int gpio_init(void)
sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF2_UART0_TX); sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF2_UART0_TX);
sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF4_UART0_RX); sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF4_UART0_RX);
sunxi_gpio_set_pull(SUNXI_GPF(4), 1); sunxi_gpio_set_pull(SUNXI_GPF(4), 1);
#elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_SUN4I) || defined(CONFIG_SUN7I)) #elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I))
sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUN4I_GPB22_UART0_TX); sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUN4I_GPB22_UART0_TX);
sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUN4I_GPB23_UART0_RX); sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUN4I_GPB23_UART0_RX);
sunxi_gpio_set_pull(SUNXI_GPB(23), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(SUNXI_GPB(23), SUNXI_GPIO_PULL_UP);
#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_SUN5I) #elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUN5I)
sunxi_gpio_set_cfgpin(SUNXI_GPB(19), SUN5I_GPB19_UART0_TX); sunxi_gpio_set_cfgpin(SUNXI_GPB(19), SUN5I_GPB19_UART0_TX);
sunxi_gpio_set_cfgpin(SUNXI_GPB(20), SUN5I_GPB20_UART0_RX); sunxi_gpio_set_cfgpin(SUNXI_GPB(20), SUN5I_GPB20_UART0_RX);
sunxi_gpio_set_pull(SUNXI_GPB(20), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(SUNXI_GPB(20), SUNXI_GPIO_PULL_UP);
#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_SUN6I) #elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUN6I)
sunxi_gpio_set_cfgpin(SUNXI_GPH(20), SUN6I_GPH20_UART0_TX); sunxi_gpio_set_cfgpin(SUNXI_GPH(20), SUN6I_GPH20_UART0_TX);
sunxi_gpio_set_cfgpin(SUNXI_GPH(21), SUN6I_GPH21_UART0_RX); sunxi_gpio_set_cfgpin(SUNXI_GPH(21), SUN6I_GPH21_UART0_RX);
sunxi_gpio_set_pull(SUNXI_GPH(21), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(SUNXI_GPH(21), SUNXI_GPIO_PULL_UP);
#elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_SUN5I) #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG3_UART1_TX); sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG3_UART1_TX);
sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG4_UART1_RX); sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG4_UART1_RX);
sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
#elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_SUN8I) #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I)
sunxi_gpio_set_cfgpin(SUNXI_GPL(2), SUN8I_GPL2_R_UART_TX); sunxi_gpio_set_cfgpin(SUNXI_GPL(2), SUN8I_GPL2_R_UART_TX);
sunxi_gpio_set_cfgpin(SUNXI_GPL(3), SUN8I_GPL3_R_UART_RX); sunxi_gpio_set_cfgpin(SUNXI_GPL(3), SUN8I_GPL3_R_UART_RX);
sunxi_gpio_set_pull(SUNXI_GPL(3), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(SUNXI_GPL(3), SUNXI_GPIO_PULL_UP);
@ -88,7 +88,7 @@ int gpio_init(void)
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
{ {
#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I)
static const struct sunxi_wdog *wdog = static const struct sunxi_wdog *wdog =
&((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog; &((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog;
@ -100,7 +100,7 @@ void reset_cpu(ulong addr)
/* sun5i sometimes gets stuck without this */ /* sun5i sometimes gets stuck without this */
writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode); writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode);
} }
#else /* CONFIG_SUN6I || CONFIG_SUN8I || .. */ #else /* CONFIG_MACH_SUN6I || CONFIG_MACH_SUN8I || .. */
static const struct sunxi_wdog *wdog = static const struct sunxi_wdog *wdog =
((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog; ((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog;
@ -114,8 +114,8 @@ void reset_cpu(ulong addr)
/* do some early init */ /* do some early init */
void s_init(void) void s_init(void)
{ {
#if !defined CONFIG_SPL_BUILD && (defined CONFIG_SUN7I || \ #if !defined CONFIG_SPL_BUILD && (defined CONFIG_MACH_SUN7I || \
defined CONFIG_SUN6I || defined CONFIG_SUN8I) defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I)
/* Enable SMP mode for CPU0, by setting bit 6 of Auxiliary Ctl reg */ /* Enable SMP mode for CPU0, by setting bit 6 of Auxiliary Ctl reg */
asm volatile( asm volatile(
"mrc p15, 0, r0, c1, c0, 1\n" "mrc p15, 0, r0, c1, c0, 1\n"

2
arch/arm/cpu/armv7/sunxi/clock_sun4i.c
View File

@ -35,7 +35,7 @@ void clock_init_safe(void)
APB0_DIV_1 << APB0_DIV_SHIFT | APB0_DIV_1 << APB0_DIV_SHIFT |
CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT, CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
&ccm->cpu_ahb_apb0_cfg); &ccm->cpu_ahb_apb0_cfg);
#ifdef CONFIG_SUN7I #ifdef CONFIG_MACH_SUN7I
setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_DMA); setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_DMA);
#endif #endif
writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg); writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg);

10
arch/arm/cpu/armv7/sunxi/cpu_info.c
View File

@ -13,9 +13,9 @@
#ifdef CONFIG_DISPLAY_CPUINFO #ifdef CONFIG_DISPLAY_CPUINFO
int print_cpuinfo(void) int print_cpuinfo(void)
{ {
#ifdef CONFIG_SUN4I #ifdef CONFIG_MACH_SUN4I
puts("CPU: Allwinner A10 (SUN4I)\n"); puts("CPU: Allwinner A10 (SUN4I)\n");
#elif defined CONFIG_SUN5I #elif defined CONFIG_MACH_SUN5I
u32 val = readl(SUNXI_SID_BASE + 0x08); u32 val = readl(SUNXI_SID_BASE + 0x08);
switch ((val >> 12) & 0xf) { switch ((val >> 12) & 0xf) {
case 0: puts("CPU: Allwinner A12 (SUN5I)\n"); break; case 0: puts("CPU: Allwinner A12 (SUN5I)\n"); break;
@ -23,11 +23,11 @@ int print_cpuinfo(void)
case 7: puts("CPU: Allwinner A10s (SUN5I)\n"); break; case 7: puts("CPU: Allwinner A10s (SUN5I)\n"); break;
default: puts("CPU: Allwinner A1X (SUN5I)\n"); default: puts("CPU: Allwinner A1X (SUN5I)\n");
} }
#elif defined CONFIG_SUN6I #elif defined CONFIG_MACH_SUN6I
puts("CPU: Allwinner A31 (SUN6I)\n"); puts("CPU: Allwinner A31 (SUN6I)\n");
#elif defined CONFIG_SUN7I #elif defined CONFIG_MACH_SUN7I
puts("CPU: Allwinner A20 (SUN7I)\n"); puts("CPU: Allwinner A20 (SUN7I)\n");
#elif defined CONFIG_SUN8I #elif defined CONFIG_MACH_SUN8I
puts("CPU: Allwinner A23 (SUN8I)\n"); puts("CPU: Allwinner A23 (SUN8I)\n");
#else #else
#warning Please update cpu_info.c with correct CPU information #warning Please update cpu_info.c with correct CPU information

34
arch/arm/cpu/armv7/sunxi/dram.c
View File

@ -74,7 +74,7 @@ static void mctl_ddr3_reset(void)
struct sunxi_dram_reg *dram = struct sunxi_dram_reg *dram =
(struct sunxi_dram_reg *)SUNXI_DRAMC_BASE; (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
#ifdef CONFIG_SUN4I #ifdef CONFIG_MACH_SUN4I
struct sunxi_timer_reg *timer = struct sunxi_timer_reg *timer =
(struct sunxi_timer_reg *)SUNXI_TIMER_BASE; (struct sunxi_timer_reg *)SUNXI_TIMER_BASE;
u32 reg_val; u32 reg_val;
@ -113,7 +113,7 @@ static void mctl_set_drive(void)
{ {
struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE; struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
#ifdef CONFIG_SUN7I #ifdef CONFIG_MACH_SUN7I
clrsetbits_le32(&dram->mcr, DRAM_MCR_MODE_NORM(0x3) | (0x3 << 28), clrsetbits_le32(&dram->mcr, DRAM_MCR_MODE_NORM(0x3) | (0x3 << 28),
#else #else
clrsetbits_le32(&dram->mcr, DRAM_MCR_MODE_NORM(0x3), clrsetbits_le32(&dram->mcr, DRAM_MCR_MODE_NORM(0x3),
@ -202,7 +202,7 @@ static void mctl_enable_dllx(u32 phase)
} }
static u32 hpcr_value[32] = { static u32 hpcr_value[32] = {
#ifdef CONFIG_SUN5I #ifdef CONFIG_MACH_SUN5I
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@ -212,7 +212,7 @@ static u32 hpcr_value[32] = {
0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301,
0x0301, 0x0301, 0x0301, 0 0x0301, 0x0301, 0x0301, 0
#endif #endif
#ifdef CONFIG_SUN4I #ifdef CONFIG_MACH_SUN4I
0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301,
0x0301, 0x0301, 0, 0, 0x0301, 0x0301, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@ -222,7 +222,7 @@ static u32 hpcr_value[32] = {
0x1035, 0x1031, 0x0731, 0x1035, 0x1035, 0x1031, 0x0731, 0x1035,
0x1031, 0x0301, 0x0301, 0x0731 0x1031, 0x0301, 0x0301, 0x0731
#endif #endif
#ifdef CONFIG_SUN7I #ifdef CONFIG_MACH_SUN7I
0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301,
0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301, 0x0301,
0, 0, 0, 0, 0, 0, 0, 0,
@ -304,7 +304,7 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk)
setbits_le32(&ccm->pll5_cfg, CCM_PLL5_CTRL_DDR_CLK); setbits_le32(&ccm->pll5_cfg, CCM_PLL5_CTRL_DDR_CLK);
#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I)
/* reset GPS */ /* reset GPS */
clrbits_le32(&ccm->gps_clk_cfg, CCM_GPS_CTRL_RESET | CCM_GPS_CTRL_GATE); clrbits_le32(&ccm->gps_clk_cfg, CCM_GPS_CTRL_RESET | CCM_GPS_CTRL_GATE);
setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_GPS); setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_GPS);
@ -318,7 +318,7 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk)
/* PLL5P and PLL6 are the potential clock sources for MBUS */ /* PLL5P and PLL6 are the potential clock sources for MBUS */
pll6x_clk = clock_get_pll6() / 1000000; pll6x_clk = clock_get_pll6() / 1000000;
#ifdef CONFIG_SUN7I #ifdef CONFIG_MACH_SUN7I
pll6x_clk *= 2; /* sun7i uses PLL6*2, sun5i uses just PLL6 */ pll6x_clk *= 2; /* sun7i uses PLL6*2, sun5i uses just PLL6 */
#endif #endif
pll5p_clk = clock_get_pll5p() / 1000000; pll5p_clk = clock_get_pll5p() / 1000000;
@ -348,7 +348,7 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk)
* open DRAMC AHB & DLL register clock * open DRAMC AHB & DLL register clock
* close it first * close it first
*/ */
#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I)
clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM | CCM_AHB_GATE_DLL); clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM | CCM_AHB_GATE_DLL);
#else #else
clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM); clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM);
@ -356,7 +356,7 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk)
udelay(22); udelay(22);
/* then open it */ /* then open it */
#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I)
setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM | CCM_AHB_GATE_DLL); setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM | CCM_AHB_GATE_DLL);
#else #else
setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM); setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM);
@ -417,7 +417,7 @@ static int dramc_scan_readpipe(void)
static void dramc_clock_output_en(u32 on) static void dramc_clock_output_en(u32 on)
{ {
#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I)
struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE; struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
if (on) if (on)
@ -425,7 +425,7 @@ static void dramc_clock_output_en(u32 on)
else else
clrbits_le32(&dram->mcr, DRAM_MCR_DCLK_OUT); clrbits_le32(&dram->mcr, DRAM_MCR_DCLK_OUT);
#endif #endif
#ifdef CONFIG_SUN4I #ifdef CONFIG_MACH_SUN4I
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
if (on) if (on)
setbits_le32(&ccm->dram_clk_cfg, CCM_DRAM_CTRL_DCLK_OUT); setbits_le32(&ccm->dram_clk_cfg, CCM_DRAM_CTRL_DCLK_OUT);
@ -527,7 +527,7 @@ static void mctl_set_impedance(u32 zq, u32 odt_en)
u32 reg_val; u32 reg_val;
u32 zprog = zq & 0xFF, zdata = (zq >> 8) & 0xFFFFF; u32 zprog = zq & 0xFF, zdata = (zq >> 8) & 0xFFFFF;
#ifndef CONFIG_SUN7I #ifndef CONFIG_MACH_SUN7I
/* Appears that some kind of automatically initiated default /* Appears that some kind of automatically initiated default
* ZQ calibration is already in progress at this point on sun4i/sun5i * ZQ calibration is already in progress at this point on sun4i/sun5i
* hardware, but not on sun7i. So it is reasonable to wait for its * hardware, but not on sun7i. So it is reasonable to wait for its
@ -539,7 +539,7 @@ static void mctl_set_impedance(u32 zq, u32 odt_en)
if (!odt_en) if (!odt_en)
return; return;
#ifdef CONFIG_SUN7I #ifdef CONFIG_MACH_SUN7I
/* Enabling ODT in SDR_IOCR on sun7i hardware results in a deadlock /* Enabling ODT in SDR_IOCR on sun7i hardware results in a deadlock
* unless bit 24 is set in SDR_ZQCR1. Not much is known about the * unless bit 24 is set in SDR_ZQCR1. Not much is known about the
* SDR_ZQCR1 register, but there are hints indicating that it might * SDR_ZQCR1 register, but there are hints indicating that it might
@ -597,7 +597,7 @@ static unsigned long dramc_init_helper(struct dram_para *para)
/* dram clock off */ /* dram clock off */
dramc_clock_output_en(0); dramc_clock_output_en(0);
#ifdef CONFIG_SUN4I #ifdef CONFIG_MACH_SUN4I
/* select dram controller 1 */ /* select dram controller 1 */
writel(DRAM_CSEL_MAGIC, &dram->csel); writel(DRAM_CSEL_MAGIC, &dram->csel);
#endif #endif
@ -654,7 +654,7 @@ static unsigned long dramc_init_helper(struct dram_para *para)
writel(para->tpr2, &dram->tpr2); writel(para->tpr2, &dram->tpr2);
reg_val = DRAM_MR_BURST_LENGTH(0x0); reg_val = DRAM_MR_BURST_LENGTH(0x0);
#if (defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I)) #if (defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I))
reg_val |= DRAM_MR_POWER_DOWN; reg_val |= DRAM_MR_POWER_DOWN;
#endif #endif
reg_val |= DRAM_MR_CAS_LAT(para->cas - 4); reg_val |= DRAM_MR_CAS_LAT(para->cas - 4);
@ -668,7 +668,7 @@ static unsigned long dramc_init_helper(struct dram_para *para)
/* disable drift compensation and set passive DQS window mode */ /* disable drift compensation and set passive DQS window mode */
clrsetbits_le32(&dram->ccr, DRAM_CCR_DQS_DRIFT_COMP, DRAM_CCR_DQS_GATE); clrsetbits_le32(&dram->ccr, DRAM_CCR_DQS_DRIFT_COMP, DRAM_CCR_DQS_GATE);
#ifdef CONFIG_SUN7I #ifdef CONFIG_MACH_SUN7I
/* Command rate timing mode 2T & 1T */ /* Command rate timing mode 2T & 1T */
if (para->tpr4 & 0x1) if (para->tpr4 & 0x1)
setbits_le32(&dram->ccr, DRAM_CCR_COMMAND_RATE_1T); setbits_le32(&dram->ccr, DRAM_CCR_COMMAND_RATE_1T);
@ -718,7 +718,7 @@ unsigned long dramc_init(struct dram_para *para)
/* try to autodetect the DRAM bus width and density */ /* try to autodetect the DRAM bus width and density */
para->io_width = 16; para->io_width = 16;
para->bus_width = 32; para->bus_width = 32;
#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN5I) #if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN5I)
/* only A0-A14 address lines on A10/A13, limiting max density to 4096 */ /* only A0-A14 address lines on A10/A13, limiting max density to 4096 */
para->density = 4096; para->density = 4096;
#else #else

2
arch/arm/include/asm/arch-sunxi/clock.h
View File

@ -15,7 +15,7 @@
#define CLK_GATE_CLOSE 0x0 #define CLK_GATE_CLOSE 0x0
/* clock control module regs definition */ /* clock control module regs definition */
#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I) #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I)
#include <asm/arch/clock_sun6i.h> #include <asm/arch/clock_sun6i.h>
#else #else
#include <asm/arch/clock_sun4i.h> #include <asm/arch/clock_sun4i.h>

2
arch/arm/include/asm/arch-sunxi/gpio.h
View File

@ -155,7 +155,7 @@ enum sunxi_gpio_number {
#define SUNXI_GPF2_SDC0 2 #define SUNXI_GPF2_SDC0 2
#ifdef CONFIG_SUN8I #ifdef CONFIG_MACH_SUN8I
#define SUNXI_GPF2_UART0_TX 3 #define SUNXI_GPF2_UART0_TX 3
#define SUNXI_GPF4_UART0_RX 3 #define SUNXI_GPF4_UART0_RX 3
#else #else

2
arch/arm/include/asm/arch-sunxi/mmc.h
View File

@ -43,7 +43,7 @@ struct sunxi_mmc {
u32 chda; /* 0x90 */ u32 chda; /* 0x90 */
u32 cbda; /* 0x94 */ u32 cbda; /* 0x94 */
u32 res1[26]; u32 res1[26];
#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I) #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I)
u32 res2[64]; u32 res2[64];
#endif #endif
u32 fifo; /* 0x100 (0x200 on sun6i) FIFO access address */ u32 fifo; /* 0x100 (0x200 on sun6i) FIFO access address */

4
arch/arm/include/asm/arch-sunxi/timer.h
View File

@ -67,7 +67,7 @@ struct sunxi_timer_reg {
struct sunxi_timer timer[6]; /* We have 6 timers */ struct sunxi_timer timer[6]; /* We have 6 timers */
u8 res2[16]; u8 res2[16];
struct sunxi_avs avs; struct sunxi_avs avs;
#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I)
struct sunxi_wdog wdog; /* 0x90 */ struct sunxi_wdog wdog; /* 0x90 */
/* XXX the following is not accurate for sun5i/sun7i */ /* XXX the following is not accurate for sun5i/sun7i */
struct sunxi_64cnt cnt64; /* 0xa0 */ struct sunxi_64cnt cnt64; /* 0xa0 */
@ -77,7 +77,7 @@ struct sunxi_timer_reg {
struct sunxi_tgp tgp[4]; struct sunxi_tgp tgp[4];
u8 res5[8]; u8 res5[8];
u32 cpu_cfg; u32 cpu_cfg;
#else /* CONFIG_SUN6I || CONFIG_SUN8I || ... */ #else /* CONFIG_MACH_SUN6I || CONFIG_MACH_SUN8I || ... */
u8 res3[16]; u8 res3[16];
struct sunxi_wdog wdog[5]; /* We have 5 watchdogs */ struct sunxi_wdog wdog[5]; /* We have 5 watchdogs */
#endif #endif

2
arch/arm/include/asm/arch-sunxi/watchdog.h
View File

@ -13,7 +13,7 @@
#define WDT_CTRL_RESTART (0x1 << 0) #define WDT_CTRL_RESTART (0x1 << 0)
#define WDT_CTRL_KEY (0x0a57 << 1) #define WDT_CTRL_KEY (0x0a57 << 1)
#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I) #if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN5I) || defined(CONFIG_MACH_SUN7I)
#define WDT_MODE_EN (0x1 << 0) #define WDT_MODE_EN (0x1 << 0)
#define WDT_MODE_RESET_EN (0x1 << 1) #define WDT_MODE_RESET_EN (0x1 << 1)

4
drivers/mmc/sunxi_mmc.c
View File

@ -75,7 +75,7 @@ static int mmc_clk_io_on(int sdc_no)
/* config ahb clock */ /* config ahb clock */
setbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_MMC(sdc_no)); setbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_MMC(sdc_no));
#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I) #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I)
/* unassert reset */ /* unassert reset */
setbits_le32(&ccm->ahb_reset0_cfg, 1 << AHB_RESET_OFFSET_MMC(sdc_no)); setbits_le32(&ccm->ahb_reset0_cfg, 1 << AHB_RESET_OFFSET_MMC(sdc_no));
#endif #endif
@ -385,7 +385,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)
cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
cfg->host_caps = MMC_MODE_4BIT; cfg->host_caps = MMC_MODE_4BIT;
cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN7I) || defined(CONFIG_SUN8I) #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || defined(CONFIG_MACH_SUN8I)
cfg->host_caps |= MMC_MODE_HC; cfg->host_caps |= MMC_MODE_HC;
#endif #endif
cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;

2
drivers/usb/host/ehci-sunxi.c
View File

@ -105,7 +105,7 @@ static void sunxi_usb_phy_init(struct sunxi_ehci_hcd *sunxi_ehci)
usb_phy_write(sunxi_ehci, 0x20, 0x14, 5); usb_phy_write(sunxi_ehci, 0x20, 0x14, 5);
/* threshold adjustment disconnect */ /* threshold adjustment disconnect */
#ifdef CONFIG_SUN4I #ifdef CONFIG_MACH_SUN4I
usb_phy_write(sunxi_ehci, 0x2a, 3, 2); usb_phy_write(sunxi_ehci, 0x2a, 3, 2);
#else #else
usb_phy_write(sunxi_ehci, 0x2a, 2, 2); usb_phy_write(sunxi_ehci, 0x2a, 2, 2);

1
include/configs/sun4i.h
View File

@ -11,7 +11,6 @@
/* /*
* A10 specific configuration * A10 specific configuration
*/ */
#define CONFIG_SUN4I /* sun4i SoC generation */
#define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_CLK_FULL_SPEED 1008000000
#define CONFIG_SYS_PROMPT "sun4i# " #define CONFIG_SYS_PROMPT "sun4i# "

1
include/configs/sun5i.h
View File

@ -11,7 +11,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_SUN5I /* sun5i SoC generation */
#define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_CLK_FULL_SPEED 1008000000
#define CONFIG_SYS_PROMPT "sun5i# " #define CONFIG_SYS_PROMPT "sun5i# "

1
include/configs/sun6i.h
View File

@ -14,7 +14,6 @@
/* /*
* A31 specific configuration * A31 specific configuration
*/ */
#define CONFIG_SUN6I /* sun6i SoC generation */
#define CONFIG_SYS_PROMPT "sun6i# " #define CONFIG_SYS_PROMPT "sun6i# "

1
include/configs/sun7i.h
View File

@ -12,7 +12,6 @@
/* /*
* A20 specific configuration * A20 specific configuration
*/ */
#define CONFIG_SUN7I /* sun7i SoC generation */
#define CONFIG_CLK_FULL_SPEED 912000000 #define CONFIG_CLK_FULL_SPEED 912000000
#define CONFIG_SYS_PROMPT "sun7i# " #define CONFIG_SYS_PROMPT "sun7i# "

1
include/configs/sun8i.h
View File

@ -12,7 +12,6 @@
/* /*
* A23 specific configuration * A23 specific configuration
*/ */
#define CONFIG_SUN8I /* sun8i SoC generation */
#define CONFIG_SYS_PROMPT "sun8i# " #define CONFIG_SYS_PROMPT "sun8i# "
/* /*