board: pm9263: switch to use DM_ETH

Enable CONFIG_DM_ETH in configs/pm9263_defconfig
Drop legacy initialization in board/ronetix/pm9263.c
Remove network related setting from include/configs/pm9263.h

Signed-off-by: Ilko Iliev <iliev@ronetix.at>

diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 95c0dec4db5fafd860338c350077a145485ae38b..46494b043fa4fc4857226bc900b9fb7aad08269e 100644 (file)
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -19,10 +19,6 @@
 #include <asm/arch/at91_matrix.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
-#include <netdev.h>
 #include <asm/mach-types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -73,41 +69,6 @@ static void pm9263_nand_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_MACB
-static void pm9263_macb_hw_init(void)
-{
-       /*
-        * PB27 enables the 50MHz oscillator for Ethernet PHY
-        * 1 - enable
-        * 0 - disable
-        */
-       at91_set_pio_output(AT91_PIO_PORTB, 27, 1);
-       at91_set_pio_value(AT91_PIO_PORTB, 27, 1); /* 1- enable, 0 - disable */
-
-       at91_periph_clk_enable(ATMEL_ID_EMAC);
-
-       /*
-        * Disable pull-up on:
-        *      RXDV (PC25) => PHY normal mode (not Test mode)
-        *      ERX0 (PE25) => PHY ADDR0
-        *      ERX1 (PE26) => PHY ADDR1 => PHYADDR = 0x0
-        *
-        * PHY has internal pull-down
-        */
-
-       at91_set_pio_pullup(AT91_PIO_PORTC, 25, 0);
-       at91_set_pio_pullup(AT91_PIO_PORTE, 25, 0);
-       at91_set_pio_pullup(AT91_PIO_PORTE, 26, 0);
-
-       /* Re-enable pull-up */
-       at91_set_pio_pullup(AT91_PIO_PORTC, 25, 1);
-       at91_set_pio_pullup(AT91_PIO_PORTE, 25, 1);
-       at91_set_pio_pullup(AT91_PIO_PORTE, 26, 1);
-
-       at91_macb_hw_init();
-}
-#endif
-
 #ifdef CONFIG_LCD
 
 #ifdef CONFIG_LCD_IN_PSRAM
@@ -233,9 +194,6 @@ int board_init(void)
 #ifdef CONFIG_CMD_NAND
        pm9263_nand_hw_init();
 #endif
-#ifdef CONFIG_MACB
-       pm9263_macb_hw_init();
-#endif
 #ifdef CONFIG_USB_OHCI_NEW
        at91_uhp_hw_init();
 #endif
@@ -261,21 +219,6 @@ int dram_init_banksize(void)
        return 0;
 }
 
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-}
-#endif
-
-int board_eth_init(struct bd_info *bis)
-{
-       int rc = 0;
-#ifdef CONFIG_MACB
-       rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x01);
-#endif
-       return rc;
-}
-
 #ifdef CONFIG_DISPLAY_BOARDINFO
 int checkboard (void)
 {

diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 817a9847beb4182cf46ec0f91ff324e406a0bc83..ef18e742d2796025571b7a9af81729da5fe32283 100644 (file)
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -50,6 +50,8 @@ CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
 CONFIG_DM_SERIAL=y
 CONFIG_ATMEL_USART=y
 CONFIG_SPI=y

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 6c882b6ff94a3a4c6f3789e31f1cb0e1e3fcee33..7b028751bda4ee18d4fab835e3f826bd8f3703c7 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -204,12 +204,6 @@
                                         AT91_MATRIX_SCFG_DEFMSTR_TYPE_FIXED    | \
                                         AT91_MATRIX_SCFG_SLOT_CYCLE(255))
 
-/* Ethernet */
-#define CONFIG_MACB                    1
-#define CONFIG_RMII                    1
-#define CONFIG_NET_RETRY_COUNT         20
-#define CONFIG_RESET_PHY_R             1
-
 /* USB */
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB