Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63b68901 authored Dec 14, 2012 by Roger Quadros Committed by Tony Lindgren Dec 14, 2012

mfd: omap-usb-host: get rid of cpu_is_omap..() macros



Instead of using cpu_is_omap..() macros in the device driver we
rely on information provided in the platform data.

The only information we need is whether the USB Host module has
a single ULPI bypass control bit for all ports or individual bypass
control bits for each port. OMAP3 REV2.1 and earlier have the former.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
[tony@atomide.com: updated to remove plat/cpu.h]
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent 657b9dee

arch/arm/mach-omap2/usb-host.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -508,6 +508,10 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
	if (cpu_is_omap34xx()) {		if (cpu_is_omap34xx()) {
	setup_ehci_io_mux(pdata->port_mode);		setup_ehci_io_mux(pdata->port_mode);
	setup_ohci_io_mux(pdata->port_mode);		setup_ohci_io_mux(pdata->port_mode);

			if (omap_rev() <= OMAP3430_REV_ES2_1)
			usbhs_data.single_ulpi_bypass = true;

	} else if (cpu_is_omap44xx()) {		} else if (cpu_is_omap44xx()) {
	setup_4430ehci_io_mux(pdata->port_mode);		setup_4430ehci_io_mux(pdata->port_mode);
	setup_4430ohci_io_mux(pdata->port_mode);		setup_4430ohci_io_mux(pdata->port_mode);

drivers/mfd/omap-usb-host.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@
	#include <linux/dma-mapping.h>		#include <linux/dma-mapping.h>
	#include <linux/spinlock.h>		#include <linux/spinlock.h>
	#include <linux/gpio.h>		#include <linux/gpio.h>
	#include <plat/cpu.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/platform_data/usb-omap.h>		#include <linux/platform_data/usb-omap.h>
	#include <linux/pm_runtime.h>		#include <linux/pm_runtime.h>
	@@ -384,7 +383,7 @@ static void omap_usbhs_init(struct device *dev)
	reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;		reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;

	/* Bypass the TLL module for PHY mode operation */		/* Bypass the TLL module for PHY mode operation */
	if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {		if (pdata->single_ulpi_bypass) {
	dev_dbg(dev, "OMAP3 ES version <= ES2.1\n");		dev_dbg(dev, "OMAP3 ES version <= ES2.1\n");
	if (is_ehci_phy_mode(pdata->port_mode[0]) \|\|		if (is_ehci_phy_mode(pdata->port_mode[0]) \|\|
	is_ehci_phy_mode(pdata->port_mode[1]) \|\|		is_ehci_phy_mode(pdata->port_mode[1]) \|\|

include/linux/platform_data/usb-omap.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,9 @@ struct usbhs_omap_platform_data {

	struct ehci_hcd_omap_platform_data *ehci_data;		struct ehci_hcd_omap_platform_data *ehci_data;
	struct ohci_hcd_omap_platform_data *ohci_data;		struct ohci_hcd_omap_platform_data *ohci_data;

			/* OMAP3 <= ES2.1 have a single ulpi bypass control bit */
			unsigned single_ulpi_bypass:1;
	};		};

	/-------------------------------------------------------------------------/		/-------------------------------------------------------------------------/