Skip to contentSkip to conversation

nitrogen6x: Move setup_sata to common part

PATCH Superseded Giuseppe Pagano 2 participants 5 messages Nov 28, 2013

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover nitrogen6x: Move setup_sata to common part

Move setup_sata function definition from platform file nitrogen6x.c to arch/arm/imx-common/sata.c to avoid code duplication.

CC Stefano Babic <[email protected]>
CC Fabio Estevam <[email protected]>
CC Eric Nelson <[email protected]>

---

Changes in v3:
- Correct Makefile for filter sata.c to be compiled only for mx6 soc because in function setup_sata there are i.MX6 specific registers definition and this breaks mx5 boards. mx5 boards does not need setup_sata initialization.

Changes in v2:
- Split previous patch between nitrogen6x udoo code changes.

---
 arch/arm/imx-common/Makefile           |    3 +++
 arch/arm/imx-common/sata.c             |   33 ++++++++++++++++++++++++++++++++
 arch/arm/include/asm/imx-common/sata.h |   17 ++++++++++++++++
 board/boundary/nitrogen6x/nitrogen6x.c |   27 +-------------------------
 4 files changed, 54 insertions(+), 26 deletions(-)
 create mode 100644 arch/arm/imx-common/sata.c
 create mode 100644 arch/arm/include/asm/imx-common/sata.h
arch/arm/imx-common/Makefile +3 -0
index 727a052..2656f2d 100644
@@ -21,6 +21,9 @@ endif
 ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
 COBJS-y	+= misc.o
 endif
+ifeq ($(SOC),$(filter $(SOC),mx6))
+COBJS-$(CONFIG_CMD_SATA) += sata.o
+endif
 COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o
 COBJS-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
 COBJS	:= $(sort $(COBJS-y))
arch/arm/imx-common/sata.c new file +33 -0
new file mode 100644
index 0000000..1b4c502
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <asm/imx-common/iomux-v3.h>
+#include <asm/arch/iomux.h>
+#include <asm/io.h>
+
+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;
+}
arch/arm/include/asm/imx-common/sata.h new file +17 -0
new file mode 100644
index 0000000..8bb4493
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __IMX_SATA_H_
+#define __IMX_SATA_H_
+
+/*
+ * SATA setup for i.mx6 quad based platform
+ */
+
+int setup_sata(void);
+
+#endif
+
board/boundary/nitrogen6x/nitrogen6x.c +1 -26
index 1712908..0c26bcb 100644
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <asm/imx-common/iomux-v3.h>
 #include <asm/imx-common/mxc_i2c.h>
+#include <asm/imx-common/sata.h>
 #include <asm/imx-common/boot_mode.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
@@ -378,32 +379,6 @@ static void setup_buttons(void)
 					 ARRAY_SIZE(button_pads));
 }
 
-#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;
-}
-#endif
-
 #if defined(CONFIG_VIDEO_IPUV3)
 
 static iomux_v3_cfg_t const backlight_pads[] = {
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v3 1/1 udoo: Add SATA support on uDoo Board.

Add SATA support on uDoo Board.

CC Stefano Babic <[email protected]>
CC Fabio Estevam <[email protected]>

---

Changes in v3:
- No changes.

Changes in v2:
- Split previous patch between nitrogen6x udoo code changes.

---
 board/udoo/udoo.c      |    4 ++++
 include/configs/udoo.h |   12 ++++++++++++
 2 files changed, 16 insertions(+)
board/udoo/udoo.c +4 -0
index 0c38d9b..5b055f7 100644
@@ -14,6 +14,7 @@
 #include <asm/errno.h>
 #include <asm/gpio.h>
 #include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/sata.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
@@ -239,6 +240,9 @@ int board_init(void)
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
+#ifdef CONFIG_CMD_SATA
+	setup_sata();
+#endif
 	return 0;
 }
 
include/configs/udoo.h +12 -0
index b9a493c..a1a1750 100644
@@ -34,6 +34,18 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 
+/* SATA Configs */
+
+#define CONFIG_CMD_SATA
+#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
+
 /* Network support */
 
 #define CONFIG_CMD_PING
Signature · 1 line
1.7.10.4
#2 lore raw

v3 cover nitrogen6x: Move setup_sata to common part

In reply to Giuseppe Pagano

Hi Giuseppe,

Quoted 14 lines · Giuseppe Pagano

Move setup_sata function definition from platform file nitrogen6x.c to arch/arm/imx-common/sata.c to avoid code duplication.

CC Stefano Babic <[email protected]>
CC Fabio Estevam <[email protected]>
CC Eric Nelson <[email protected]>

---

arch/arm/imx-common/Makefile +0 -0
index 727a052..2656f2d 100644

arch/arm/imx-common/Makefile endif · line 26

Quoted 6 lines
arch/arm/imx-common/Makefile +3 -0
@@ -21,6 +21,9 @@ endif
 ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
 COBJS-y	+= misc.o
 endif
+ifeq ($(SOC),$(filter $(SOC),mx6))
+COBJS-$(CONFIG_CMD_SATA) += sata.o
+endif

COBJS- was replaced by obj-

Best regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

v3 cover nitrogen6x: Move setup_sata to common part

Hi Stefano,

Quoted 2 lines · Stefano Babic

Hi Giuseppe,

..

Quoted 6 lines

arch/arm/imx-common/Makefile endif · line 26

Quoted 4 lines

endif

arch/arm/imx-common/Makefile +3 -0
+ifeq ($(SOC),$(filter $(SOC),mx6))
+COBJS-$(CONFIG_CMD_SATA) += sata.o
+endif

COBJS- was replaced by obj-

Sorry, I was working on -next branch.
Do you want me to send v4 patch with changes ?

Quoted 2 lines

Best regards,
Stefano

Best regards
Giuseppe Pagano

#4 lore raw

v3 cover nitrogen6x: Move setup_sata to common part

Quoted 13 lines · Giuseppe Pagano

Hi Stefano,

Quoted 2 lines · Stefano Babic

Hi Giuseppe,

..

Quoted 6 lines

arch/arm/imx-common/Makefile endif · line 26

Quoted 4 lines

endif

arch/arm/imx-common/Makefile +3 -0
+ifeq ($(SOC),$(filter $(SOC),mx6))
+COBJS-$(CONFIG_CMD_SATA) += sata.o
+endif

COBJS- was replaced by obj-

Quoted 2 lines

Sorry, I was working on -next branch.
Do you want me to send v4 patch with changes ?

Yes, please send V4.

Best regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================