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

Commit b20f3f9e authored by Kiran Raparthy's avatar Kiran Raparthy Committed by Felipe Balbi
Browse files

usb: phy: Handle per-PHY event for connnect and disconnect events 



When usb is connected and enumerated in device mode or when
usb is disconnected, call usb_phy_set_event() from phy drivers
to handle per-PHY event.

[ toddpoynor@google.com : Original patch in Android ]

Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: Android Kernel Team <kernel-team@android.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Benoit Goby <benoit@android.com>
Cc: Todd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarKiran Raparthy <kiran.kumar@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f415fbd1

drivers/usb/phy/phy-ab8500-usb.c

+15 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ static int ab9540_usb_link_status_update(struct ab8500_usb *ab, 
			event = UX500_MUSB_NONE;

		/* Fallback to default B_IDLE as nothing is connected. */

		ab->phy.otg->state = OTG_STATE_B_IDLE;

		usb_phy_set_event(&ab->phy, USB_EVENT_NONE);

		break;



	case USB_LINK_ACA_RID_C_NM_9540:
@@ -459,12 +460,14 @@ static int ab9540_usb_link_status_update(struct ab8500_usb *ab, 
			ab8500_usb_peri_phy_en(ab);

			atomic_notifier_call_chain(&ab->phy.notifier,

					UX500_MUSB_PREPARE, &ab->vbus_draw);

			usb_phy_set_event(&ab->phy, USB_EVENT_ENUMERATED);

		}

		if (ab->mode == USB_IDLE) {

			ab->mode = USB_PERIPHERAL;

			ab8500_usb_peri_phy_en(ab);

			atomic_notifier_call_chain(&ab->phy.notifier,

					UX500_MUSB_PREPARE, &ab->vbus_draw);

			usb_phy_set_event(&ab->phy, USB_EVENT_ENUMERATED);

		}

		if (event != UX500_MUSB_RIDC)

			event = UX500_MUSB_VBUS;
@@ -500,6 +503,7 @@ static int ab9540_usb_link_status_update(struct ab8500_usb *ab, 
		event = UX500_MUSB_CHARGER;

		atomic_notifier_call_chain(&ab->phy.notifier,

				event, &ab->vbus_draw);

		usb_phy_set_event(&ab->phy, USB_EVENT_CHARGER);

		break;



	case USB_LINK_PHYEN_NO_VBUS_NO_IDGND_9540:
@@ -524,6 +528,7 @@ static int ab9540_usb_link_status_update(struct ab8500_usb *ab, 
				ab->mode = USB_IDLE;

				ab->phy.otg->default_a = false;

				ab->vbus_draw = 0;

				usb_phy_set_event(&ab->phy, USB_EVENT_NONE);

			}

		}

		break;
@@ -583,6 +588,7 @@ static int ab8540_usb_link_status_update(struct ab8500_usb *ab, 
		 * is connected

		 */

		ab->phy.otg->state = OTG_STATE_B_IDLE;

		usb_phy_set_event(&ab->phy, USB_EVENT_NONE);

		break;



	case USB_LINK_ACA_RID_C_NM_8540:
@@ -596,6 +602,7 @@ static int ab8540_usb_link_status_update(struct ab8500_usb *ab, 
			ab8500_usb_peri_phy_en(ab);

			atomic_notifier_call_chain(&ab->phy.notifier,

					UX500_MUSB_PREPARE, &ab->vbus_draw);

			usb_phy_set_event(&ab->phy, USB_EVENT_ENUMERATED);

		}

		if (event != UX500_MUSB_RIDC)

			event = UX500_MUSB_VBUS;
@@ -624,6 +631,7 @@ static int ab8540_usb_link_status_update(struct ab8500_usb *ab, 
		event = UX500_MUSB_CHARGER;

		atomic_notifier_call_chain(&ab->phy.notifier,

				event, &ab->vbus_draw);

		usb_phy_set_event(&ab->phy, USB_EVENT_CHARGER);

		break;



	case USB_LINK_PHYEN_NO_VBUS_NO_IDGND_8540:
@@ -646,6 +654,7 @@ static int ab8540_usb_link_status_update(struct ab8500_usb *ab, 
			ab->mode = USB_IDLE;

			ab->phy.otg->default_a = false;

			ab->vbus_draw = 0;

		usb_phy_set_event(&ab->phy, USB_EVENT_NONE);

		}

		break;
@@ -692,6 +701,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab, 
		 * is connected

		 */

		ab->phy.otg->state = OTG_STATE_B_IDLE;

		usb_phy_set_event(&ab->phy, USB_EVENT_NONE);

		break;



	case USB_LINK_ACA_RID_C_NM_8505:
@@ -705,6 +715,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab, 
			ab8500_usb_peri_phy_en(ab);

			atomic_notifier_call_chain(&ab->phy.notifier,

					UX500_MUSB_PREPARE, &ab->vbus_draw);

			usb_phy_set_event(&ab->phy, USB_EVENT_ENUMERATED);

		}

		if (event != UX500_MUSB_RIDC)

			event = UX500_MUSB_VBUS;
@@ -732,6 +743,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab, 
		event = UX500_MUSB_CHARGER;

		atomic_notifier_call_chain(&ab->phy.notifier,

				event, &ab->vbus_draw);

		usb_phy_set_event(&ab->phy, USB_EVENT_CHARGER);

		break;



	default:
@@ -775,6 +787,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab, 
			event = UX500_MUSB_NONE;

		/* Fallback to default B_IDLE as nothing is connected */

		ab->phy.otg->state = OTG_STATE_B_IDLE;

		usb_phy_set_event(&ab->phy, USB_EVENT_NONE);

		break;



	case USB_LINK_ACA_RID_C_NM_8500:
@@ -792,6 +805,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab, 
			ab8500_usb_peri_phy_en(ab);

			atomic_notifier_call_chain(&ab->phy.notifier,

					UX500_MUSB_PREPARE, &ab->vbus_draw);

			usb_phy_set_event(&ab->phy, USB_EVENT_ENUMERATED);

		}

		if (event != UX500_MUSB_RIDC)

			event = UX500_MUSB_VBUS;
@@ -818,6 +832,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab, 
		event = UX500_MUSB_CHARGER;

		atomic_notifier_call_chain(&ab->phy.notifier,

				event, &ab->vbus_draw);

		usb_phy_set_event(&ab->phy, USB_EVENT_CHARGER);

		break;



	case USB_LINK_RESERVED_8500:

drivers/usb/phy/phy-gpio-vbus-usb.c

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static void gpio_vbus_work(struct work_struct *work) 


		atomic_notifier_call_chain(&gpio_vbus->phy.notifier,

					   status, gpio_vbus->phy.otg->gadget);

		usb_phy_set_event(&gpio_vbus->phy, USB_EVENT_ENUMERATED);

	} else {

		/* optionally disable D+ pullup */

		if (gpio_is_valid(gpio))
@@ -148,6 +149,7 @@ static void gpio_vbus_work(struct work_struct *work) 


		atomic_notifier_call_chain(&gpio_vbus->phy.notifier,

					   status, gpio_vbus->phy.otg->gadget);

		usb_phy_set_event(&gpio_vbus->phy, USB_EVENT_NONE);

	}

}

