clk: at91: Fix initializing arrays

[platform/kernel/u-boot.git] / drivers / clk / at91 / sam9x60.c

diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index 4d00ee2..d858c86 100644 (file)
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -76,6 +76,8 @@ enum pmc_clk_ids {
        ID_QSPI                 = 18,
 
        ID_MCK_PRES             = 19,
+       ID_USBCK                = 20,
+       ID_UHPCK                = 21,
 
        ID_MAX,
 };
@@ -99,6 +101,7 @@ static const char *clk_names[] = {
        [ID_PLL_A_DIV]          = "plla_divpmcck",
        [ID_MCK_PRES]           = "mck_pres",
        [ID_MCK_DIV]            = "mck_div",
+       [ID_USBCK]              = "usbck",
 };
 
 /* Fractional PLL output range. */
@@ -171,6 +174,13 @@ static const struct clk_pcr_layout pcr_layout = {
        .pid_mask = GENMASK(6, 0),
 };
 
+/* USB clock layout */
+static const struct clk_usbck_layout usbck_layout = {
+       .offset = 0x38,
+       .usbs_mask = GENMASK(1, 0),
+       .usbdiv_mask = GENMASK(11, 8),
+};
+
 /**
  * PLL clocks description
  * @n:         clock name
@@ -265,10 +275,11 @@ static const struct {
        u8 id;
        u8 cid;
 } sam9x60_systemck[] = {
-       { .n = "ddrck",         .p = "mck_pres", .id = 2, .cid = ID_DDR, },
+       { .n = "ddrck",         .p = "mck_div",  .id = 2, .cid = ID_DDR, },
+       { .n = "uhpck",         .p = "usbck",    .id = 6, .cid = ID_UHPCK },
        { .n = "pck0",          .p = "prog0",    .id = 8, .cid = ID_PCK0, },
        { .n = "pck1",          .p = "prog1",    .id = 9, .cid = ID_PCK1, },
-       { .n = "qspick",        .p = "mck_pres", .id = 19, .cid = ID_QSPI, },
+       { .n = "qspick",        .p = "mck_div",  .id = 19, .cid = ID_QSPI, },
 };
 
 /**
@@ -367,6 +378,31 @@ static const struct {
        { .n = "dbgu_gclk",   .id = 47, },
 };
 
+/**
+ * Clock setup description
+ * @cid:       clock id corresponding to clock subsystem
+ * @pid:       parent clock id corresponding to clock subsystem
+ * @rate:      clock rate
+ * @prate:     parent rate
+ */
+static const struct pmc_clk_setup sam9x60_clk_setup[] = {
+       {
+               .cid = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_PLL_U_FRAC),
+               .rate = 960000000,
+       },
+
+       {
+               .cid = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_PLL_U_DIV),
+               .rate = 480000000,
+       },
+
+       {
+               .cid = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_USBCK),
+               .pid = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_PLL_U_DIV),
+               .rate = 48000000,
+       },
+};
+
 #define prepare_mux_table(_allocs, _index, _dst, _src, _num, _label)   \
        do {                                                            \
                int _i;                                                 \
@@ -393,8 +429,8 @@ static int sam9x60_clk_probe(struct udevice *dev)
        if (!base)
                return -EINVAL;
 
-       memset(muxallocs,    0, ARRAY_SIZE(muxallocs));
-       memset(clkmuxallocs, 0, ARRAY_SIZE(clkmuxallocs));
+       memset(muxallocs,    0, sizeof(muxallocs));
+       memset(clkmuxallocs, 0, sizeof(clkmuxallocs));
 
        ret = clk_get_by_index(dev, 0, &clk);
        if (ret)
@@ -543,6 +579,28 @@ static int sam9x60_clk_probe(struct udevice *dev)
        }
        clk_dm(AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_MCK_DIV), c);
 
+       /* Register usbck. */
+       p[0] = clk_names[ID_PLL_A_DIV];
+       p[1] = clk_names[ID_PLL_U_DIV];
+       p[2] = clk_names[ID_MAIN_XTAL];
+       m[0] = 0;
+       m[1] = 1;
+       m[2] = 2;
+       cm[0] = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_PLL_A_DIV);
+       cm[1] = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_PLL_U_DIV);
+       cm[2] = AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_MAIN_XTAL);
+       prepare_mux_table(clkmuxallocs, clkmuxallocindex, tmpclkmux, cm,
+                         3, fail);
+       prepare_mux_table(muxallocs, muxallocindex, tmpmux, m, 3, fail);
+       c = sam9x60_clk_register_usb(base, clk_names[ID_USBCK], p, 3,
+                                    &usbck_layout, tmpclkmux, tmpmux,
+                                    ID_USBCK);
+       if (IS_ERR(c)) {
+               ret = PTR_ERR(c);
+               goto fail;
+       }
+       clk_dm(AT91_TO_CLK_ID(PMC_TYPE_CORE, ID_USBCK), c);
+
        /* Register programmable clocks. */
        p[0] = clk_names[ID_MD_SLCK];
        p[1] = clk_names[ID_TD_SLCK];
@@ -635,6 +693,11 @@ static int sam9x60_clk_probe(struct udevice *dev)
                clk_dm(AT91_TO_CLK_ID(PMC_TYPE_GCK, sam9x60_gck[i].id), c);
        }
 
+       /* Setup clocks. */
+       ret = at91_clk_setup(sam9x60_clk_setup, ARRAY_SIZE(sam9x60_clk_setup));
+       if (ret)
+               goto fail;
+
        return 0;
 
 fail: