ARM: davinci: da850: model the SATA refclk

Register a fixed rate clock modelling the external SATA oscillator
for da850 (both DT and board file mode).

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 62c3d5174d4aeeec64c789fe506dc765a3e79189..071933b16a0c7c3aaa88a5effd9030771ba20f2a 100644 (file)
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -50,6 +50,9 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 
 static void __init da850_init_machine(void)
 {
+       /* All existing boards use 100MHz SATA refclkpn */
+       static const unsigned long sata_refclkpn = 100 * 1000 * 1000;
+
        int ret;
 
        ret = da8xx_register_usb20_phy_clk(false);
@@ -61,6 +64,11 @@ static void __init da850_init_machine(void)
                pr_warn("%s: registering USB 1.1 PHY clock failed: %d",
                        __func__, ret);
 
+       ret = da850_register_sata_refclk(sata_refclkpn);
+       if (ret)
+               pr_warn("%s: registering SATA REFCLK failed: %d",
+                       __func__, ret);
+
        of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);
        davinci_pm_init();
        pdata_quirks_init();

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index c2457b3fdb5f0c2639d893379c1ed1b49d3b0296..cfceb326a39ba9f76a3b22eb4011ce126e962a6c 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -24,6 +24,7 @@
 #include <mach/common.h>
 #include <mach/time.h>
 #include <mach/da8xx.h>
+#include <mach/clock.h>
 #include "cpuidle.h"
 #include "sram.h"
 
@@ -1023,6 +1024,28 @@ int __init da8xx_register_spi_bus(int instance, unsigned num_chipselect)
 }
 
 #ifdef CONFIG_ARCH_DAVINCI_DA850
+static struct clk sata_refclk = {
+       .name           = "sata_refclk",
+       .set_rate       = davinci_simple_set_rate,
+};
+
+static struct clk_lookup sata_refclk_lookup =
+               CLK("ahci_da850", "refclk", &sata_refclk);
+
+int __init da850_register_sata_refclk(int rate)
+{
+       int ret;
+
+       sata_refclk.rate = rate;
+       ret = clk_register(&sata_refclk);
+       if (ret)
+               return ret;
+
+       clkdev_add(&sata_refclk_lookup);
+
+       return 0;
+}
+
 static struct resource da850_sata_resources[] = {
        {
                .start  = DA850_SATA_BASE,
@@ -1055,9 +1078,15 @@ static struct platform_device da850_sata_device = {
 
 int __init da850_register_sata(unsigned long refclkpn)
 {
+       int ret;
+
        /* please see comment in drivers/ata/ahci_da850.c */
        BUG_ON(refclkpn != 100 * 1000 * 1000);
 
+       ret = da850_register_sata_refclk(refclkpn);
+       if (ret)
+               return ret;
+
        return platform_device_register(&da850_sata_device);
 }
 #endif

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 85ff2183b6db44e9d7b72203ab2a5824d5d77438..7e464228948bbc98ca22ea141583c3a5d5cc544b 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -95,6 +95,7 @@ int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata);
 int da8xx_register_usb_refclkin(int rate);
 int da8xx_register_usb20_phy_clk(bool use_usb_refclkin);
 int da8xx_register_usb11_phy_clk(bool use_usb_refclkin);
+int da850_register_sata_refclk(int rate);
 int da8xx_register_emac(void);
 int da8xx_register_uio_pruss(void);
 int da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata);