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

Commit a4c3ddec authored by Venu Byravarasu's avatar Venu Byravarasu Committed by Felipe Balbi
Browse files

usb: phy: fix build break 



During phy interface separation from otg.h, as the enum "usb_otg_state"
was having multiple otg states info and removal of member 'state'
of this enum type from usb_phy struct did not generate any compilation
issues, I removed member state from struct usb_phy.

As this is causing build break in musb code, adding member 'state'
to usb_phy structure.

Signed-off-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1ba8216f

include/linux/usb/otg.h

+0 −24
Original line number Diff line number Diff line
@@ -11,30 +11,6 @@ 


#include <linux/usb/phy.h>



/* OTG defines lots of enumeration states before device reset */

enum usb_otg_state {

	OTG_STATE_UNDEFINED = 0,



	/* single-role peripheral, and dual-role default-b */

	OTG_STATE_B_IDLE,

	OTG_STATE_B_SRP_INIT,

	OTG_STATE_B_PERIPHERAL,



	/* extra dual-role default-b states */

	OTG_STATE_B_WAIT_ACON,

	OTG_STATE_B_HOST,



	/* dual-role default-a */

	OTG_STATE_A_IDLE,

	OTG_STATE_A_WAIT_VRISE,

	OTG_STATE_A_WAIT_BCON,

	OTG_STATE_A_HOST,

	OTG_STATE_A_SUSPEND,

	OTG_STATE_A_PERIPHERAL,

	OTG_STATE_A_WAIT_VFALL,

	OTG_STATE_A_VBUS_ERR,

};



struct usb_otg {

	u8			default_a;

include/linux/usb/phy.h

+25 −0
Original line number Diff line number Diff line
@@ -26,6 +26,30 @@ enum usb_phy_type { 
	USB_PHY_TYPE_USB3,

};



/* OTG defines lots of enumeration states before device reset */

enum usb_otg_state {

	OTG_STATE_UNDEFINED = 0,



	/* single-role peripheral, and dual-role default-b */

	OTG_STATE_B_IDLE,

	OTG_STATE_B_SRP_INIT,

	OTG_STATE_B_PERIPHERAL,



	/* extra dual-role default-b states */

	OTG_STATE_B_WAIT_ACON,

	OTG_STATE_B_HOST,



	/* dual-role default-a */

	OTG_STATE_A_IDLE,

	OTG_STATE_A_WAIT_VRISE,

	OTG_STATE_A_WAIT_BCON,

	OTG_STATE_A_HOST,

	OTG_STATE_A_SUSPEND,

	OTG_STATE_A_PERIPHERAL,

	OTG_STATE_A_WAIT_VFALL,

	OTG_STATE_A_VBUS_ERR,

};



struct usb_phy;

struct usb_otg;
@@ -43,6 +67,7 @@ struct usb_phy { 
	unsigned int		 flags;



	enum usb_phy_type	type;

	enum usb_otg_state	state;

	enum usb_phy_events	last_event;



	struct usb_otg		*otg;