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

Commit 2faa83e2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "USB: musb: pm: don't rely fully on clock support" 



This reverts commit 32d5dc95.

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 224acb18

drivers/usb/musb/musb_core.c

+14 −12
Original line number Original line Diff line number Diff line
@@ -2413,6 +2413,9 @@ static int musb_suspend(struct device *dev) 
	unsigned long	flags;

	unsigned long	flags;

	struct musb	*musb = dev_to_musb(&pdev->dev);

	struct musb	*musb = dev_to_musb(&pdev->dev);





	if (!musb->clock)

		return 0;



	spin_lock_irqsave(&musb->lock, flags);

	spin_lock_irqsave(&musb->lock, flags);





	if (is_peripheral_active(musb)) {

	if (is_peripheral_active(musb)) {
@@ -2427,12 +2430,10 @@ static int musb_suspend(struct device *dev) 




	musb_save_context(musb);

	musb_save_context(musb);





	if (musb->clock) {

	if (musb->set_clock)

	if (musb->set_clock)

		musb->set_clock(musb->clock, 0);

		musb->set_clock(musb->clock, 0);

	else

	else

		clk_disable(musb->clock);

		clk_disable(musb->clock);

	}

	spin_unlock_irqrestore(&musb->lock, flags);

	spin_unlock_irqrestore(&musb->lock, flags);

	return 0;

	return 0;

}

}
@@ -2442,12 +2443,13 @@ static int musb_resume_noirq(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct musb	*musb = dev_to_musb(&pdev->dev);

	struct musb	*musb = dev_to_musb(&pdev->dev);





	if (musb->clock) {

	if (!musb->clock)

		return 0;



	if (musb->set_clock)

	if (musb->set_clock)

		musb->set_clock(musb->clock, 1);

		musb->set_clock(musb->clock, 1);

	else

	else

		clk_enable(musb->clock);

		clk_enable(musb->clock);

	}





	musb_restore_context(musb);

	musb_restore_context(musb);