All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/3] zynq: sdhci: Remove zynq_sdhci_of_init()
@ 2015-12-01 13:35 Michal Simek
  2015-12-01 13:35 ` [U-Boot] [PATCH 2/3] ARM: zynq: Extend malloc size Michal Simek
  2015-12-01 13:35 ` [U-Boot] [PATCH 3/3] zynq: sdhci: Move driver to DM Michal Simek
  0 siblings, 2 replies; 4+ messages in thread
From: Michal Simek @ 2015-12-01 13:35 UTC (permalink / raw)
  To: u-boot

Prepare for using DM.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/mach-zynq/include/mach/sys_proto.h |  1 -
 drivers/mmc/zynq_sdhci.c                    | 27 ---------------------------
 2 files changed, 28 deletions(-)

diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
index 9d50e2478f61..151b903aa188 100644
--- a/arch/arm/mach-zynq/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
@@ -21,7 +21,6 @@ extern unsigned int zynq_get_silicon_version(void);
 
 /* Driver extern functions */
 extern int zynq_sdhci_init(phys_addr_t regbase);
-extern int zynq_sdhci_of_init(const void *blob);
 
 extern void ps7_init(void);
 
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 2d6cb31e12ee..87a1f4086fc4 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -32,30 +32,3 @@ int zynq_sdhci_init(phys_addr_t regbase)
 	add_sdhci(host, CONFIG_ZYNQ_SDHCI_MAX_FREQ, 0);
 	return 0;
 }
-
-#if CONFIG_IS_ENABLED(OF_CONTROL)
-int zynq_sdhci_of_init(const void *blob)
-{
-	int offset = 0;
-	u32 ret = 0;
-	phys_addr_t reg;
-
-	debug("ZYNQ SDHCI: Initialization\n");
-
-	do {
-		offset = fdt_node_offset_by_compatible(blob, offset,
-					"arasan,sdhci-8.9a");
-		if (offset != -1) {
-			reg = fdtdec_get_addr(blob, offset, "reg");
-			if (reg != FDT_ADDR_T_NONE) {
-				ret |= zynq_sdhci_init(reg);
-			} else {
-				debug("ZYNQ SDHCI: Can't get base address\n");
-				return -1;
-			}
-		}
-	} while (offset != -1);
-
-	return ret;
-}
-#endif
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH 2/3] ARM: zynq: Extend malloc size
  2015-12-01 13:35 [U-Boot] [PATCH 1/3] zynq: sdhci: Remove zynq_sdhci_of_init() Michal Simek
@ 2015-12-01 13:35 ` Michal Simek
  2015-12-01 13:35 ` [U-Boot] [PATCH 3/3] zynq: sdhci: Move driver to DM Michal Simek
  1 sibling, 0 replies; 4+ messages in thread
From: Michal Simek @ 2015-12-01 13:35 UTC (permalink / raw)
  To: u-boot

SPL DM MMC FAT requires more malloc space(3k fat buffers + dm)
that it is available now. Extend SPL malloc space.

Current OCM layout:
0xffff0000 - 0xfff2000 - Full malloc space
0xffff2000 - 0xffff300 - Stack location
0xfffff300 - CONFIG_SYS_MALLOC_F_LEN - Early malloc space
0xfffffd00 - sizeof(GD) - GD
0xfffffe00 - 0xffffffff - SoC specific boot code

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 include/configs/zynq-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index d499656bb592..0ab60839b6cf 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -369,7 +369,7 @@
 
 /* On the top of OCM space */
 #define CONFIG_SYS_SPL_MALLOC_START	OCM_HIGH_ADDR
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x1000
+#define CONFIG_SYS_SPL_MALLOC_SIZE	0x2000
 
 /*
  * SPL stack position - and stack goes down
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH 3/3] zynq: sdhci: Move driver to DM
  2015-12-01 13:35 [U-Boot] [PATCH 1/3] zynq: sdhci: Remove zynq_sdhci_of_init() Michal Simek
  2015-12-01 13:35 ` [U-Boot] [PATCH 2/3] ARM: zynq: Extend malloc size Michal Simek
@ 2015-12-01 13:35 ` Michal Simek
  2015-12-01 20:02   ` Simon Glass
  1 sibling, 1 reply; 4+ messages in thread
From: Michal Simek @ 2015-12-01 13:35 UTC (permalink / raw)
  To: u-boot

Move driver to DM

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/Kconfig                             |  2 ++
 arch/arm/dts/zynq-zc702.dts                  |  3 ++
 arch/arm/include/asm/arch-zynqmp/hardware.h  |  3 --
 arch/arm/include/asm/arch-zynqmp/sys_proto.h |  1 -
 arch/arm/mach-zynq/include/mach/hardware.h   |  2 --
 arch/arm/mach-zynq/include/mach/sys_proto.h  |  2 --
 board/xilinx/zynq/board.c                    | 17 -----------
 board/xilinx/zynqmp/zynqmp.c                 | 22 --------------
 drivers/mmc/zynq_sdhci.c                     | 44 ++++++++++++++++++++--------
 9 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f989ab521469..2967973bc283 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -553,6 +553,7 @@ config ARCH_ZYNQ
 	select DM
 	select DM_ETH
 	select SPL_DM
+	select DM_MMC
 	select DM_SPI
 	select DM_SERIAL
 	select DM_SPI_FLASH
@@ -564,6 +565,7 @@ config ARCH_ZYNQMP
 	select DM
 	select OF_CONTROL
 	select DM_ETH
+	select DM_MMC
 	select DM_SERIAL
 
 config TEGRA
diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index c41723641ee7..528cd27796c9 100644
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -18,6 +18,7 @@
 		i2c0 = &i2c0;
 		serial0 = &uart1;
 		spi0 = &qspi;
+		mmc0 = &sdhci0;
 	};
 
 	memory {
@@ -370,6 +371,7 @@
 };
 
 &sdhci0 {
+	u-boot,dm-pre-reloc;
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sdhci0_default>;
@@ -383,6 +385,7 @@
 };
 
 &qspi {
+	u-boot,dm-pre-reloc;
 	status = "okay";
 };
 
diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index 0f03c246d72d..7602e58692ae 100644
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -22,9 +22,6 @@
 #define ZYNQ_I2C_BASEADDR0	0xFF020000
 #define ZYNQ_I2C_BASEADDR1	0xFF030000
 
-#define ZYNQ_SDHCI_BASEADDR0	0xFF160000
-#define ZYNQ_SDHCI_BASEADDR1	0xFF170000
-
 #define ZYNQMP_SATA_BASEADDR	0xFD0C0000
 
 #define ZYNQMP_USB0_XHCI_BASEADDR	0xFE200000
diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index f1e95a2a28e3..021626dc1403 100644
--- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
@@ -13,7 +13,6 @@ static inline void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
 {
 }
 
-int zynq_sdhci_init(phys_addr_t regbase);
 int zynq_slcr_get_mio_pin_status(const char *periph);
 
 unsigned int zynqmp_get_silicon_version(void);
diff --git a/arch/arm/mach-zynq/include/mach/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h
index 9a51d6ba3b5e..90cdd7a4ff18 100644
--- a/arch/arm/mach-zynq/include/mach/hardware.h
+++ b/arch/arm/mach-zynq/include/mach/hardware.h
@@ -14,8 +14,6 @@
 #define ZYNQ_SCU_BASEADDR		0xF8F00000
 #define ZYNQ_GEM_BASEADDR0		0xE000B000
 #define ZYNQ_GEM_BASEADDR1		0xE000C000
-#define ZYNQ_SDHCI_BASEADDR0		0xE0100000
-#define ZYNQ_SDHCI_BASEADDR1		0xE0101000
 #define ZYNQ_I2C_BASEADDR0		0xE0004000
 #define ZYNQ_I2C_BASEADDR1		0xE0005000
 #define ZYNQ_SPI_BASEADDR0		0xE0006000
diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
index 151b903aa188..882beabe132f 100644
--- a/arch/arm/mach-zynq/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
@@ -20,8 +20,6 @@ extern void zynq_ddrc_init(void);
 extern unsigned int zynq_get_silicon_version(void);
 
 /* Driver extern functions */
-extern int zynq_sdhci_init(phys_addr_t regbase);
-
 extern void ps7_init(void);
 
 #endif /* _SYS_PROTO_H_ */
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 572b1468bf51..414f5302a066 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -122,23 +122,6 @@ int board_eth_init(bd_t *bis)
 	return ret;
 }
 
-#ifdef CONFIG_CMD_MMC
-int board_mmc_init(bd_t *bd)
-{
-	int ret = 0;
-
-#if defined(CONFIG_ZYNQ_SDHCI)
-# if defined(CONFIG_ZYNQ_SDHCI0)
-	ret = zynq_sdhci_init(ZYNQ_SDHCI_BASEADDR0);
-# endif
-# if defined(CONFIG_ZYNQ_SDHCI1)
-	ret |= zynq_sdhci_init(ZYNQ_SDHCI_BASEADDR1);
-# endif
-#endif
-	return ret;
-}
-#endif
-
 int dram_init(void)
 {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 51dc30f90d7e..2cf47125d433 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -65,28 +65,6 @@ void scsi_init(void)
 }
 #endif
 
