Commit 8e0285ab authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM/musb: omap2: Remove global GPIO numbers from TUSB6010 



The TUSB6010 (MUSB) device is picking up some GPIO lines
hardcoded by number and passing on to the TUSB6010 device
when registering it.

Instead of nasty workarounds, provide a GPIO descriptor
table and then make the TUSB6010 MUSB glue driver pick up
the GPIO lines directly, convert it to an IRQ and pass down
to the MUSB driver. OMAP2 is the only system using the
TUSB6010.

Stash the GPIO descriptors in the glue layer and use
then to power up and down the TUSB6010 on-demand, instead
of using boardfile callbacks.

Since the OMAP2 boards are the only boards using the
.set_power() and .board_set_power() callbacks, we can
just delete them as the power is now handled directly
in the TUSB6010 glue code.

Cc: Bin Liu <b-liu@ti.com>
Cc: linux-usb@vger.kernel.org
Fixes: 92bf78b3 ("gpio: omap: use dynamic allocation of base")
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 078dc519

arch/arm/mach-omap2/board-n8x0.c

+18 −53
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 


#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <linux/gpio/consumer.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irq.h>
@@ -29,13 +29,12 @@ 


#include "common.h"

#include "mmc.h"

#include "usb-tusb6010.h"

#include "soc.h"

#include "common-board-devices.h"



#define TUSB6010_ASYNC_CS	1

#define TUSB6010_SYNC_CS	4

#define TUSB6010_GPIO_INT	58

#define TUSB6010_GPIO_ENABLE	0

#define TUSB6010_DMACHAN	0x3f



#define NOKIA_N810_WIMAX	(1 << 2)
@@ -62,37 +61,6 @@ static void board_check_revision(void) 
}



#if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)

/*

 * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and

 * 1.5 V voltage regulators of PM companion chip. Companion chip will then

 * provide then PGOOD signal to TUSB6010 which will release it from reset.

 */

static int tusb_set_power(int state)

{

	int i, retval = 0;



	if (state) {

		gpio_set_value(TUSB6010_GPIO_ENABLE, 1);

		msleep(1);



		/* Wait until TUSB6010 pulls INT pin down */

		i = 100;

		while (i && gpio_get_value(TUSB6010_GPIO_INT)) {

			msleep(1);

			i--;

		}



		if (!i) {

			printk(KERN_ERR "tusb: powerup failed\n");

			retval = -ENODEV;

		}

	} else {

		gpio_set_value(TUSB6010_GPIO_ENABLE, 0);

		msleep(10);

	}



	return retval;

}



static struct musb_hdrc_config musb_config = {

	.multipoint	= 1,
@@ -103,39 +71,36 @@ static struct musb_hdrc_config musb_config = { 


static struct musb_hdrc_platform_data tusb_data = {

	.mode		= MUSB_OTG,

	.set_power	= tusb_set_power,

	.min_power	= 25,	/* x2 = 50 mA drawn from VBUS as peripheral */

	.power		= 100,	/* Max 100 mA VBUS for host mode */

	.config		= &musb_config,

};



static struct gpiod_lookup_table tusb_gpio_table = {

	.dev_id = "musb-tusb",

	.table = {

		GPIO_LOOKUP("gpio-0-15", 0, "enable",

			    GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("gpio-48-63", 10, "int",

			    GPIO_ACTIVE_HIGH),

		{ }

	},

};



static void __init n8x0_usb_init(void)

{

	int ret = 0;

	static const char announce[] __initconst = KERN_INFO "TUSB 6010\n";



	/* PM companion chip power control pin */

	ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW,

			       "TUSB6010 enable");

	if (ret != 0) {

		printk(KERN_ERR "Could not get TUSB power GPIO%i\n",

		       TUSB6010_GPIO_ENABLE);

		return;

	}

	tusb_set_power(0);



	gpiod_add_lookup_table(&tusb_gpio_table);

	ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2,

				       TUSB6010_ASYNC_CS, TUSB6010_SYNC_CS,

					TUSB6010_GPIO_INT, TUSB6010_DMACHAN);

				       TUSB6010_DMACHAN);

	if (ret != 0)

		goto err;

		return;



	printk(announce);

	pr_info("TUSB 6010\n");



	return;



err:

	gpio_free(TUSB6010_GPIO_ENABLE);

}

#else

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

+4 −16
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
#include <linux/errno.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/export.h>

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



#include <linux/usb/musb.h>



#include "usb-tusb6010.h"

#include "gpmc.h"



static u8		async_cs, sync_cs;
@@ -132,10 +132,6 @@ static struct resource tusb_resources[] = { 
	{ /* Synchronous access */

		.flags	= IORESOURCE_MEM,

	},

	{ /* IRQ */

		.name	= "mc",

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 tusb_dmamask = ~(u32)0;
@@ -154,9 +150,9 @@ static struct platform_device tusb_device = { 


/* this may be called only from board-*.c setup code */

int __init tusb6010_setup_interface(struct musb_hdrc_platform_data *data,

		unsigned ps_refclk, unsigned waitpin,

		unsigned async, unsigned sync,

		unsigned irq, unsigned dmachan)

		unsigned int ps_refclk, unsigned int waitpin,

		unsigned int async, unsigned int sync,

		unsigned int dmachan)

{

	int		status;

	static char	error[] __initdata =
@@ -192,14 +188,6 @@ int __init tusb6010_setup_interface(struct musb_hdrc_platform_data *data, 
	if (status < 0)

		return status;



	/* IRQ */

	status = gpio_request_one(irq, GPIOF_IN, "TUSB6010 irq");

	if (status < 0) {

		printk(error, 3, status);

		return status;

	}

	tusb_resources[2].start = gpio_to_irq(irq);



	/* set up memory timings ... can speed them up later */

	if (!ps_refclk) {

		printk(error, 4, status);

arch/arm/mach-omap2/usb-tusb6010.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef __USB_TUSB6010_H

#define __USB_TUSB6010_H



extern int __init tusb6010_setup_interface(

		struct musb_hdrc_platform_data *data,

		unsigned int ps_refclk, unsigned int waitpin,

		unsigned int async_cs, unsigned int sync_cs,

		unsigned int dmachan);



#endif /* __USB_TUSB6010_H */

drivers/usb/musb/musb_core.c

+0 −1
Original line number Diff line number Diff line
@@ -2330,7 +2330,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 


	spin_lock_init(&musb->lock);

	spin_lock_init(&musb->list_lock);

	musb->board_set_power = plat->set_power;

	musb->min_power = plat->min_power;

	musb->ops = plat->platform_ops;

	musb->port_mode = plat->mode;

drivers/usb/musb/musb_core.h

+0 −2
Original line number Diff line number Diff line
@@ -352,8 +352,6 @@ struct musb { 
	u16 epmask;

	u8 nr_endpoints;



	int			(*board_set_power)(int state);



	u8			min_power;	/* vbus for periph, in mA/2 */



	enum musb_mode		port_mode;