diff options
Diffstat (limited to 'board/scalys/simc-t10xx/simc-t10xx.c')
| -rw-r--r-- | board/scalys/simc-t10xx/simc-t10xx.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/board/scalys/simc-t10xx/simc-t10xx.c b/board/scalys/simc-t10xx/simc-t10xx.c index f5b8a2c..46c5677 100644 --- a/board/scalys/simc-t10xx/simc-t10xx.c +++ b/board/scalys/simc-t10xx/simc-t10xx.c @@ -21,8 +21,6 @@ #include <fm_eth.h> #include <asm/processor.h> #include <asm/gpio.h> -#include <asm/mpc8xxx_gpio.h> -#include <dm/platform_data/gpio_mpc8xxx.h> #include <fsl_esdhc.h> #include <dm.h> #include "dragonfruit.h" @@ -43,13 +41,15 @@ int misc_init_r(void) int serdes_config; ccsr_gur_t __iomem *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); int ret; + + debug("t10xx: misc_init_r\n"); /* * Initialize and set the LED's on the module to indicate u-boot is alive * IFC_A30 : led green : GPIO2_30 * IFC_A31 : led red : GPIO2_31 */ - #define MODULE_LED_RED MPC8XXX_GPIO_NR(2, 31) - #define MODULE_LED_GREEN MPC8XXX_GPIO_NR(2, 30) + #define MODULE_LED_RED MPC85XX_GPIO_NR(2, 31) + #define MODULE_LED_GREEN MPC85XX_GPIO_NR(2, 30) gpio_request(MODULE_LED_RED, "module_led_red"); gpio_request(MODULE_LED_GREEN, "module_led_green"); @@ -74,22 +74,18 @@ int misc_init_r(void) } /* Platform data for the GPIOs */ -static const struct mpc8xxx_gpio_platdata gpio_platdata[] = { - { .regs = (ccsr_gpio_t*) CONFIG_SYS_MPC8XXX_GPIO1_ADDR, - .bank_name = "GPIO1_" }, - { .regs = (ccsr_gpio_t*) CONFIG_SYS_MPC8XXX_GPIO2_ADDR, - .bank_name = "GPIO2_" }, - { .regs = (ccsr_gpio_t*) CONFIG_SYS_MPC8XXX_GPIO3_ADDR, - .bank_name = "GPIO3_" }, - { .regs = (ccsr_gpio_t*) CONFIG_SYS_MPC8XXX_GPIO4_ADDR, - .bank_name = "GPIO4_" }, +static const struct mpc85xx_gpio_plat gpio_platdata[] = { + { .addr = 0x130000, .ngpios = 32 }, + { .addr = 0x131000, .ngpios = 32 }, + { .addr = 0x132000, .ngpios = 32 }, + { .addr = 0x133000, .ngpios = 32,}, }; -U_BOOT_DEVICES(mpc8xxx_gpios) = { - { "gpio-mpc8xxx", &gpio_platdata[0] }, - { "gpio-mpc8xxx", &gpio_platdata[1] }, - { "gpio-mpc8xxx", &gpio_platdata[2] }, - { "gpio-mpc8xxx", &gpio_platdata[3] }, +U_BOOT_DEVICES(mpc85xx_gpios) = { + { "gpio_mpc85xx", &gpio_platdata[0] }, + { "gpio_mpc85xx", &gpio_platdata[1] }, + { "gpio_mpc85xx", &gpio_platdata[2] }, + { "gpio_mpc85xx", &gpio_platdata[3] }, }; int ft_board_setup(void *blob, bd_t *bd) @@ -97,7 +93,7 @@ int ft_board_setup(void *blob, bd_t *bd) phys_addr_t base; phys_size_t size; - debug( "ft_board_setup\n" ); + debug( "t10xx: ft_board_setup\n" ); ft_cpu_setup(blob, bd); base = getenv_bootm_low(); @@ -144,4 +140,4 @@ void board_detail(void) { do_bcdinfo(); } -#endif
\ No newline at end of file +#endif |