drivers/usb/phy/phy-mv-usb.c

+2 −0
Original line number Diff line number Diff line
@@ -441,10 +441,12 @@ static void mv_otg_work(struct work_struct *work) 
				mv_otg_start_periphrals(mvotg, 0);

			mv_otg_reset(mvotg);

			mv_otg_disable(mvotg);

			usb_phy_set_event(&mvotg->phy, USB_EVENT_NONE);

			break;

		case OTG_STATE_B_PERIPHERAL:

			mv_otg_enable(mvotg);

			mv_otg_start_periphrals(mvotg, 1);

			usb_phy_set_event(&mvotg->phy, USB_EVENT_ENUMERATED);

			break;

		case OTG_STATE_A_IDLE:

			otg->default_a = 1;

drivers/usb/phy/phy-tahvo.c

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static void check_vbus_state(struct tahvo_usb *tu) 
			if (tu->phy.otg->gadget)

				usb_gadget_vbus_connect(tu->phy.otg->gadget);

			tu->phy.otg->state = OTG_STATE_B_PERIPHERAL;

			usb_phy_set_event(&tu->phy, USB_EVENT_ENUMERATED);

			break;

		case OTG_STATE_A_IDLE:

			/*
@@ -105,6 +106,7 @@ static void check_vbus_state(struct tahvo_usb *tu) 
			if (tu->phy.otg->gadget)

				usb_gadget_vbus_disconnect(tu->phy.otg->gadget);

			tu->phy.otg->state = OTG_STATE_B_IDLE;

			usb_phy_set_event(&tu->phy, USB_EVENT_NONE);

			break;

		case OTG_STATE_A_HOST:

			tu->phy.otg->state = OTG_STATE_A_IDLE;