projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' into cleanups
[platform/kernel/u-boot.git]
/
board
/
atmel
/
atstk1000
/
atstk1000.c
diff --git
a/board/atmel/atstk1000/atstk1000.c
b/board/atmel/atstk1000/atstk1000.c
index
496c6a8
..
c36cb57
100644
(file)
--- a/
board/atmel/atstk1000/atstk1000.c
+++ b/
board/atmel/atstk1000/atstk1000.c
@@
-24,8
+24,9
@@
#include <asm/io.h>
#include <asm/sdram.h>
#include <asm/arch/clk.h>
#include <asm/io.h>
#include <asm/sdram.h>
#include <asm/arch/clk.h>
-#include <asm/arch/gpio.h>
#include <asm/arch/hmatrix.h>
#include <asm/arch/hmatrix.h>
+#include <asm/arch/portmux.h>
+#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-77,14
+78,14
@@
int board_early_init_f(void)
/* Enable SDRAM in the EBI mux */
hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE));
/* Enable SDRAM in the EBI mux */
hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE));
-
gpio_enable_ebi(
);
-
gpio_enable_usart1(
);
+
portmux_enable_ebi(sdram_config.data_bits, 23, 0, PORTMUX_DRIVE_HIGH
);
+
portmux_enable_usart1(PORTMUX_DRIVE_MIN
);
#if defined(CONFIG_MACB)
#if defined(CONFIG_MACB)
-
gpio_enable_macb0(
);
-
gpio_enable_macb1(
);
+
portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW
);
+
portmux_enable_macb1(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW
);
#endif
#if defined(CONFIG_MMC)
#endif
#if defined(CONFIG_MMC)
-
gpio_enable_mmci(
);
+
portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW
);
#endif
return 0;
#endif
return 0;
@@
-104,20
+105,19
@@
phys_size_t initdram(int board_type)
unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
if (expected_size != actual_size)
unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
if (expected_size != actual_size)
- printf("Warning: Only %
u of %
u MiB SDRAM is working\n",
+ printf("Warning: Only %
lu of %l
u MiB SDRAM is working\n",
actual_size >> 20, expected_size >> 20);
return actual_size;
}
actual_size >> 20, expected_size >> 20);
return actual_size;
}
-
void board_init_info
(void)
+
int board_early_init_r
(void)
{
gd->bd->bi_phy_id[0] = 0x10;
gd->bd->bi_phy_id[1] = 0x11;
{
gd->bd->bi_phy_id[0] = 0x10;
gd->bd->bi_phy_id[1] = 0x11;
+ return 0;
}
}
-extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
-
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bi)
{
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bi)
{