Commit 7ebfdfa0 authored by Tomer Maimon's avatar Tomer Maimon Committed by Greg Kroah-Hartman
Browse files

usb: host: npcm7xx: remove USB EHCI host reset sequence 



Remove USB EHCI host controller reset sequence from NPCM7XX USB EHCI
host probe function because it is done in the NPCM reset driver.

Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarTomer Maimon <tmaimon77@gmail.com>
Link: https://lore.kernel.org/r/20220718181842.61040-2-tmaimon77@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ad57410d

drivers/usb/host/ehci-npcm7xx.c

+0 −50
Original line number Diff line number Diff line
@@ -22,19 +22,9 @@ 


#include "ehci.h"



#include <linux/regmap.h>

#include <linux/mfd/syscon.h>



#define DRIVER_DESC "EHCI npcm7xx driver"



static const char hcd_name[] = "npcm7xx-ehci";



#define  USB2PHYCTL_OFFSET 0x144



#define  IPSRST2_OFFSET 0x24

#define  IPSRST3_OFFSET 0x34





static struct hc_driver __read_mostly ehci_npcm7xx_hc_driver;



static int __maybe_unused ehci_npcm7xx_drv_suspend(struct device *dev)
@@ -60,52 +50,12 @@ static int npcm7xx_ehci_hcd_drv_probe(struct platform_device *pdev) 
{

	struct usb_hcd *hcd;

	struct resource *res;

	struct regmap *gcr_regmap;

	struct regmap *rst_regmap;

	const struct hc_driver *driver = &ehci_npcm7xx_hc_driver;

	int irq;

	int retval;



	dev_dbg(&pdev->dev,	"initializing npcm7xx ehci USB Controller\n");



	gcr_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-gcr");

	if (IS_ERR(gcr_regmap)) {

		dev_err(&pdev->dev, "%s: failed to find nuvoton,npcm750-gcr\n",

			__func__);

		return PTR_ERR(gcr_regmap);

	}



	rst_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-rst");

	if (IS_ERR(rst_regmap)) {

		dev_err(&pdev->dev, "%s: failed to find nuvoton,npcm750-rst\n",

			__func__);

		return PTR_ERR(rst_regmap);

	}



	/********* phy init  ******/

	// reset usb host

	regmap_update_bits(rst_regmap, IPSRST2_OFFSET,

			(0x1 << 26), (0x1 << 26));

	regmap_update_bits(rst_regmap, IPSRST3_OFFSET,

			(0x1 << 25), (0x1 << 25));

	regmap_update_bits(gcr_regmap, USB2PHYCTL_OFFSET,

			(0x1 << 28), 0);



	udelay(1);



	// enable phy

	regmap_update_bits(rst_regmap, IPSRST3_OFFSET,

			(0x1 << 25), 0);



	udelay(50); // enable phy



	regmap_update_bits(gcr_regmap, USB2PHYCTL_OFFSET,

			(0x1 << 28), (0x1 << 28));



	// enable host

	regmap_update_bits(rst_regmap, IPSRST2_OFFSET,

			(0x1 << 26), 0);



	if (usb_disabled())

		return -ENODEV;