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

Commit 488c9cd3 authored by Anton Tikhomirov's avatar Anton Tikhomirov Committed by Greg Kroah-Hartman
Browse files

USB: phy: samsung: Support multiple PHYs of same type 



This patch removes limitation when only one PHY of specific type
could be used.

Signed-off-by: default avatarAnton Tikhomirov <av.tikhomirov@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f74b75e7

drivers/usb/phy/phy-samsung-usb2.c

+2 −1
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ static int samsung_usb2phy_probe(struct platform_device *pdev) 
	sphy->drv_data		= drv_data;

	sphy->phy.dev		= sphy->dev;

	sphy->phy.label		= "samsung-usb2phy";

	sphy->phy.type		= USB_PHY_TYPE_USB2;

	sphy->phy.init		= samsung_usb2phy_init;

	sphy->phy.shutdown	= samsung_usb2phy_shutdown;
@@ -426,7 +427,7 @@ static int samsung_usb2phy_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, sphy);



	return usb_add_phy(&sphy->phy, USB_PHY_TYPE_USB2);

	return usb_add_phy_dev(&sphy->phy);

}



static int samsung_usb2phy_remove(struct platform_device *pdev)

drivers/usb/phy/phy-samsung-usb3.c

+2 −1
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static int samsung_usb3phy_probe(struct platform_device *pdev) 
	sphy->clk		= clk;

	sphy->phy.dev		= sphy->dev;

	sphy->phy.label		= "samsung-usb3phy";

	sphy->phy.type		= USB_PHY_TYPE_USB3;

	sphy->phy.init		= samsung_usb3phy_init;

	sphy->phy.shutdown	= samsung_usb3phy_shutdown;

	sphy->drv_data		= samsung_usbphy_get_driver_data(pdev);
@@ -283,7 +284,7 @@ static int samsung_usb3phy_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, sphy);



	return usb_add_phy(&sphy->phy, USB_PHY_TYPE_USB3);

	return usb_add_phy_dev(&sphy->phy);

}



static int samsung_usb3phy_remove(struct platform_device *pdev)