Commit fe54d9ba authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Greg Kroah-Hartman
Browse files

usb: ohci: nxp: remove direct access to clock controller registers 



Direct access to clock control registers can be safely removed, the
task of clock management is done by platform clock driver based on
common clock framework.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8073fb82

drivers/usb/host/ohci-nxp.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -34,16 +34,6 @@ 
#include <mach/hardware.h>

#include <mach/hardware.h>





#define USB_CONFIG_BASE		0x31020000

#define USB_CONFIG_BASE		0x31020000

#define PWRMAN_BASE		0x40004000



#define USB_CTRL		IO_ADDRESS(PWRMAN_BASE + 0x64)



/* USB_CTRL bit defines */

#define USB_SLAVE_HCLK_EN	(1 << 24)

#define USB_DEV_NEED_CLK_EN	(1 << 22)

#define USB_HOST_NEED_CLK_EN	(1 << 21)

#define PAD_CONTROL_LAST_DRIVEN	(1 << 19)



#define USB_OTG_STAT_CONTROL	IO_ADDRESS(USB_CONFIG_BASE + 0x110)

#define USB_OTG_STAT_CONTROL	IO_ADDRESS(USB_CONFIG_BASE + 0x110)





/* USB_OTG_STAT_CONTROL bit defines */

/* USB_OTG_STAT_CONTROL bit defines */
@@ -110,9 +100,6 @@ static void isp1301_configure_lpc32xx(void) 
	i2c_smbus_write_byte_data(isp1301_i2c_client,

	i2c_smbus_write_byte_data(isp1301_i2c_client,

		ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR, ~0);

		ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR, ~0);





	/* Enable usb_need_clk clock after transceiver is initialized */

	__raw_writel(__raw_readl(USB_CTRL) | USB_HOST_NEED_CLK_EN, USB_CTRL);



	printk(KERN_INFO "ISP1301 Vendor ID  : 0x%04x\n",

	printk(KERN_INFO "ISP1301 Vendor ID  : 0x%04x\n",

	      i2c_smbus_read_word_data(isp1301_i2c_client, 0x00));

	      i2c_smbus_read_word_data(isp1301_i2c_client, 0x00));

	printk(KERN_INFO "ISP1301 Product ID : 0x%04x\n",

	printk(KERN_INFO "ISP1301 Product ID : 0x%04x\n",
@@ -185,9 +172,6 @@ static int ohci_hcd_nxp_probe(struct platform_device *pdev) 
		goto fail_disable;

		goto fail_disable;

	}

	}





	/* Enable AHB slave USB clock, needed for further USB clock control */

	__raw_writel(USB_SLAVE_HCLK_EN | PAD_CONTROL_LAST_DRIVEN, USB_CTRL);



	/* Enable USB PLL */

	/* Enable USB PLL */

	usb_pll_clk = devm_clk_get(&pdev->dev, "ck_pll5");

	usb_pll_clk = devm_clk_get(&pdev->dev, "ck_pll5");

	if (IS_ERR(usb_pll_clk)) {

	if (IS_ERR(usb_pll_clk)) {
@@ -230,8 +214,6 @@ static int ohci_hcd_nxp_probe(struct platform_device *pdev) 
		goto fail_otg;

		goto fail_otg;

	}

	}





	__raw_writel(__raw_readl(USB_CTRL) | USB_HOST_NEED_CLK_EN, USB_CTRL);



	ret = clk_prepare_enable(usb_otg_clk);

	ret = clk_prepare_enable(usb_otg_clk);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to start USB DEV Clock\n");

		dev_err(&pdev->dev, "failed to start USB DEV Clock\n");