All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wenyou Yang <wenyou.yang@atmel.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 6/8] board: sama5d4ek: clean up code
Date: Fri, 28 Oct 2016 15:16:47 +0800	[thread overview]
Message-ID: <1477639009-10675-7-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1477639009-10675-1-git-send-email-wenyou.yang@atmel.com>

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 <wenyou.yang@atmel.com>
---

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 <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <atmel_hlcdc.h>
-#include <atmel_mci.h>
 #include <lcd.h>
-#include <mmc.h>
 #include <net.h>
 #include <netdev.h>
 #include <nand.h>
-#include <spi.h>
 #include <version.h>
 
 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
 }
 
-- 
2.7.4

  parent reply	other threads:[~2016-10-28  7:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-28  7:16 [U-Boot] [PATCH v2 0/8] board: sama5d4: convert boards to support DM/DT Wenyou Yang
2016-10-28  7:16 ` [U-Boot] [PATCH v2 1/8] configs: at91-sama5_common: fix for CONFIG_AT91_GPIO Wenyou Yang
2017-02-04 22:11   ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28  7:16 ` [U-Boot] [PATCH v2 2/8] board: sama5d4_xplained: move config options to defconfig Wenyou Yang
2017-02-04 22:20   ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2017-02-04 22:33   ` Andreas Bießmann
2017-02-04 22:44   ` Andreas Bießmann
2016-10-28  7:16 ` [U-Boot] [PATCH v2 3/8] board: sama5d4_xplained: clean up code Wenyou Yang
2017-02-04 22:47   ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28  7:16 ` [U-Boot] [PATCH v2 4/8] board: sama5d4_xplained: enable early debug UART Wenyou Yang
2017-02-04 22:49   ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28  7:16 ` [U-Boot] [PATCH v2 5/8] board: sama5d4ek: move config options to defconfig Wenyou Yang
2017-02-04 22:56   ` [U-Boot] [U-Boot, v2, " Andreas Bießmann
2016-10-28  7:16 ` Wenyou Yang [this message]
2017-02-06  9:11   ` [U-Boot] [PATCH v2 6/8] board: sama5d4ek: clean up code Andreas Bießmann
2016-10-28  7:16 ` [U-Boot] [PATCH v2 7/8] board: sama5d4ek: enable early debug UART Wenyou Yang
2017-02-06  9:11   ` Andreas Bießmann
2016-10-28  7:16 ` [U-Boot] [PATCH v2 8/8] configs: sama5d4: move CONFIG_SYS_NO_FLASH to *defconfig Wenyou Yang
2017-02-06  9:12   ` Andreas Bießmann
2017-02-06 19:52 ` [U-Boot] [PATCH v2 0/8] board: sama5d4: convert boards to support DM/DT Andreas Bießmann
2017-02-07  6:15   ` Wenyou.Yang at microchip.com

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477639009-10675-7-git-send-email-wenyou.yang@atmel.com \
    --to=wenyou.yang@atmel.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.