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

Commit 224acb18 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "USB: musb: blackfin: pm: make it work" 



This reverts commit 1e393c6e.

Needed to properly merge the musb changes that are in the
usb-next branch into Linus's tree.

Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b0c3844d

drivers/usb/musb/blackfin.c

+23 −49
Original line number Diff line number Diff line
@@ -324,8 +324,30 @@ int musb_platform_set_mode(struct musb *musb, u8 musb_mode) 
	return -EIO;

}



static void musb_platform_reg_init(struct musb *musb)

int __init musb_platform_init(struct musb *musb, void *board_data)

{



	/*

	 * Rev 1.0 BF549 EZ-KITs require PE7 to be high for both DEVICE

	 * and OTG HOST modes, while rev 1.1 and greater require PE7 to

	 * be low for DEVICE mode and high for HOST mode. We set it high

	 * here because we are in host mode

	 */



	if (gpio_request(musb->config->gpio_vrsel, "USB_VRSEL")) {

		printk(KERN_ERR "Failed ro request USB_VRSEL GPIO_%d \n",

			musb->config->gpio_vrsel);

		return -ENODEV;

	}

	gpio_direction_output(musb->config->gpio_vrsel, 0);



	usb_nop_xceiv_register();

	musb->xceiv = otg_get_transceiver();

	if (!musb->xceiv) {

		gpio_free(musb->config->gpio_vrsel);

		return -ENODEV;

	}



	if (ANOMALY_05000346) {

		bfin_write_USB_APHY_CALIB(ANOMALY_05000346_value);

		SSYNC();
@@ -360,33 +382,6 @@ static void musb_platform_reg_init(struct musb *musb) 
				EP2_RX_ENA | EP3_RX_ENA | EP4_RX_ENA |

				EP5_RX_ENA | EP6_RX_ENA | EP7_RX_ENA);

	SSYNC();

}



int __init musb_platform_init(struct musb *musb, void *board_data)

{



	/*

	 * Rev 1.0 BF549 EZ-KITs require PE7 to be high for both DEVICE

	 * and OTG HOST modes, while rev 1.1 and greater require PE7 to

	 * be low for DEVICE mode and high for HOST mode. We set it high

	 * here because we are in host mode

	 */



	if (gpio_request(musb->config->gpio_vrsel, "USB_VRSEL")) {

		printk(KERN_ERR "Failed ro request USB_VRSEL GPIO_%d\n",

			musb->config->gpio_vrsel);

		return -ENODEV;

	}

	gpio_direction_output(musb->config->gpio_vrsel, 0);



	usb_nop_xceiv_register();

	musb->xceiv = otg_get_transceiver();

	if (!musb->xceiv) {

		gpio_free(musb->config->gpio_vrsel);

		return -ENODEV;

	}



	musb_platform_reg_init(musb);



	if (is_host_enabled(musb)) {

		musb->board_set_vbus = bfin_set_vbus;
@@ -401,27 +396,6 @@ int __init musb_platform_init(struct musb *musb, void *board_data) 
	return 0;

}



#ifdef CONFIG_PM

void musb_platform_save_context(struct musb *musb,

			struct musb_context_registers *musb_context)

{

	if (is_host_active(musb))

		/*

		 * During hibernate gpio_vrsel will change from high to low

		 * low which will generate wakeup event resume the system

		 * immediately.  Set it to 0 before hibernate to avoid this

		 * wakeup event.

		 */

		gpio_set_value(musb->config->gpio_vrsel, 0);

}



void musb_platform_restore_context(struct musb *musb,

			struct musb_context_registers *musb_context)

{

	musb_platform_reg_init(musb);

}

#endif



int musb_platform_exit(struct musb *musb)

{

	gpio_free(musb->config->gpio_vrsel);

drivers/usb/musb/musb_core.h

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ struct musb_context_registers { 
};



#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \

    defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_BLACKFIN)

    defined(CONFIG_ARCH_OMAP4)

extern void musb_platform_save_context(struct musb *musb,

		struct musb_context_registers *musb_context);

extern void musb_platform_restore_context(struct musb *musb,