Commit aa1da33c authored by David Lechner's avatar David Lechner Committed by Sekhar Nori
Browse files

ARM: davinci: da8xx: add new sata_refclk init using common clock framework 



This adds the new SATA REFCLK clock init in mach-davinci/devices-da8xx.c
using the new common clock framework drivers.

The #ifdefs are needed to prevent compile errors until the entire
ARCH_DAVINCI is converted.

Also, the #includes are sorted since we are adding some here.

Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Reviewed-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 5411bad4

arch/arm/mach-davinci/devices-da8xx.c

+27 −9
Original line number Diff line number Diff line
@@ -10,25 +10,30 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/dma-contiguous.h>

#include <linux/serial_8250.h>

#include <linux/ahci_platform.h>

#include <linux/clk-provider.h>

#include <linux/clk.h>

#include <linux/reboot.h>

#include <linux/clkdev.h>

#include <linux/dma-contiguous.h>

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>

#include <linux/serial_8250.h>



#include <mach/cputype.h>

#include <mach/common.h>

#include <mach/time.h>

#include <mach/cputype.h>

#include <mach/da8xx.h>

#include <mach/clock.h>

#include <mach/time.h>



#include "asp.h"

#include "cpuidle.h"

#include "sram.h"



#ifndef CONFIG_COMMON_CLK

#include <mach/clock.h>

#include "clock.h"

#include "asp.h"

#endif



#define DA8XX_TPCC_BASE			0x01c00000

#define DA8XX_TPTC0_BASE		0x01c08000
@@ -1040,6 +1045,7 @@ int __init da8xx_register_spi_bus(int instance, unsigned num_chipselect) 
}



#ifdef CONFIG_ARCH_DAVINCI_DA850

#ifndef CONFIG_COMMON_CLK

static struct clk sata_refclk = {

	.name		= "sata_refclk",

	.set_rate	= davinci_simple_set_rate,
@@ -1061,6 +1067,18 @@ int __init da850_register_sata_refclk(int rate) 


	return 0;

}

#else

int __init da850_register_sata_refclk(int rate)

{

	struct clk *clk;



	clk = clk_register_fixed_rate(NULL, "sata_refclk", NULL, 0, rate);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



	return clk_register_clkdev(clk, "refclk", "ahci_da850");

}

#endif



static struct resource da850_sata_resources[] = {

	{