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

ARM: davinci: da8xx: add new USB PHY clock init using common clock framework 



This adds the new USB PHY clock init in mach-davinci/usb-da8xx.c using
the new common clock framework drivers.

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

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

arch/arm/mach-davinci/board-da830-evm.c

+7 −1
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ static __init void da830_evm_usb_init(void) 
{

	int ret;



#ifdef CONFIG_COMMON_CLK

	ret = da8xx_register_usb_phy_clocks();

	if (ret)

		pr_warn("%s: USB PHY CLK registration failed: %d\n",

			__func__, ret);

#else

	/* USB_REFCLKIN is not used. */

	ret = da8xx_register_usb20_phy_clk(false);

	if (ret)
@@ -120,7 +126,7 @@ static __init void da830_evm_usb_init(void) 
	if (ret)

		pr_warn("%s: USB 1.1 PHY CLK registration failed: %d\n",

			__func__, ret);



#endif

	ret = da8xx_register_usb_phy();

	if (ret)

		pr_warn("%s: USB PHY registration failed: %d\n",

arch/arm/mach-davinci/board-omapl138-hawk.c

+7 −2
Original line number Diff line number Diff line
@@ -235,7 +235,12 @@ static __init void omapl138_hawk_usb_init(void) 
		pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret);

		return;

	}



#ifdef CONFIG_COMMON_CLK

	ret = da8xx_register_usb_phy_clocks();

	if (ret)

		pr_warn("%s: USB PHY CLK registration failed: %d\n",

			__func__, ret);

#else

	ret = da8xx_register_usb20_phy_clk(false);

	if (ret)

		pr_warn("%s: USB 2.0 PHY CLK registration failed: %d\n",
@@ -245,7 +250,7 @@ static __init void omapl138_hawk_usb_init(void) 
	if (ret)

		pr_warn("%s: USB 1.1 PHY CLK registration failed: %d\n",

			__func__, ret);



#endif

	ret = da8xx_register_usb_phy();

	if (ret)

		pr_warn("%s: USB PHY registration failed: %d\n",

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

+7 −1
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ static void __init da850_init_machine(void) 


	da850_register_clocks();



#ifdef CONFIG_COMMON_CLK

	ret = da8xx_register_usb_phy_clocks();

	if (ret)

		pr_warn("%s: USB PHY CLK registration failed: %d\n",

			__func__, ret);

#else

	ret = da8xx_register_usb20_phy_clk(false);

	if (ret)

		pr_warn("%s: registering USB 2.0 PHY clock failed: %d",
@@ -77,7 +83,7 @@ static void __init da850_init_machine(void) 
	if (ret)

		pr_warn("%s: registering USB 1.1 PHY clock failed: %d",

			__func__, ret);



#endif

	ret = da850_register_sata_refclk(sata_refclkpn);

	if (ret)

		pr_warn("%s: registering SATA REFCLK failed: %d",

arch/arm/mach-davinci/include/mach/da8xx.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,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 da8xx_register_usb_phy_clocks(void);

int da850_register_sata_refclk(int rate);

int da8xx_register_emac(void);

int da8xx_register_uio_pruss(void);

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

+24 −2
Original line number Diff line number Diff line
@@ -2,29 +2,35 @@ 
/*

 * DA8xx USB

 */

#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/mfd/da8xx-cfgchip.h>

#include <linux/mfd/syscon.h>

#include <linux/phy/phy.h>

#include <linux/platform_data/clk-da8xx-cfgchip.h>

#include <linux/platform_data/phy-da8xx-usb.h>

#include <linux/platform_data/usb-davinci.h>

#include <linux/platform_device.h>

#include <linux/usb/musb.h>



#include <mach/clock.h>

#include <mach/common.h>

#include <mach/cputype.h>

#include <mach/da8xx.h>

#include <mach/irqs.h>



#ifndef CONFIG_COMMON_CLK

#include <mach/clock.h>

#include "clock.h"

#endif



#define DA8XX_USB0_BASE		0x01e00000

#define DA8XX_USB1_BASE		0x01e25000



#ifndef CONFIG_COMMON_CLK

static struct clk *usb20_clk;

#endif



static struct da8xx_usb_phy_platform_data da8xx_usb_phy_pdata;
@@ -134,6 +140,7 @@ int __init da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata) 
	return platform_device_register(&da8xx_usb11_device);

}



#ifndef CONFIG_COMMON_CLK

static struct clk usb_refclkin = {

	.name		= "usb_refclkin",

	.set_rate	= davinci_simple_set_rate,
@@ -360,3 +367,18 @@ int __init da8xx_register_usb11_phy_clk(bool use_usb_refclkin) 


	return ret;

}

#endif

static struct platform_device da8xx_usb_phy_clks_device = {

	.name		= "da830-usb-phy-clks",

	.id		= -1,

};



int __init da8xx_register_usb_phy_clocks(void)

{

	struct da8xx_cfgchip_clk_platform_data pdata;



	pdata.cfgchip = da8xx_get_cfgchip();

	da8xx_usb_phy_clks_device.dev.platform_data = &pdata;



	return platform_device_register(&da8xx_usb_phy_clks_device);

}