Dear Eric Nelson,

Signed-off-by: Eric Nelson eric.nelson@boundarydevices.com

V2 has been stripped of the board-independent changes and uses clrsetbits_le32() instead of twiddling bits by hand.

V3 returns immediately from setup_sata() if enable_sata_clock() returns an error.

V4 removes extra #include and addresses a style issue as discussed on the ML.

It's still there ;-)

board/freescale/mx6qsabrelite/mx6qsabrelite.c | 31 +++++++++++++++++++++++++ include/configs/mx6qsabrelite.h | 13 ++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index 1d09a72..cdd2f15 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -25,6 +25,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/mx6x_pins.h> #include <asm/arch/iomux-v3.h> +#include <asm/arch/clock.h> #include <asm/errno.h> #include <asm/gpio.h> #include <mmc.h> @@ -267,6 +268,32 @@ int board_eth_init(bd_t *bis) return 0; }

+#ifdef CONFIG_CMD_SATA

+int setup_sata(void) +{

• struct iomuxc_base_regs *const iomuxc_regs

• = (struct iomuxc_base_regs *) IOMUXC_BASE_ADDR;
  

• int ret = enable_sata_clock();
• if (ret)

• return ret;
  

• clrsetbits_le32(&iomuxc_regs->gpr[13],

• 	IOMUXC_GPR13_SATA_MASK,
  

• 	IOMUXC_GPR13_SATA_PHY_8_RXEQ_3P0DB
  

• 	|IOMUXC_GPR13_SATA_PHY_7_SATA2M
  

• 	|IOMUXC_GPR13_SATA_SPEED_3G
  

• 	|(3<<IOMUXC_GPR13_SATA_PHY_6_SHIFT)
  

• 	|IOMUXC_GPR13_SATA_SATA_PHY_5_SS_DISABLED
  

• 	|IOMUXC_GPR13_SATA_SATA_PHY_4_ATTEN_9_16
  

• 	|IOMUXC_GPR13_SATA_PHY_3_TXBOOST_0P00_DB
  

• 	|IOMUXC_GPR13_SATA_PHY_2_TX_1P104V
  

• 	|IOMUXC_GPR13_SATA_PHY_1_SLOW);
  

• return 0 ; <---- here :-)

+} +#endif

int board_early_init_f(void) { setup_iomux_uart(); @@ -283,6 +310,10 @@ int board_init(void) setup_spi(); #endif

+#ifdef CONFIG_CMD_SATA

• setup_sata();

+#endif

•   return 0;
  

}

diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index f52c3c7..1d92dd0 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -71,6 +71,19 @@ #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION

+#define CONFIG_CMD_SATA +/*

• • SATA Configs
• */

+#ifdef CONFIG_CMD_SATA +#define CONFIG_DWC_AHSATA +#define CONFIG_SYS_SATA_MAX_DEVICE 1 +#define CONFIG_DWC_AHSATA_PORT_ID 0 +#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR +#define CONFIG_LBA48 +#define CONFIG_LIBATA +#endif

#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII