dm: Add support for RAM drivers

Add support for a driver which sets up DRAM and can return information about
the amount of RAM available. This is a first step towards moving RAM init
to driver model.

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

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 5ebc89da9129c0e43b2bce4e581a7d8acd43cd1c..64c27931aa3a0f792f0c2d206b8db7b6afc8be2a 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -34,6 +34,8 @@ source "drivers/gpio/Kconfig"
 
 source "drivers/power/Kconfig"
 
+source "drivers/ram/Kconfig"
+
 source "drivers/hwmon/Kconfig"
 
 source "drivers/watchdog/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index c090aba30d95d4bbab119e8202eb393df320b2d1..4f859dc30673c9c1df30a958049dbc2973da61fc 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_LED) += led/
 obj-y += misc/
 obj-y += pcmcia/
 obj-y += dfu/
+obj-$(CONFIG_RAM) += ram/
 obj-y += rtc/
 obj-y += sound/
 obj-y += tpm/

diff --git a/drivers/ram/Kconfig b/drivers/ram/Kconfig
new file mode 100644 (file)
index 0000000..642a2d8
--- /dev/null
+++ b/drivers/ram/Kconfig
@@ -0,0 +1,18 @@
+config RAM
+       bool "Enable RAM drivers using Driver Model"
+       depends on DM
+       help
+         This allows drivers to be provided for SDRAM and other RAM
+         controllers and their type to be specified in the board's device
+         tree. Generally some parameters are required to set up the RAM and
+         the RAM size can either be statically defined or dynamically
+         detected.
+
+config SPL_RAM_SUPPORT
+       bool "Enable RAM support in SPL"
+       depends on RAM
+       help
+         The RAM subsystem adds a small amount of overhead to the image.
+         If this is acceptable and you have a need to use RAM drivers in
+         SPL, enable this option. It might provide a cleaner interface to
+         setting up RAM (e.g. SDRAM / DDR) within SPL.

diff --git a/drivers/ram/Makefile b/drivers/ram/Makefile
new file mode 100644 (file)
index 0000000..4494d81
--- /dev/null
+++ b/drivers/ram/Makefile
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2015 Google, Inc
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# SPDX-License-Identifier:      GPL-2.0+
+#
+obj-$(CONFIG_RAM) += ram-uclass.o

diff --git a/drivers/ram/ram-uclass.c b/drivers/ram/ram-uclass.c
new file mode 100644 (file)
index 0000000..2f1fbe7
--- /dev/null
+++ b/drivers/ram/ram-uclass.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <ram.h>
+#include <dm.h>
+#include <errno.h>
+#include <dm/lists.h>
+#include <dm/root.h>
+
+int ram_get_info(struct udevice *dev, struct ram_info *info)
+{
+       struct ram_ops *ops = ram_get_ops(dev);
+
+       if (!ops->get_info)
+               return -ENOSYS;
+
+       return ops->get_info(dev, info);
+}
+
+UCLASS_DRIVER(ram) = {
+       .id             = UCLASS_RAM,
+       .name           = "ram",
+};

diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index cba7c0a45eb094885ed9b8131886ccad46e57f0e..93a38575bdf246d76fd9a778363e8e9f1ea3e11d 100644 (file)
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -28,6 +28,7 @@ enum uclass_id {
        UCLASS_CPU,             /* CPU, typically part of an SoC */
        UCLASS_CROS_EC,         /* Chrome OS EC */
        UCLASS_DISPLAY_PORT,    /* Display port video */
+       UCLASS_RAM,             /* RAM controller */
        UCLASS_ETH,             /* Ethernet device */
        UCLASS_GPIO,            /* Bank of general-purpose I/O pins */
        UCLASS_I2C,             /* I2C bus */

diff --git a/include/ram.h b/include/ram.h
new file mode 100644 (file)
index 0000000..e2172a8
--- /dev/null
+++ b/include/ram.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __RAM_H
+#define __RAM_H
+
+struct ram_info {
+       phys_addr_t base;
+       size_t size;
+};
+
+struct ram_ops {
+       /**
+        * get_info() - Get basic memory info
+        *
+        * @dev:        Device to check (UCLASS_RAM)
+        * @info:       Place to put info
+        * @return 0 if OK, -ve on error
+        */
+       int (*get_info)(struct udevice *dev, struct ram_info *info);
+};
+
+#define ram_get_ops(dev)        ((struct ram_ops *)(dev)->driver->ops)
+
+/**
+ * ram_get_info() - Get information about a RAM device
+ *
+ * @dev:       Device to check (UCLASS_RAM)
+ * @info:      Returns RAM info
+ * @return 0 if OK, -ve on error
+ */
+int ram_get_info(struct udevice *dev, struct ram_info *info);
+
+#endif

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 59d7fc843f7754f0232d190d40a236b1e94b1c30..277958ad8e5e304c79cb7abc9ed9fff9ac39d141 100644 (file)
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -78,6 +78,7 @@ libs-$(CONFIG_SPL_NET_SUPPORT) += net/
 libs-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/
 libs-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/
 libs-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/net/phy/
+libs-$(CONFIG_SPL_RAM_SUPPORT) += drivers/ram/
 libs-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/
 libs-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
 libs-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/