ARM: at91: ma5d4: Boot from MMC2 when using SAM-BA

[u-boot] / drivers / clk / at91 / clk-system.c

diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index fa80bade7a91e80bc530cbfee1163165b06d846a..24b271aa181587faff717ea74a606b5b54e105d8 100644 (file)
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -7,19 +7,44 @@
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
 #define SYSTEM_MAX_ID          31
 
+/**
+ * at91_system_clk_bind() - for the system clock driver
+ * Recursively bind its children as clk devices.
+ *
+ * @return: 0 on success, or negative error code on failure
+ */
+static int at91_system_clk_bind(struct udevice *dev)
+{
+       return at91_clk_sub_device_bind(dev, "system-clk");
+}
+
+static const struct udevice_id at91_system_clk_match[] = {
+       { .compatible = "atmel,at91rm9200-clk-system" },
+       {}
+};
+
+U_BOOT_DRIVER(at91_system_clk) = {
+       .name = "at91-system-clk",
+       .id = UCLASS_MISC,
+       .of_match = at91_system_clk_match,
+       .bind = at91_system_clk_bind,
+};
+
+/*----------------------------------------------------------*/
+
 static inline int is_pck(int id)
 {
        return (id >= 8) && (id <= 15);
 }
 
-static int at91_system_clk_enable(struct clk *clk)
+static int system_clk_enable(struct clk *clk)
 {
        struct pmc_platdata *plat = dev_get_platdata(clk->dev);
        struct at91_pmc *pmc = plat->reg_base;
@@ -46,31 +71,15 @@ static int at91_system_clk_enable(struct clk *clk)
        return 0;
 }
 
-static struct clk_ops at91_system_clk_ops = {
-       .enable = at91_system_clk_enable,
+static struct clk_ops system_clk_ops = {
+       .of_xlate = at91_clk_of_xlate,
+       .enable = system_clk_enable,
 };
 
-static int at91_system_clk_bind(struct udevice *dev)
-{
-       return at91_pmc_clk_node_bind(dev);
-}
-
-static int at91_system_clk_probe(struct udevice *dev)
-{
-       return at91_pmc_core_probe(dev);
-}
-
-static const struct udevice_id at91_system_clk_match[] = {
-       { .compatible = "atmel,at91rm9200-clk-system" },
-       {}
-};
-
-U_BOOT_DRIVER(at91_system_clk) = {
-       .name = "at91-system-clk",
+U_BOOT_DRIVER(system_clk) = {
+       .name = "system-clk",
        .id = UCLASS_CLK,
-       .of_match = at91_system_clk_match,
-       .bind = at91_system_clk_bind,
-       .probe = at91_system_clk_probe,
+       .probe = at91_clk_probe,
        .platdata_auto_alloc_size = sizeof(struct pmc_platdata),
-       .ops = &at91_system_clk_ops,
+       .ops = &system_clk_ops,
 };