mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v3 23/38] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific
Date: Wed,  6 Jun 2018 11:44:16 -0700	[thread overview]
Message-ID: <20180606184431.10348-24-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180606184431.10348-1-andrew.smirnov@gmail.com>

Convert imx6_esdhc_start_image() into a generic esdhc_start_image() by
making accept already filled "struct esdhc" as well as use
esdhc_read_blocks().

With that change, create new imx6_esdhc_start_image() whose sole task
is to properly fill a struct esdhc with appropriate offset and to pass
it on to esdhc_start_image().

Both changes are made with a goal of simplifying adding support of new
SoC in mind (see following commits adding support for i.MX8 as example).

NOTE: This commit does not re-implement imx6_esdhc_load_image(),
instead opting for dropping it, due to lack of any users in the
codebase.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/include/mach/xload.h |  1 -
 arch/arm/mach-imx/xload-esdhc.c        | 87 ++++++++++++--------------
 2 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/arch/arm/mach-imx/include/mach/xload.h b/arch/arm/mach-imx/include/mach/xload.h
index 3898d664e..4e38ac7e2 100644
--- a/arch/arm/mach-imx/include/mach/xload.h
+++ b/arch/arm/mach-imx/include/mach/xload.h
@@ -4,7 +4,6 @@
 int imx53_nand_start_image(void);
 int imx6_spi_load_image(int instance, unsigned int flash_offset, void *buf, int len);
 int imx6_spi_start_image(int instance);
-int imx6_esdhc_load_image(int instance, void *buf, int len);
 int imx6_esdhc_start_image(int instance);
 
 int imx_image_size(void);
diff --git a/arch/arm/mach-imx/xload-esdhc.c b/arch/arm/mach-imx/xload-esdhc.c
index bd58bdc64..4580f53cd 100644
--- a/arch/arm/mach-imx/xload-esdhc.c
+++ b/arch/arm/mach-imx/xload-esdhc.c
@@ -216,50 +216,7 @@ static int esdhc_read_blocks(struct esdhc *esdhc, void *dst, size_t len)
 	return 0;
 }
 
-int imx6_esdhc_load_image(int instance, void *buf, int len)
-{
-	struct esdhc esdhc;
-	int ret;
-
-	switch (instance) {
-	case 0:
-		esdhc.regs = IOMEM(MX6_USDHC1_BASE_ADDR);
-		break;
-	case 1:
-		esdhc.regs = IOMEM(MX6_USDHC2_BASE_ADDR);
-		break;
-	case 2:
-		esdhc.regs = IOMEM(MX6_USDHC3_BASE_ADDR);
-		break;
-	case 3:
-		esdhc.regs = IOMEM(MX6_USDHC4_BASE_ADDR);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	esdhc.is_mx6 = 1;
-
-	ret = esdhc_read_blocks(&esdhc, buf, len);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-/**
- * imx6_esdhc_start_image - Load and start an image from USDHC controller
- * @instance: The USDHC controller instance (0..4)
- *
- * This uses imx6_esdhc_load_image() to load an image from SD/MMC.
- * It is assumed that the image is the currently running barebox image
- * (This information is used to calculate the length of the image). The
- * image is started afterwards.
- *
- * Return: If successful, this function does not return. A negative error
- * code is returned when this function fails.
- */
-int imx6_esdhc_start_image(int instance)
+static int esdhc_start_image(struct esdhc *esdhc)
 {
 	void *buf = (void *)0x10000000;
 	u32 *ivt = buf + SZ_1K;
@@ -270,7 +227,7 @@ int imx6_esdhc_start_image(int instance)
 	len = imx_image_size();
 	len = ALIGN(len, SECTOR_SIZE);
 
-	ret = imx6_esdhc_load_image(instance, buf, 3 * SECTOR_SIZE);
+	ret = esdhc_read_blocks(esdhc, buf, 3 * SECTOR_SIZE);
 	if (ret)
 		return ret;
 	if (*(u32 *)(ivt) != 0x402000d1) {
@@ -281,7 +238,7 @@ int imx6_esdhc_start_image(int instance)
 
 	pr_debug("Check ok, loading image\n");
 
-	ret = imx6_esdhc_load_image(instance, buf, len);
+	ret = esdhc_read_blocks(esdhc, buf, len);
 	if (ret) {
 		pr_err("Loading image failed with %d\n", ret);
 		return ret;
@@ -295,3 +252,41 @@ int imx6_esdhc_start_image(int instance)
 
 	bb();
 }
+
+/**
+ * imx6_esdhc_start_image - Load and start an image from USDHC controller
+ * @instance: The USDHC controller instance (0..4)
+ *
+ * This uses esdhc_start_image() to load an image from SD/MMC.  It is
+ * assumed that the image is the currently running barebox image (This
+ * information is used to calculate the length of the image). The
+ * image is started afterwards.
+ *
+ * Return: If successful, this function does not return. A negative error
+ * code is returned when this function fails.
+ */
+int imx6_esdhc_start_image(int instance)
+{
+	struct esdhc esdhc;
+
+	switch (instance) {
+	case 0:
+		esdhc.regs = IOMEM(MX6_USDHC1_BASE_ADDR);
+		break;
+	case 1:
+		esdhc.regs = IOMEM(MX6_USDHC2_BASE_ADDR);
+		break;
+	case 2:
+		esdhc.regs = IOMEM(MX6_USDHC3_BASE_ADDR);
+		break;
+	case 3:
+		esdhc.regs = IOMEM(MX6_USDHC4_BASE_ADDR);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	esdhc.is_mx6 = 1;
+
+	return esdhc_start_image(&esdhc);
+}
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-06-06 18:46 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-06 18:43 [PATCH v3 00/38] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-06 18:43 ` [PATCH v3 01/38] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-06 18:43 ` [PATCH v3 02/38] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-06 18:43 ` [PATCH v3 03/38] ARM: Add i.MX8 support Andrey Smirnov
2018-06-06 18:43 ` [PATCH v3 04/38] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-06 18:43 ` [PATCH v3 05/38] Include our own include/dt-bindings Andrey Smirnov
2018-06-06 18:43 ` [PATCH v3 06/38] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 07/38] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 08/38] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 09/38] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 10/38] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 11/38] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 12/38] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 13/38] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 14/38] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 15/38] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 16/38] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 17/38] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 18/38] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 19/38] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 20/38] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 21/38] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 22/38] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-06 18:44 ` Andrey Smirnov [this message]
2018-06-06 18:44 ` [PATCH v3 24/38] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 25/38] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 26/38] pinctrl: i.MX: " Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 27/38] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 28/38] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 29/38] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 30/38] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 31/38] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 32/38] common/clock: Move delay and timeout functions to clock.h Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 33/38] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 34/38] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 35/38] Kbuild: Add $(quote) Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 36/38] Add builtin firmware support Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 37/38] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-06 18:44 ` [PATCH v3 38/38] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-07 12:59 ` [PATCH v3 00/38] ARM: i.MX8MQ and EVK support Andrey Smirnov

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=20180606184431.10348-24-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox