From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Andreas_Bie=C3=9Fmann?= Date: Mon, 06 Feb 2017 10:11:29 +0100 Subject: [U-Boot] [PATCH v2 6/8] board: sama5d4ek: clean up code In-Reply-To: <1477639009-10675-7-git-send-email-wenyou.yang@atmel.com> References: <1477639009-10675-1-git-send-email-wenyou.yang@atmel.com> <1477639009-10675-7-git-send-email-wenyou.yang@atmel.com> Message-ID: <93d31a4568b6ee07e8440a82b0021d7c@biessmann.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2016-10-28 09:16, Wenyou Yang wrote: > Since the introduction of the pinctrl and clk driver and > the dts file, remove unneeded hard coded related code from > the board file. > > Signed-off-by: Wenyou Yang Reviewed-by: Andreas Bie?mann > --- > > Changes in v2: > - Restore the wrong removal USB related code. > - Update the commit log. > > board/atmel/sama5d4ek/sama5d4ek.c | 88 > +-------------------------------------- > 1 file changed, 1 insertion(+), 87 deletions(-) > > diff --git a/board/atmel/sama5d4ek/sama5d4ek.c > b/board/atmel/sama5d4ek/sama5d4ek.c > index a0e4bb7..c5479e7 100644 > --- a/board/atmel/sama5d4ek/sama5d4ek.c > +++ b/board/atmel/sama5d4ek/sama5d4ek.c > @@ -16,48 +16,14 @@ > #include > #include > #include > -#include > #include > -#include > #include > #include > #include > -#include > #include > > DECLARE_GLOBAL_DATA_PTR; > > -#ifdef CONFIG_ATMEL_SPI > -#ifndef CONFIG_DM_SPI > -int spi_cs_is_valid(unsigned int bus, unsigned int cs) > -{ > - return bus == 0 && cs == 0; > -} > -#endif > - > -void spi_cs_activate(struct spi_slave *slave) > -{ > - at91_set_pio_output(AT91_PIO_PORTC, 3, 0); > -} > - > -void spi_cs_deactivate(struct spi_slave *slave) > -{ > - at91_set_pio_output(AT91_PIO_PORTC, 3, 1); > -} > - > -static void sama5d4ek_spi0_hw_init(void) > -{ > - at91_pio3_set_a_periph(AT91_PIO_PORTC, 0, 0); /* SPI0_MISO */ > - at91_pio3_set_a_periph(AT91_PIO_PORTC, 1, 0); /* SPI0_MOSI */ > - at91_pio3_set_a_periph(AT91_PIO_PORTC, 2, 0); /* SPI0_SPCK */ > - > - at91_set_pio_output(AT91_PIO_PORTC, 3, 1); /* SPI0_CS0 */ > - > - /* Enable clock */ > - at91_periph_clk_enable(ATMEL_ID_SPI0); > -} > -#endif /* CONFIG_ATMEL_SPI */ > - > #ifdef CONFIG_NAND_ATMEL > static void sama5d4ek_nand_hw_init(void) > { > @@ -198,42 +164,6 @@ void lcd_show_board_info(void) > > #endif /* CONFIG_LCD */ > > -#ifdef CONFIG_GENERIC_ATMEL_MCI > -void sama5d4ek_mci1_hw_init(void) > -{ > - at91_pio3_set_c_periph(AT91_PIO_PORTE, 19, 1); /* MCI1 CDA */ > - at91_pio3_set_c_periph(AT91_PIO_PORTE, 20, 1); /* MCI1 DA0 */ > - at91_pio3_set_c_periph(AT91_PIO_PORTE, 21, 1); /* MCI1 DA1 */ > - at91_pio3_set_c_periph(AT91_PIO_PORTE, 22, 1); /* MCI1 DA2 */ > - at91_pio3_set_c_periph(AT91_PIO_PORTE, 23, 1); /* MCI1 DA3 */ > - at91_pio3_set_c_periph(AT91_PIO_PORTE, 18, 0); /* MCI1 CLK */ > - > - /* > - * As the mci io internal pull down is too strong, so if the io needs > - * external pull up, the pull up resistor will be very small, if so > - * the power consumption will increase, so disable the interanl pull > - * down to save the power. > - */ > - at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 18, 0); > - at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 19, 0); > - at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 20, 0); > - at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 21, 0); > - at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 22, 0); > - at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 23, 0); > - > - /* Enable clock */ > - at91_periph_clk_enable(ATMEL_ID_MCI1); > -} > - > -int board_mmc_init(bd_t *bis) > -{ > - /* Enable power for MCI1 interface */ > - at91_set_pio_output(AT91_PIO_PORTE, 15, 0); > - > - return atmel_mci_init((void *)ATMEL_BASE_MCI1); > -} > -#endif /* CONFIG_GENERIC_ATMEL_MCI */ > - > #ifdef CONFIG_MACB > void sama5d4ek_macb0_hw_init(void) > { > @@ -264,12 +194,6 @@ static void sama5d4ek_serial3_hw_init(void) > > int board_early_init_f(void) > { > - at91_periph_clk_enable(ATMEL_ID_PIOA); > - at91_periph_clk_enable(ATMEL_ID_PIOB); > - at91_periph_clk_enable(ATMEL_ID_PIOC); > - at91_periph_clk_enable(ATMEL_ID_PIOD); > - at91_periph_clk_enable(ATMEL_ID_PIOE); > - > sama5d4ek_serial3_hw_init(); > > return 0; > @@ -280,15 +204,9 @@ int board_init(void) > /* adress of boot parameters */ > gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; > > -#ifdef CONFIG_ATMEL_SPI > - sama5d4ek_spi0_hw_init(); > -#endif > #ifdef CONFIG_NAND_ATMEL > sama5d4ek_nand_hw_init(); > #endif > -#ifdef CONFIG_GENERIC_ATMEL_MCI > - sama5d4ek_mci1_hw_init(); > -#endif > #ifdef CONFIG_MACB > sama5d4ek_macb0_hw_init(); > #endif > @@ -334,12 +252,8 @@ int board_eth_init(bd_t *bis) > #ifdef CONFIG_SPL_BUILD > void spl_board_init(void) > { > -#ifdef CONFIG_SYS_USE_MMC > - sama5d4ek_mci1_hw_init(); > -#elif CONFIG_SYS_USE_NANDFLASH > +#if CONFIG_SYS_USE_NANDFLASH > sama5d4ek_nand_hw_init(); > -#elif CONFIG_SYS_USE_SERIALFLASH > - sama5d4ek_spi0_hw_init(); > #endif > }