-#ifdef CONFIG_CMD_MMC
-int board_mmc_init(bd_t *bd)
-{
-	int ret = 0;
-
-	u32 ver = zynqmp_get_silicon_version();
-
-	if (ver != ZYNQMP_CSU_VERSION_VELOCE) {
-#if defined(CONFIG_ZYNQ_SDHCI)
-# if defined(CONFIG_ZYNQ_SDHCI0)
-		ret = zynq_sdhci_init(ZYNQ_SDHCI_BASEADDR0);
-# endif
-# if defined(CONFIG_ZYNQ_SDHCI1)
-		ret |= zynq_sdhci_init(ZYNQ_SDHCI_BASEADDR1);
-# endif
-#endif
-	}
-
-	return ret;
-}
-#endif
-
 int board_late_init(void)
 {
 	u32 reg = 0;
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 87a1f4086fc4..4fe3da93b206 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2013 Inc.
+ * (C) Copyright 2013 - 2015 Xilinx, Inc.
  *
  * Xilinx Zynq SD Host Controller Interface
  *
@@ -7,28 +7,48 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <fdtdec.h>
 #include <libfdt.h>
 #include <malloc.h>
 #include <sdhci.h>
-#include <asm/arch/sys_proto.h>
 
-int zynq_sdhci_init(phys_addr_t regbase)
+static int arasan_sdhci_probe(struct udevice *dev)
 {
-	struct sdhci_host *host = NULL;
+	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
+	struct sdhci_host *host = dev_get_priv(dev);
 
-	host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host));
-	if (!host) {
-		printf("zynq_sdhci_init: sdhci_host malloc fail\n");
-		return 1;
-	}
-
-	host->name = "zynq_sdhci";
-	host->ioaddr = (void *)regbase;
 	host->quirks = SDHCI_QUIRK_WAIT_SEND_CMD |
 		       SDHCI_QUIRK_BROKEN_R1B;
 	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
 
 	add_sdhci(host, CONFIG_ZYNQ_SDHCI_MAX_FREQ, 0);
+
+	upriv->mmc = host->mmc;
+
 	return 0;
 }
+
+static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)
+{
+	struct sdhci_host *host = dev_get_priv(dev);
+
+	host->name = (char *)dev->name;
+	host->ioaddr = (void *)dev_get_addr(dev);
+
+	return 0;
+}
+
+static const struct udevice_id arasan_sdhci_ids[] = {
+	{ .compatible = "arasan,sdhci-8.9a" },
+	{ }
+};
+
+U_BOOT_DRIVER(arasan_sdhci_drv) = {
+	.name		= "arasan_sdhci",
+	.id		= UCLASS_MMC,
+	.of_match	= arasan_sdhci_ids,
+	.ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata,
+	.probe		= arasan_sdhci_probe,
+	.priv_auto_alloc_size = sizeof(struct sdhci_host),
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH 3/3] zynq: sdhci: Move driver to DM
  2015-12-01 13:35 ` [U-Boot] [PATCH 3/3] zynq: sdhci: Move driver to DM Michal Simek
@ 2015-12-01 20:02   ` Simon Glass
  0 siblings, 0 replies; 4+ messages in thread
From: Simon Glass @ 2015-12-01 20:02 UTC (permalink / raw)
  To: u-boot

On 1 December 2015 at 06:35, Michal Simek <michal.simek@xilinx.com> wrote:
> Move driver to DM
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  arch/arm/Kconfig                             |  2 ++
>  arch/arm/dts/zynq-zc702.dts                  |  3 ++
>  arch/arm/include/asm/arch-zynqmp/hardware.h  |  3 --
>  arch/arm/include/asm/arch-zynqmp/sys_proto.h |  1 -
>  arch/arm/mach-zynq/include/mach/hardware.h   |  2 --
>  arch/arm/mach-zynq/include/mach/sys_proto.h  |  2 --
>  board/xilinx/zynq/board.c                    | 17 -----------
>  board/xilinx/zynqmp/zynqmp.c                 | 22 --------------
>  drivers/mmc/zynq_sdhci.c                     | 44 ++++++++++++++++++++--------
>  9 files changed, 37 insertions(+), 59 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-12-01 20:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-01 13:35 [U-Boot] [PATCH 1/3] zynq: sdhci: Remove zynq_sdhci_of_init() Michal Simek
2015-12-01 13:35 ` [U-Boot] [PATCH 2/3] ARM: zynq: Extend malloc size Michal Simek
2015-12-01 13:35 ` [U-Boot] [PATCH 3/3] zynq: sdhci: Move driver to DM Michal Simek
2015-12-01 20:02   ` Simon Glass

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.