Merge tag 'usb-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes:

USB for v4.20

With 63 non-merge commits, this is not a large merge window for USB
peripheral. The largest changes go to the UVC gadget driver which a
few folks have been improving.

Apart from UVC changes, we have a few more devices being added to
Renesas USB3 and DWC3 controller drivers and a couple minor bug fixes
on other drivers.

* tag 'usb-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (63 commits)
  USB: net2280: Remove ->disconnect() callback from net2280_pullup()
  usb: dwc2: disable power_down on rockchip devices
  usb: gadget: udc: renesas_usb3: add support for r8a77990
  dt-bindings: usb: renesas_usb3: add bindings for r8a77990
  usb: gadget: udc: renesas_usb3: Add r8a774a1 support
  usb: gadget: udc: renesas_usb3: Fix b-device mode for "workaround"
  usb: dwc2: gadget: Add handler for WkupAlert interrupt
  usb: dwc2: gadget: enable WKUP_ALERT interrupt
  usb: dwc2: gadget: Program GREFCLK register
  usb: dwc2: gadget: Add parameters for GREFCLK register
  usb: dwc2: Add definitions for new registers
  usb: dwc2: Update target (u)frame calculation
  usb: dwc2: Add dwc2_gadget_dec_frame_num_by_one() function
  usb: dwc2: Add core parameter for service interval support
  usb: dwc2: Update registers definitions to support service interval
  usb: renesas_usbhs: add support for R-Car E3
  dt-bindings: usb: renesas_usbhs: add bindings for r8a77990
  usb: renesas_usbhs: rcar3: Use OTG mode for R-Car D3
  Revert "usb: renesas_usbhs: set the mode by using extcon state for non-otg channel"
  usb: gadget: f_uac2: disable IN/OUT ep if unused
  ...

31 files changed, 1464 insertions, 930 deletions

diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc
index 9281e2aa38df..809765bd9573 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -12,6 +12,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Control descriptors
 
+                All attributes read only:
+                bInterfaceNumber        - USB interface number for this
+                                          streaming interface
+
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class
 Date:           Dec 2014
 KernelVersion:  4.0
@@ -109,6 +113,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Streaming descriptors
 
+                All attributes read only:
+                bInterfaceNumber        - USB interface number for this
+                                          streaming interface
+
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class
 Date:           Dec 2014
 KernelVersion:  4.0
@@ -160,6 +168,10 @@ Description:	Specific MJPEG format descriptors
 
                 All attributes read only,
                 except bmaControls and bDefaultFrameIndex:
+                bFormatIndex            - unique id for this format descriptor;
+                                        only defined after parent header is
+                                        linked into the streaming class;
+                                        read-only
                 bmaControls             - this format's data for bmaControls in
                                         the streaming header
                 bmInterfaceFlags        - specifies interlace information,
@@ -177,6 +189,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Specific MJPEG frame descriptors
 
+                bFrameIndex             - unique id for this framedescriptor;
+                                        only defined after parent format is
+                                        linked into the streaming header;
+                                        read-only
                 dwFrameInterval         - indicates how frame interval can be
                                         programmed; a number of values
                                         separated by newline can be specified
@@ -204,6 +220,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Specific uncompressed format descriptors
 
+                bFormatIndex            - unique id for this format descriptor;
+                                        only defined after parent header is
+                                        linked into the streaming class;
+                                        read-only
                 bmaControls             - this format's data for bmaControls in
                                         the streaming header
                 bmInterfaceFlags        - specifies interlace information,
@@ -224,6 +244,10 @@ Date:		Dec 2014
 KernelVersion:  4.0
 Description:    Specific uncompressed frame descriptors
 
+                bFrameIndex             - unique id for this framedescriptor;
+                                        only defined after parent format is
+                                        linked into the streaming header;
+                                        read-only
                 dwFrameInterval         - indicates how frame interval can be
                                         programmed; a number of values
                                         separated by newline can be specified
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 3e4c38b806ac..636630fb92d7 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -19,6 +19,7 @@ Exception for clocks:
     "cavium,octeon-7130-usb-uctl"
     "qcom,dwc3"
     "samsung,exynos5250-dwusb3"
+    "samsung,exynos5433-dwusb3"
     "samsung,exynos7-dwusb3"
     "sprd,sc9860-dwc3"
     "st,stih407-dwc3"
diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt
index c97374315049..b7111f43fa59 100644
--- a/Documentation/devicetree/bindings/usb/exynos-usb.txt
+++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -83,6 +83,8 @@ Required properties:
  - compatible: should be one of the following -
                "samsung,exynos5250-dwusb3": for USB 3.0 DWC3 controller on
                                             Exynos5250/5420.
+               "samsung,exynos5433-dwusb3": for USB 3.0 DWC3 controller on
+                                            Exynos5433.
                "samsung,exynos7-dwusb3": for USB 3.0 DWC3 controller on Exynos7.
  - #address-cells, #size-cells : should be '1' if the device has sub-nodes
                                  with 'reg' property.
diff --git a/Documentation/devicetree/bindings/usb/renesas_usb3.txt b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
index b22f0a519991..d366555166d0 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
@@ -6,6 +6,7 @@ Required properties:
         - "renesas,r8a7795-usb3-peri"
         - "renesas,r8a7796-usb3-peri"
         - "renesas,r8a77965-usb3-peri"
+        - "renesas,r8a77990-usb3-peri"
         - "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 or RZ/G2
           compatible device
 
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index cc9c93affa14..30bab8463c96 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -393,6 +393,20 @@ enum dwc2_ep0_state {
  *                      0 - No
  *                      1 - Yes
  * @hird_threshold:     Value of BESL or HIRD Threshold.
+ * @ref_clk_per:        Indicates in terms of pico seconds the period
+ *                      of ref_clk.
+ *                      62500 - 16MHz
+ *                      58823 - 17MHz
+ *                      52083 - 19.2MHz
+ *                      50000 - 20MHz
+ *                      41666 - 24MHz
+ *                      33333 - 30MHz (default)
+ *                      25000 - 40MHz
+ * @sof_cnt_wkup_alert: Indicates in term of number of SOF's after which
+ *                      the controller should generate an interrupt if the
+ *                      device had been in L1 state until that period.
+ *                      This is used by SW to initiate Remote WakeUp in the
+ *                      controller so as to sync to the uF number from the host.
  * @activate_stm_fs_transceiver: Activate internal transceiver using GGPIO
  *                      register.
  *                      0 - Deactivate the transceiver (default)
@@ -416,6 +430,9 @@ enum dwc2_ep0_state {
  *                      back to DWC2_SPEED_PARAM_HIGH while device is gone.
  *                      0 - No (default)
  *                      1 - Yes
+ * @service_interval:   Enable service interval based scheduling.
+ *                      0 - No
+ *                      1 - Yes
  *
  * The following parameters may be specified when starting the module. These
  * parameters define how the DWC_otg controller should be configured. A
@@ -461,6 +478,7 @@ struct dwc2_core_params {
         bool lpm_clock_gating;
         bool besl;
         bool hird_threshold_en;
+        bool service_interval;
         u8 hird_threshold;
         bool activate_stm_fs_transceiver;
         bool ipg_isoc_en;
@@ -468,6 +486,10 @@ struct dwc2_core_params {
         u32 max_transfer_size;
         u32 ahbcfg;
 
+        /* GREFCLK parameters */
+        u32 ref_clk_per;
+        u16 sof_cnt_wkup_alert;
+
         /* Host parameters */
         bool host_dma;
         bool dma_desc_enable;
@@ -605,6 +627,10 @@ struct dwc2_core_params {
  *                      FIFO sizing is enabled 16 to 32768
  *                      Actual maximum value is autodetected and also
  *                      the default.
+ * @service_interval_mode: For enabling service interval based scheduling in the
+ *                         controller.
+ *                           0 - Disable
+ *                           1 - Enable
  */
 struct dwc2_hw_params {
         unsigned op_mode:3;
@@ -635,6 +661,7 @@ struct dwc2_hw_params {
         unsigned utmi_phy_data_width:2;
         unsigned lpm_mode:1;
         unsigned ipg_isoc_en:1;
+        unsigned service_interval_mode:1;
         u32 snpsid;
         u32 dev_ep_dirs;
         u32 g_tx_fifo_size[MAX_EPS_CHANNELS];
@@ -1354,6 +1381,7 @@ int dwc2_hsotg_tx_fifo_count(struct dwc2_hsotg *hsotg);
 int dwc2_hsotg_tx_fifo_total_depth(struct dwc2_hsotg *hsotg);
 int dwc2_hsotg_tx_fifo_average_depth(struct dwc2_hsotg *hsotg);
 void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg);
+void dwc2_gadget_program_ref_clk(struct dwc2_hsotg *hsotg);
 #else
 static inline int dwc2_hsotg_remove(struct dwc2_hsotg *dwc2)
 { return 0; }
@@ -1388,6 +1416,7 @@ static inline int dwc2_hsotg_tx_fifo_total_depth(struct dwc2_hsotg *hsotg)
 static inline int dwc2_hsotg_tx_fifo_average_depth(struct dwc2_hsotg *hsotg)
 { return 0; }
 static inline void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg) {}
+static inline void dwc2_gadget_program_ref_clk(struct dwc2_hsotg *hsotg) {}
 #endif
 
 #if IS_ENABLED(CONFIG_USB_DWC2_HOST) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 22d015b0424f..7f62f4cdc265 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -701,6 +701,7 @@ static int params_show(struct seq_file *seq, void *v)
         print_param(seq, p, besl);
         print_param(seq, p, hird_threshold_en);
         print_param(seq, p, hird_threshold);
+        print_param(seq, p, service_interval);
         print_param(seq, p, host_dma);
         print_param(seq, p, g_dma);
         print_param(seq, p, g_dma_desc);
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 220c0f9b89b0..2d6d2c8244de 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -123,6 +123,24 @@ static inline void dwc2_gadget_incr_frame_num(struct dwc2_hsotg_ep *hs_ep)
 }
 
 /**
+ * dwc2_gadget_dec_frame_num_by_one - Decrements the targeted frame number
+ *                                    by one.
+ * @hs_ep: The endpoint.
+ *
+ * This function used in service interval based scheduling flow to calculate
+ * descriptor frame number filed value. For service interval mode frame
+ * number in descriptor should point to last (u)frame in the interval.
+ *
+ */
+static inline void dwc2_gadget_dec_frame_num_by_one(struct dwc2_hsotg_ep *hs_ep)
+{
+        if (hs_ep->target_frame)
+                hs_ep->target_frame -= 1;
+        else
+                hs_ep->target_frame = DSTS_SOFFN_LIMIT;
+}
+
+/**
  * dwc2_hsotg_en_gsint - enable one or more of the general interrupt
  * @hsotg: The device state
  * @ints: A bitmask of the interrupts to enable
@@ -228,6 +246,27 @@ int dwc2_hsotg_tx_fifo_total_depth(struct dwc2_hsotg *hsotg)
 }
 
 /**
+ * dwc2_gadget_wkup_alert_handler - Handler for WKUP_ALERT interrupt
+ *
+ * @hsotg: Programming view of the DWC_otg controller
+ *
+ */
+static void dwc2_gadget_wkup_alert_handler(struct dwc2_hsotg *hsotg)
+{
+        u32 gintsts2;
+        u32 gintmsk2;
+
+        gintsts2 = dwc2_readl(hsotg, GINTSTS2);
+        gintmsk2 = dwc2_readl(hsotg, GINTMSK2);
+
+        if (gintsts2 & GINTSTS2_WKUP_ALERT_INT) {
+                dev_dbg(hsotg->dev, "%s: Wkup_Alert_Int\n", __func__);
+                dwc2_clear_bit(hsotg, GINTSTS2, GINTSTS2_WKUP_ALERT_INT);
+                dwc2_set_bit(hsotg, DCFG, DCTL_RMTWKUPSIG);
+        }
+}
+
+/**
  * dwc2_hsotg_tx_fifo_average_depth - returns average depth of device mode
  * TX FIFOs
  *
@@ -2812,6 +2851,23 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep)
                 if (using_desc_dma(hsotg)) {
                         hs_ep->target_frame = hsotg->frame_number;
                         dwc2_gadget_incr_frame_num(hs_ep);
+
+                        /* In service interval mode target_frame must
+                         * be set to last (u)frame of the service interval.
+                         */
+                        if (hsotg->params.service_interval) {
+                                /* Set target_frame to the first (u)frame of
+                                 * the service interval
+                                 */
+                                hs_ep->target_frame &= ~hs_ep->interval + 1;
+
+                                /* Set target_frame to the last (u)frame of
+                                 * the service interval
+                                 */
+                                dwc2_gadget_incr_frame_num(hs_ep);
+                                dwc2_gadget_dec_frame_num_by_one(hs_ep);
+                        }
+
                         dwc2_gadget_start_isoc_ddma(hs_ep);
                         return;
                 }
@@ -3109,6 +3165,8 @@ static void kill_all_requests(struct dwc2_hsotg *hsotg,
                 dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);
 }
 
+static int dwc2_hsotg_ep_disable(struct usb_ep *ep);
+
 /**
  * dwc2_hsotg_disconnect - disconnect service
  * @hsotg: The device state.
@@ -3127,13 +3185,12 @@ void dwc2_hsotg_disconnect(struct dwc2_hsotg *hsotg)
         hsotg->connected = 0;
         hsotg->test_mode = 0;
 
+        /* all endpoints should be shutdown */
         for (ep = 0; ep < hsotg->num_of_eps; ep++) {
                 if (hsotg->eps_in[ep])
-                        kill_all_requests(hsotg, hsotg->eps_in[ep],
-                                          -ESHUTDOWN);
+                        dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
                 if (hsotg->eps_out[ep])
-                        kill_all_requests(hsotg, hsotg->eps_out[ep],
-                                          -ESHUTDOWN);
+                        dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
         }
 
         call_gadget(hsotg, disconnect);
@@ -3191,13 +3248,23 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         u32 val;
         u32 usbcfg;
         u32 dcfg = 0;
+        int ep;
 
         /* Kill any ep0 requests as controller will be reinitialized */
         kill_all_requests(hsotg, hsotg->eps_out[0], -ECONNRESET);
 
-        if (!is_usb_reset)
+        if (!is_usb_reset) {
                 if (dwc2_core_reset(hsotg, true))
                         return;
+        } else {
+                /* all endpoints should be shutdown */
+                for (ep = 1; ep < hsotg->num_of_eps; ep++) {
+                        if (hsotg->eps_in[ep])
+                                dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);
+                        if (hsotg->eps_out[ep])
+                                dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);
+                }
+        }
 
         /*
          * we must now enable ep0 ready for host detection and then
@@ -3312,6 +3379,10 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
                 dwc2_set_bit(hsotg, DIEPMSK, DIEPMSK_BNAININTRMSK);
         }
 
+        /* Enable Service Interval mode if supported */
+        if (using_desc_dma(hsotg) && hsotg->params.service_interval)
+                dwc2_set_bit(hsotg, DCTL, DCTL_SERVICE_INTERVAL_SUPPORTED);
+
         dwc2_writel(hsotg, 0, DAINTMSK);
 
         dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",
@@ -3368,6 +3439,10 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
         /* configure the core to support LPM */
         dwc2_gadget_init_lpm(hsotg);
 
+        /* program GREFCLK register if needed */
+        if (using_desc_dma(hsotg) && hsotg->params.service_interval)
+                dwc2_gadget_program_ref_clk(hsotg);
+
         /* must be at-least 3ms to allow bus to see disconnect */
         mdelay(3);
 
@@ -3676,6 +3751,10 @@ irq_retry:
         if (gintsts & IRQ_RETRY_MASK && --retry_count > 0)
                 goto irq_retry;
 
+        /* Check WKUP_ALERT interrupt*/
+        if (hsotg->params.service_interval)
+                dwc2_gadget_wkup_alert_handler(hsotg);
+
         spin_unlock(&hsotg->lock);
 
         return IRQ_HANDLED;
@@ -3993,6 +4072,7 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
         unsigned long flags;
         u32 epctrl_reg;
         u32 ctrl;
+        int locked;
 
         dev_dbg(hsotg->dev, "%s(ep %p)\n", __func__, ep);
 
@@ -4008,7 +4088,9 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
 
         epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
 
-        spin_lock_irqsave(&hsotg->lock, flags);
+        locked = spin_is_locked(&hsotg->lock);
+        if (!locked)
+                spin_lock_irqsave(&hsotg->lock, flags);
 
         ctrl = dwc2_readl(hsotg, epctrl_reg);
 
@@ -4032,7 +4114,9 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)
         hs_ep->fifo_index = 0;
         hs_ep->fifo_size = 0;
 
-        spin_unlock_irqrestore(&hsotg->lock, flags);
+        if (!locked)
+                spin_unlock_irqrestore(&hsotg->lock, flags);
+
         return 0;
 }
 
@@ -4944,6 +5028,29 @@ void dwc2_gadget_init_lpm(struct dwc2_hsotg *hsotg)
         val |= hsotg->params.besl ? GLPMCFG_ENBESL : 0;
         dwc2_writel(hsotg, val, GLPMCFG);
         dev_dbg(hsotg->dev, "GLPMCFG=0x%08x\n", dwc2_readl(hsotg, GLPMCFG));
+
+        /* Unmask WKUP_ALERT Interrupt */
+        if (hsotg->params.service_interval)
+                dwc2_set_bit(hsotg, GINTMSK2, GINTMSK2_WKUP_ALERT_INT_MSK);
+}
+
+/**
+ * dwc2_gadget_program_ref_clk - Program GREFCLK register in device mode
+ *
+ * @hsotg: Programming view of DWC_otg controller
+ *
+ */
+void dwc2_gadget_program_ref_clk(struct dwc2_hsotg *hsotg)
+{
+        u32 val = 0;
+
+        val |= GREFCLK_REF_CLK_MODE;
+        val |= hsotg->params.ref_clk_per << GREFCLK_REFCLKPER_SHIFT;
+        val |= hsotg->params.sof_cnt_wkup_alert <<
+               GREFCLK_SOF_CNT_WKUP_ALERT_SHIFT;
+
+        dwc2_writel(hsotg, val, GREFCLK);
+        dev_dbg(hsotg->dev, "GREFCLK=0x%08x\n", dwc2_readl(hsotg, GREFCLK));
 }
 
 /**
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 2bd6e6bfc241..dd82fa516f3f 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -358,16 +358,10 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg)
 
 static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
 {
-        int ret;
-
-        hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
-        if (IS_ERR(hsotg->vbus_supply)) {
-                ret = PTR_ERR(hsotg->vbus_supply);
-                hsotg->vbus_supply = NULL;
-                return ret == -ENODEV ? 0 : ret;
-        }
+        if (hsotg->vbus_supply)
+                return regulator_enable(hsotg->vbus_supply);
 
-        return regulator_enable(hsotg->vbus_supply);
+        return 0;
 }
 
 static int dwc2_vbus_supply_exit(struct dwc2_hsotg *hsotg)
@@ -1328,14 +1322,11 @@ static void dwc2_hc_write_packet(struct dwc2_hsotg *hsotg,
         u32 remaining_count;
         u32 byte_count;
         u32 dword_count;
-        u32 __iomem *data_fifo;
         u32 *data_buf = (u32 *)chan->xfer_buf;
 
         if (dbg_hc(chan))
                 dev_vdbg(hsotg->dev, "%s()\n", __func__);
 
-        data_fifo = (u32 __iomem *)(hsotg->regs + HCFIFO(chan->hc_num));
-
         remaining_count = chan->xfer_len - chan->xfer_count;
         if (remaining_count > chan->max_packet)
                 byte_count = chan->max_packet;
@@ -3564,6 +3555,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
         u32 port_status;
         u32 speed;
         u32 pcgctl;
+        u32 pwr;
 
         switch (typereq) {
         case ClearHubFeature:
@@ -3612,8 +3604,11 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         dev_dbg(hsotg->dev,
                                 "ClearPortFeature USB_PORT_FEAT_POWER\n");
                         hprt0 = dwc2_read_hprt0(hsotg);
+                        pwr = hprt0 & HPRT0_PWR;
                         hprt0 &= ~HPRT0_PWR;
                         dwc2_writel(hsotg, hprt0, HPRT0);
+                        if (pwr)
+                                dwc2_vbus_supply_exit(hsotg);
                         break;
 
                 case USB_PORT_FEAT_INDICATOR:
@@ -3823,8 +3818,11 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         dev_dbg(hsotg->dev,
                                 "SetPortFeature - USB_PORT_FEAT_POWER\n");
                         hprt0 = dwc2_read_hprt0(hsotg);
+                        pwr = hprt0 & HPRT0_PWR;
                         hprt0 |= HPRT0_PWR;
                         dwc2_writel(hsotg, hprt0, HPRT0);
+                        if (!pwr)
+                                dwc2_vbus_supply_init(hsotg);
                         break;
 
                 case USB_PORT_FEAT_RESET:
@@ -3841,6 +3839,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                         dwc2_writel(hsotg, 0, PCGCTL);
 
                         hprt0 = dwc2_read_hprt0(hsotg);
+                        pwr = hprt0 & HPRT0_PWR;
                         /* Clear suspend bit if resetting from suspend state */
                         hprt0 &= ~HPRT0_SUSP;
 
@@ -3854,6 +3853,8 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
                                 dev_dbg(hsotg->dev,
                                         "In host mode, hprt0=%08x\n", hprt0);
                                 dwc2_writel(hsotg, hprt0, HPRT0);
+                                if (!pwr)
+                                        dwc2_vbus_supply_init(hsotg);
                         }
 
                         /* Clear reset bit in 10ms (FS/LS) or 50ms (HS) */
@@ -4393,6 +4394,8 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
         struct dwc2_hsotg *hsotg = dwc2_hcd_to_hsotg(hcd);
         struct usb_bus *bus = hcd_to_bus(hcd);
         unsigned long flags;
+        u32 hprt0;
+        int ret;
 
         dev_dbg(hsotg->dev, "DWC OTG HCD START\n");
 
@@ -4408,6 +4411,17 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
 
         dwc2_hcd_reinit(hsotg);
 
+        hprt0 = dwc2_read_hprt0(hsotg);
+        /* Has vbus power been turned on in dwc2_core_host_init ? */
+        if (hprt0 & HPRT0_PWR) {
+                /* Enable external vbus supply before resuming root hub */
+                spin_unlock_irqrestore(&hsotg->lock, flags);
+                ret = dwc2_vbus_supply_init(hsotg);
+                if (ret)
+                        return ret;
+                spin_lock_irqsave(&hsotg->lock, flags);
+        }
+
         /* Initialize and connect root hub if one is not already attached */
         if (bus->root_hub) {
                 dev_dbg(hsotg->dev, "DWC OTG HCD Has Root Hub\n");
@@ -4417,7 +4431,7 @@ static int _dwc2_hcd_start(struct usb_hcd *hcd)
 
         spin_unlock_irqrestore(&hsotg->lock, flags);
 
-        return dwc2_vbus_supply_init(hsotg);
+        return 0;
 }
 
 /*
@@ -4428,6 +4442,7 @@ static void _dwc2_hcd_stop(struct usb_hcd *hcd)
 {
         struct dwc2_hsotg *hsotg = dwc2_hcd_to_hsotg(hcd);
         unsigned long flags;
+        u32 hprt0;
 
         /* Turn off all host-specific interrupts */
         dwc2_disable_host_interrupts(hsotg);
@@ -4436,6 +4451,7 @@ static void _dwc2_hcd_stop(struct usb_hcd *hcd)
         synchronize_irq(hcd->irq);
 
         spin_lock_irqsave(&hsotg->lock, flags);
+        hprt0 = dwc2_read_hprt0(hsotg);
         /* Ensure hcd is disconnected */
         dwc2_hcd_disconnect(hsotg, true);
         dwc2_hcd_stop(hsotg);
@@ -4444,7 +4460,9 @@ static void _dwc2_hcd_stop(struct usb_hcd *hcd)
         clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
         spin_unlock_irqrestore(&hsotg->lock, flags);
 
-        dwc2_vbus_supply_exit(hsotg);
+        /* keep balanced supply init/exit by checking HPRT0_PWR */
+        if (hprt0 & HPRT0_PWR)
+                dwc2_vbus_supply_exit(hsotg);
 
         usleep_range(1000, 3000);
 }
@@ -4482,7 +4500,9 @@ static int _dwc2_hcd_suspend(struct usb_hcd *hcd)
                 hprt0 |= HPRT0_SUSP;
                 hprt0 &= ~HPRT0_PWR;
                 dwc2_writel(hsotg, hprt0, HPRT0);
+                spin_unlock_irqrestore(&hsotg->lock, flags);
                 dwc2_vbus_supply_exit(hsotg);
+                spin_lock_irqsave(&hsotg->lock, flags);
         }
 
         /* Enter partial_power_down */
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 0ca8e7bc7aaf..2b1ea441b7d4 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -312,6 +312,7 @@
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT       14
 #define GHWCFG4_ACG_SUPPORTED                   BIT(12)
 #define GHWCFG4_IPG_ISOC_SUPPORTED              BIT(11)
+#define GHWCFG4_SERVICE_INTERVAL_SUPPORTED      BIT(10)
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_8           0
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_16          1
 #define GHWCFG4_UTMI_PHY_DATA_WIDTH_8_OR_16     2
@@ -404,6 +405,19 @@
 #define ADPCTL_PRB_DSCHRG_MASK          (0x3 << 0)
 #define ADPCTL_PRB_DSCHRG_SHIFT         0
 
+#define GREFCLK                             HSOTG_REG(0x0064)
+#define GREFCLK_REFCLKPER_MASK              (0x1ffff << 15)
+#define GREFCLK_REFCLKPER_SHIFT             15
+#define GREFCLK_REF_CLK_MODE                BIT(14)
+#define GREFCLK_SOF_CNT_WKUP_ALERT_MASK     (0x3ff)
+#define GREFCLK_SOF_CNT_WKUP_ALERT_SHIFT    0
+
+#define GINTMSK2                        HSOTG_REG(0x0068)
+#define GINTMSK2_WKUP_ALERT_INT_MSK     BIT(0)
+
+#define GINTSTS2                        HSOTG_REG(0x006c)
+#define GINTSTS2_WKUP_ALERT_INT         BIT(0)
+
 #define HPTXFSIZ                        HSOTG_REG(0x100)
 /* Use FIFOSIZE_* constants to access this register */
 
@@ -443,6 +457,7 @@
 #define DCFG_DEVSPD_FS48                3
 
 #define DCTL                            HSOTG_REG(0x804)
+#define DCTL_SERVICE_INTERVAL_SUPPORTED BIT(19)
 #define DCTL_PWRONPRGDONE               BIT(11)
 #define DCTL_CGOUTNAK                   BIT(10)
 #define DCTL_SGOUTNAK                   BIT(9)
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index bf7052e037d6..7c1b6938f212 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -81,6 +81,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
         p->host_perio_tx_fifo_size = 256;
         p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
                 GAHBCFG_HBSTLEN_SHIFT;
+        p->power_down = 0;
 }
 
 static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
@@ -299,9 +300,12 @@ static void dwc2_set_default_params(struct dwc2_hsotg *hsotg)
         p->hird_threshold_en = true;
         p->hird_threshold = 4;
         p->ipg_isoc_en = false;
+        p->service_interval = false;
         p->max_packet_count = hw->max_packet_count;
         p->max_transfer_size = hw->max_transfer_size;
         p->ahbcfg = GAHBCFG_HBSTLEN_INCR << GAHBCFG_HBSTLEN_SHIFT;
+        p->ref_clk_per = 33333;
+        p->sof_cnt_wkup_alert = 100;
 
         if ((hsotg->dr_mode == USB_DR_MODE_HOST) ||
             (hsotg->dr_mode == USB_DR_MODE_OTG)) {
@@ -592,6 +596,7 @@ static void dwc2_check_params(struct dwc2_hsotg *hsotg)
         CHECK_BOOL(besl, (hsotg->hw_params.snpsid >= DWC2_CORE_REV_3_00a));
         CHECK_BOOL(hird_threshold_en, hsotg->params.lpm);
         CHECK_RANGE(hird_threshold, 0, hsotg->params.besl ? 12 : 7, 0);
+        CHECK_BOOL(service_interval, hw->service_interval_mode);
         CHECK_RANGE(max_packet_count,
                     15, hw->max_packet_count,
                     hw->max_packet_count);
@@ -780,6 +785,8 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)
                                   GHWCFG4_UTMI_PHY_DATA_WIDTH_SHIFT;
         hw->acg_enable = !!(hwcfg4 & GHWCFG4_ACG_SUPPORTED);
         hw->ipg_isoc_en = !!(hwcfg4 & GHWCFG4_IPG_ISOC_SUPPORTED);
+        hw->service_interval_mode = !!(hwcfg4 &
+                                       GHWCFG4_SERVICE_INTERVAL_SUPPORTED);
 
         /* fifo sizes */
         hw->rx_fifo_size = (grxfsiz & GRXFSIZ_DEPTH_MASK) >>
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 577642895b57..c0b64d483552 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -432,6 +432,14 @@ static int dwc2_driver_probe(struct platform_device *dev)
         if (retval)
                 return retval;
 
+        hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
+        if (IS_ERR(hsotg->vbus_supply)) {
+                retval = PTR_ERR(hsotg->vbus_supply);
+                hsotg->vbus_supply = NULL;
+                if (retval != -ENODEV)
+                        return retval;
+        }
+
         retval = dwc2_lowlevel_hw_enable(hsotg);
         if (retval)
                 return retval;
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 518ead12458d..1a0404fda596 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -113,7 +113,7 @@ config USB_DWC3_ST
 
 config USB_DWC3_QCOM
         tristate "Qualcomm Platform"
-        depends on ARCH_QCOM || COMPILE_TEST
+        depends on EXTCON && (ARCH_QCOM || COMPILE_TEST)
         depends on OF
         default USB_DWC3
         help
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 88c80fcc39f5..becfbb87f791 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -756,7 +756,7 @@ static void dwc3_core_setup_global_control(struct dwc3 *dwc)
 
         /* check if current dwc3 is on simulation board */
         if (dwc->hwparams.hwparams6 & DWC3_GHWPARAMS6_EN_FPGA) {
-                dev_info(dwc->dev, "Running with FPGA optmizations\n");
+                dev_info(dwc->dev, "Running with FPGA optimizations\n");
                 dwc->is_fpga = true;
         }
 
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index a94fb1ba8f2c..cb7fcd7c0ad8 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -13,80 +13,30 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/usb_phy_generic.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/regulator/consumer.h>
 
+#define DWC3_EXYNOS_MAX_CLOCKS  4
+
+struct dwc3_exynos_driverdata {
+        const char              *clk_names[DWC3_EXYNOS_MAX_CLOCKS];
+        int                     num_clks;
+        int                     suspend_clk_idx;
+};
+
 struct dwc3_exynos {
-        struct platform_device  *usb2_phy;
-        struct platform_device  *usb3_phy;
         struct device           *dev;
 
-        struct clk              *clk;
-        struct clk              *susp_clk;
-        struct clk              *axius_clk;
+        const char              **clk_names;
+        struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
+        int                     num_clks;
+        int                     suspend_clk_idx;
 
         struct regulator        *vdd33;
         struct regulator        *vdd10;
 };
 
-static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
-{
-        struct usb_phy_generic_platform_data pdata;
-        struct platform_device  *pdev;
-        int                     ret;
-
-        memset(&pdata, 0x00, sizeof(pdata));
-
-        pdev = platform_device_alloc("usb_phy_generic", PLATFORM_DEVID_AUTO);
-        if (!pdev)
-                return -ENOMEM;
-
-        exynos->usb2_phy = pdev;
-        pdata.type = USB_PHY_TYPE_USB2;
-        pdata.gpio_reset = -1;
-
-        ret = platform_device_add_data(exynos->usb2_phy, &pdata, sizeof(pdata));
-        if (ret)
-                goto err1;
-
-        pdev = platform_device_alloc("usb_phy_generic", PLATFORM_DEVID_AUTO);
-        if (!pdev) {
-                ret = -ENOMEM;
-                goto err1;
-        }
-
-        exynos->usb3_phy = pdev;
-        pdata.type = USB_PHY_TYPE_USB3;
-
-        ret = platform_device_add_data(exynos->usb3_phy, &pdata, sizeof(pdata));
-        if (ret)
-                goto err2;
-
-        ret = platform_device_add(exynos->usb2_phy);
-        if (ret)
-                goto err2;
-
-        ret = platform_device_add(exynos->usb3_phy);
-        if (ret)
-                goto err3;
-
-        return 0;
-
-err3:
-        platform_device_del(exynos->usb2_phy);
-
-err2:
-        platform_device_put(exynos->usb3_phy);
-
-err1:
-        platform_device_put(exynos->usb2_phy);
-
-        return ret;
-}
-
 static int dwc3_exynos_remove_child(struct device *dev, void *unused)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -101,47 +51,42 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         struct dwc3_exynos      *exynos;
         struct device           *dev = &pdev->dev;
         struct device_node      *node = dev->of_node;
-
-        int                     ret;
+        const struct dwc3_exynos_driverdata *driver_data;
+        int                     i, ret;
 
         exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
         if (!exynos)
                 return -ENOMEM;
 
-        platform_set_drvdata(pdev, exynos);
+        driver_data = of_device_get_match_data(dev);
+        exynos->dev = dev;
+        exynos->num_clks = driver_data->num_clks;
+        exynos->clk_names = (const char **)driver_data->clk_names;
+        exynos->suspend_clk_idx = driver_data->suspend_clk_idx;
 
-        exynos->dev     = dev;
+        platform_set_drvdata(pdev, exynos);
 
-        exynos->clk = devm_clk_get(dev, "usbdrd30");
-        if (IS_ERR(exynos->clk)) {
-                dev_err(dev, "couldn't get clock\n");
-                return -EINVAL;
+        for (i = 0; i < exynos->num_clks; i++) {
+                exynos->clks[i] = devm_clk_get(dev, exynos->clk_names[i]);
+                if (IS_ERR(exynos->clks[i])) {
+                        dev_err(dev, "failed to get clock: %s\n",
+                                exynos->clk_names[i]);
+                        return PTR_ERR(exynos->clks[i]);
+                }
         }
-        ret = clk_prepare_enable(exynos->clk);
-        if (ret)
-                return ret;
 
-        exynos->susp_clk = devm_clk_get(dev, "usbdrd30_susp_clk");
-        if (IS_ERR(exynos->susp_clk))
-                exynos->susp_clk = NULL;
-        ret = clk_prepare_enable(exynos->susp_clk);
-        if (ret)
-                goto susp_clk_err;
-
-        if (of_device_is_compatible(node, "samsung,exynos7-dwusb3")) {
-                exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
-                if (IS_ERR(exynos->axius_clk)) {
-                        dev_err(dev, "no AXI UpScaler clk specified\n");
-                        ret = -ENODEV;
-                        goto axius_clk_err;
+        for (i = 0; i < exynos->num_clks; i++) {
+                ret = clk_prepare_enable(exynos->clks[i]);
+                if (ret) {
+                        while (--i > 0)
+                                clk_disable_unprepare(exynos->clks[i]);
+                        return ret;
                 }
-                ret = clk_prepare_enable(exynos->axius_clk);
-                if (ret)
-                        goto axius_clk_err;
-        } else {
-                exynos->axius_clk = NULL;
         }
 
+        if (exynos->suspend_clk_idx >= 0)
+                clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
+
         exynos->vdd33 = devm_regulator_get(dev, "vdd33");
         if (IS_ERR(exynos->vdd33)) {
                 ret = PTR_ERR(exynos->vdd33);
@@ -164,12 +109,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
                 goto vdd10_err;
         }
 
-        ret = dwc3_exynos_register_phys(exynos);
-        if (ret) {
-                dev_err(dev, "couldn't register PHYs\n");
-                goto phys_err;
-        }
-
         if (node) {
                 ret = of_platform_populate(node, NULL, NULL, dev);
                 if (ret) {
@@ -185,32 +124,31 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         return 0;
 
 populate_err:
-        platform_device_unregister(exynos->usb2_phy);
-        platform_device_unregister(exynos->usb3_phy);
-phys_err:
         regulator_disable(exynos->vdd10);
 vdd10_err:
         regulator_disable(exynos->vdd33);
 vdd33_err:
-        clk_disable_unprepare(exynos->axius_clk);
-axius_clk_err:
-        clk_disable_unprepare(exynos->susp_clk);
-susp_clk_err:
-        clk_disable_unprepare(exynos->clk);
+        for (i = exynos->num_clks - 1; i >= 0; i--)
+                clk_disable_unprepare(exynos->clks[i]);
+
+        if (exynos->suspend_clk_idx >= 0)
+                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
+
         return ret;
 }
 
 static int dwc3_exynos_remove(struct platform_device *pdev)
 {
         struct dwc3_exynos      *exynos = platform_get_drvdata(pdev);
+        int i;
 
         device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child);
-        platform_device_unregister(exynos->usb2_phy);
-        platform_device_unregister(exynos->usb3_phy);
 
-        clk_disable_unprepare(exynos->axius_clk);
-        clk_disable_unprepare(exynos->susp_clk);
-        clk_disable_unprepare(exynos->clk);
+        for (i = exynos->num_clks - 1; i >= 0; i--)
+                clk_disable_unprepare(exynos->clks[i]);
+
+        if (exynos->suspend_clk_idx >= 0)
+                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
 
         regulator_disable(exynos->vdd33);
         regulator_disable(exynos->vdd10);
@@ -218,10 +156,36 @@ static int dwc3_exynos_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct dwc3_exynos_driverdata exynos5250_drvdata = {
+        .clk_names = { "usbdrd30" },
+        .num_clks = 1,
+        .suspend_clk_idx = -1,
+};
+
+static const struct dwc3_exynos_driverdata exynos5433_drvdata = {
+        .clk_names = { "aclk", "susp_clk", "pipe_pclk", "phyclk" },
+        .num_clks = 4,
+        .suspend_clk_idx = 1,
+};
+
+static const struct dwc3_exynos_driverdata exynos7_drvdata = {
+        .clk_names = { "usbdrd30", "usbdrd30_susp_clk", "usbdrd30_axius_clk" },
+        .num_clks = 3,
+        .suspend_clk_idx = 1,
+};
+
 static const struct of_device_id exynos_dwc3_match[] = {
-        { .compatible = "samsung,exynos5250-dwusb3" },
-        { .compatible = "samsung,exynos7-dwusb3" },
-        {},
+        {
+                .compatible = "samsung,exynos5250-dwusb3",
+                .data = &exynos5250_drvdata,
+        }, {
+                .compatible = "samsung,exynos5433-dwusb3",
+                .data = &exynos5433_drvdata,
+        }, {
+                .compatible = "samsung,exynos7-dwusb3",
+                .data = &exynos7_drvdata,
+        }, {
+        }
 };
 MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 
@@ -229,9 +193,10 @@ MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
 static int dwc3_exynos_suspend(struct device *dev)
 {
         struct dwc3_exynos *exynos = dev_get_drvdata(dev);
+        int i;
 
-        clk_disable(exynos->axius_clk);
-        clk_disable(exynos->clk);
+        for (i = exynos->num_clks - 1; i >= 0; i--)
+                clk_disable_unprepare(exynos->clks[i]);
 
         regulator_disable(exynos->vdd33);
         regulator_disable(exynos->vdd10);
@@ -242,7 +207,7 @@ static int dwc3_exynos_suspend(struct device *dev)
 static int dwc3_exynos_resume(struct device *dev)
 {
         struct dwc3_exynos *exynos = dev_get_drvdata(dev);
-        int ret;
+        int i, ret;
 
         ret = regulator_enable(exynos->vdd33);
         if (ret) {
@@ -255,13 +220,14 @@ static int dwc3_exynos_resume(struct device *dev)
                 return ret;
         }
 
-        clk_enable(exynos->clk);
-        clk_enable(exynos->axius_clk);
-
-        /* runtime set active to reflect active state. */
-        pm_runtime_disable(dev);
-        pm_runtime_set_active(dev);
-        pm_runtime_enable(dev);
+        for (i = 0; i < exynos->num_clks; i++) {
+                ret = clk_prepare_enable(exynos->clks[i]);
+                if (ret) {
+                        while (--i > 0)
+                                clk_disable_unprepare(exynos->clks[i]);
+                        return ret;
+                }
+        }
 
         return 0;
 }
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2b53194081ba..679c12e14522 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -270,27 +270,36 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
         const struct usb_endpoint_descriptor *desc = dep->endpoint.desc;
         struct dwc3             *dwc = dep->dwc;
         u32                     timeout = 1000;
+        u32                     saved_config = 0;
         u32                     reg;
 
         int                     cmd_status = 0;
-        int                     susphy = false;
         int                     ret = -EINVAL;
 
         /*
-         * Synopsys Databook 2.60a states, on section 6.3.2.5.[1-8], that if
-         * we're issuing an endpoint command, we must check if
-         * GUSB2PHYCFG.SUSPHY bit is set. If it is, then we need to clear it.
+         * When operating in USB 2.0 speeds (HS/FS), if GUSB2PHYCFG.ENBLSLPM or
+         * GUSB2PHYCFG.SUSPHY is set, it must be cleared before issuing an
+         * endpoint command.
          *
-         * We will also set SUSPHY bit to what it was before returning as stated
-         * by the same section on Synopsys databook.
+         * Save and clear both GUSB2PHYCFG.ENBLSLPM and GUSB2PHYCFG.SUSPHY
+         * settings. Restore them after the command is completed.
+         *
+         * DWC_usb3 3.30a and DWC_usb31 1.90a programming guide section 3.2.2
          */
         if (dwc->gadget.speed <= USB_SPEED_HIGH) {
                 reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
                 if (unlikely(reg & DWC3_GUSB2PHYCFG_SUSPHY)) {
-                        susphy = true;
+                        saved_config |= DWC3_GUSB2PHYCFG_SUSPHY;
                         reg &= ~DWC3_GUSB2PHYCFG_SUSPHY;
-                        dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
                 }
+
+                if (reg & DWC3_GUSB2PHYCFG_ENBLSLPM) {
+                        saved_config |= DWC3_GUSB2PHYCFG_ENBLSLPM;
+                        reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM;
+                }
+
+                if (saved_config)
+                        dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
         }
 
         if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {
@@ -389,9 +398,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
                 }
         }
 
-        if (unlikely(susphy)) {
+        if (saved_config) {
                 reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
-                reg |= DWC3_GUSB2PHYCFG_SUSPHY;
+                reg |= saved_config;
                 dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
         }
 
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index d582921f7257..db2d4980cb35 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -22,12 +22,8 @@
  *  controlled by two clock sources :
  *    CLK_5 := c_srate, and CLK_6 := p_srate
  */
-#define USB_OUT_IT_ID   1
-#define IO_IN_IT_ID     2
-#define IO_OUT_OT_ID    3
-#define USB_IN_OT_ID    4
-#define USB_OUT_CLK_ID  5
-#define USB_IN_CLK_ID   6
+#define USB_OUT_CLK_ID  (out_clk_src_desc.bClockID)
+#define USB_IN_CLK_ID   (in_clk_src_desc.bClockID)
 
 #define CONTROL_ABSENT  0
 #define CONTROL_RDONLY  1
@@ -43,6 +39,9 @@
 #define UNFLW_CTRL      8
 #define OVFLW_CTRL      10
 
+#define EPIN_EN(_opts) ((_opts)->p_chmask != 0)
+#define EPOUT_EN(_opts) ((_opts)->c_chmask != 0)
+
 struct f_uac2 {
         struct g_audio g_audio;
         u8 ac_intf, as_in_intf, as_out_intf;
@@ -135,7 +134,7 @@ static struct uac_clock_source_descriptor in_clk_src_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC2_CLOCK_SOURCE,
-        .bClockID = USB_IN_CLK_ID,
+        /* .bClockID = DYNAMIC */
         .bmAttributes = UAC_CLOCK_SOURCE_TYPE_INT_FIXED,
         .bmControls = (CONTROL_RDONLY << CLK_FREQ_CTRL),
         .bAssocTerminal = 0,
@@ -147,7 +146,7 @@ static struct uac_clock_source_descriptor out_clk_src_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC2_CLOCK_SOURCE,
-        .bClockID = USB_OUT_CLK_ID,
+        /* .bClockID = DYNAMIC */
         .bmAttributes = UAC_CLOCK_SOURCE_TYPE_INT_FIXED,
         .bmControls = (CONTROL_RDONLY << CLK_FREQ_CTRL),
         .bAssocTerminal = 0,
@@ -159,10 +158,10 @@ static struct uac2_input_terminal_descriptor usb_out_it_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_INPUT_TERMINAL,
-        .bTerminalID = USB_OUT_IT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_TERMINAL_STREAMING),
         .bAssocTerminal = 0,
-        .bCSourceID = USB_OUT_CLK_ID,
+        /* .bCSourceID = DYNAMIC */
         .iChannelNames = 0,
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
@@ -173,10 +172,10 @@ static struct uac2_input_terminal_descriptor io_in_it_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_INPUT_TERMINAL,
-        .bTerminalID = IO_IN_IT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_INPUT_TERMINAL_UNDEFINED),
         .bAssocTerminal = 0,
-        .bCSourceID = USB_IN_CLK_ID,
+        /* .bCSourceID = DYNAMIC */
         .iChannelNames = 0,
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
@@ -187,11 +186,11 @@ static struct uac2_output_terminal_descriptor usb_in_ot_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
-        .bTerminalID = USB_IN_OT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_TERMINAL_STREAMING),
         .bAssocTerminal = 0,
-        .bSourceID = IO_IN_IT_ID,
-        .bCSourceID = USB_IN_CLK_ID,
+        /* .bSourceID = DYNAMIC */
+        /* .bCSourceID = DYNAMIC */
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
 
@@ -201,11 +200,11 @@ static struct uac2_output_terminal_descriptor io_out_ot_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_OUTPUT_TERMINAL,
-        .bTerminalID = IO_OUT_OT_ID,
+        /* .bTerminalID = DYNAMIC */
         .wTerminalType = cpu_to_le16(UAC_OUTPUT_TERMINAL_UNDEFINED),
         .bAssocTerminal = 0,
-        .bSourceID = USB_OUT_IT_ID,
-        .bCSourceID = USB_OUT_CLK_ID,
+        /* .bSourceID = DYNAMIC */
+        /* .bCSourceID = DYNAMIC */
         .bmControls = cpu_to_le16(CONTROL_RDWR << COPY_CTRL),
 };
 
@@ -253,7 +252,7 @@ static struct uac2_as_header_descriptor as_out_hdr_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_AS_GENERAL,
-        .bTerminalLink = USB_OUT_IT_ID,
+        /* .bTerminalLink = DYNAMIC */
         .bmControls = 0,
         .bFormatType = UAC_FORMAT_TYPE_I,
         .bmFormats = cpu_to_le32(UAC_FORMAT_TYPE_I_PCM),
@@ -330,7 +329,7 @@ static struct uac2_as_header_descriptor as_in_hdr_desc = {
         .bDescriptorType = USB_DT_CS_INTERFACE,
 
         .bDescriptorSubtype = UAC_AS_GENERAL,
-        .bTerminalLink = USB_IN_OT_ID,
+        /* .bTerminalLink = DYNAMIC */
         .bmControls = 0,
         .bFormatType = UAC_FORMAT_TYPE_I,
         .bmFormats = cpu_to_le32(UAC_FORMAT_TYPE_I_PCM),
@@ -471,6 +470,125 @@ static void set_ep_max_packet_size(const struct f_uac2_opts *uac2_opts,
                                 le16_to_cpu(ep_desc->wMaxPacketSize)));
 }
 
+/* Use macro to overcome line length limitation */
+#define USBDHDR(p) (struct usb_descriptor_header *)(p)
+
+static void setup_descriptor(struct f_uac2_opts *opts)
+{
+        /* patch descriptors */
+        int i = 1; /* ID's start with 1 */
+
+        if (EPOUT_EN(opts))
+                usb_out_it_desc.bTerminalID = i++;
+        if (EPIN_EN(opts))
+                io_in_it_desc.bTerminalID = i++;
+        if (EPOUT_EN(opts))
+                io_out_ot_desc.bTerminalID = i++;
+        if (EPIN_EN(opts))
+                usb_in_ot_desc.bTerminalID = i++;
+        if (EPOUT_EN(opts))
+                out_clk_src_desc.bClockID = i++;
+        if (EPIN_EN(opts))
+                in_clk_src_desc.bClockID = i++;
+
+        usb_out_it_desc.bCSourceID = out_clk_src_desc.bClockID;
+        usb_in_ot_desc.bSourceID = io_in_it_desc.bTerminalID;
+        usb_in_ot_desc.bCSourceID = in_clk_src_desc.bClockID;
+        io_in_it_desc.bCSourceID = in_clk_src_desc.bClockID;
+        io_out_ot_desc.bCSourceID = out_clk_src_desc.bClockID;
+        io_out_ot_desc.bSourceID = usb_out_it_desc.bTerminalID;
+        as_out_hdr_desc.bTerminalLink = usb_out_it_desc.bTerminalID;
+        as_in_hdr_desc.bTerminalLink = usb_in_ot_desc.bTerminalID;
+
+        iad_desc.bInterfaceCount = 1;
+        ac_hdr_desc.wTotalLength = 0;
+
+        if (EPIN_EN(opts)) {
+                u16 len = le16_to_cpu(ac_hdr_desc.wTotalLength);
+
+                len += sizeof(in_clk_src_desc);
+                len += sizeof(usb_in_ot_desc);
+                len += sizeof(io_in_it_desc);
+                ac_hdr_desc.wTotalLength = cpu_to_le16(len);
+                iad_desc.bInterfaceCount++;
+        }
+        if (EPOUT_EN(opts)) {
+                u16 len = le16_to_cpu(ac_hdr_desc.wTotalLength);
+
+                len += sizeof(out_clk_src_desc);
+                len += sizeof(usb_out_it_desc);
+                len += sizeof(io_out_ot_desc);
+                ac_hdr_desc.wTotalLength = cpu_to_le16(len);
+                iad_desc.bInterfaceCount++;
+        }
+
+        i = 0;
+        fs_audio_desc[i++] = USBDHDR(&iad_desc);
+        fs_audio_desc[i++] = USBDHDR(&std_ac_if_desc);
+        fs_audio_desc[i++] = USBDHDR(&ac_hdr_desc);
+        if (EPIN_EN(opts))
+                fs_audio_desc[i++] = USBDHDR(&in_clk_src_desc);
+        if (EPOUT_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&out_clk_src_desc);
+                fs_audio_desc[i++] = USBDHDR(&usb_out_it_desc);
+        }
+        if (EPIN_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&io_in_it_desc);
+                fs_audio_desc[i++] = USBDHDR(&usb_in_ot_desc);
+        }
+        if (EPOUT_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&io_out_ot_desc);
+                fs_audio_desc[i++] = USBDHDR(&std_as_out_if0_desc);
+                fs_audio_desc[i++] = USBDHDR(&std_as_out_if1_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_out_hdr_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_out_fmt1_desc);
+                fs_audio_desc[i++] = USBDHDR(&fs_epout_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_iso_out_desc);
+        }
+        if (EPIN_EN(opts)) {
+                fs_audio_desc[i++] = USBDHDR(&std_as_in_if0_desc);
+                fs_audio_desc[i++] = USBDHDR(&std_as_in_if1_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_in_hdr_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_in_fmt1_desc);
+                fs_audio_desc[i++] = USBDHDR(&fs_epin_desc);
+                fs_audio_desc[i++] = USBDHDR(&as_iso_in_desc);
+        }
+        fs_audio_desc[i] = NULL;
+
+        i = 0;
+        hs_audio_desc[i++] = USBDHDR(&iad_desc);
+        hs_audio_desc[i++] = USBDHDR(&std_ac_if_desc);
+        hs_audio_desc[i++] = USBDHDR(&ac_hdr_desc);
+        if (EPIN_EN(opts))
+                hs_audio_desc[i++] = USBDHDR(&in_clk_src_desc);
+        if (EPOUT_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&out_clk_src_desc);
+                hs_audio_desc[i++] = USBDHDR(&usb_out_it_desc);
+        }
+        if (EPIN_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&io_in_it_desc);
+                hs_audio_desc[i++] = USBDHDR(&usb_in_ot_desc);
+        }
+        if (EPOUT_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&io_out_ot_desc);
+                hs_audio_desc[i++] = USBDHDR(&std_as_out_if0_desc);
+                hs_audio_desc[i++] = USBDHDR(&std_as_out_if1_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_out_hdr_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_out_fmt1_desc);
+                hs_audio_desc[i++] = USBDHDR(&hs_epout_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_iso_out_desc);
+        }
+        if (EPIN_EN(opts)) {
+                hs_audio_desc[i++] = USBDHDR(&std_as_in_if0_desc);
+                hs_audio_desc[i++] = USBDHDR(&std_as_in_if1_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_in_hdr_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_in_fmt1_desc);
+                hs_audio_desc[i++] = USBDHDR(&hs_epin_desc);
+                hs_audio_desc[i++] = USBDHDR(&as_iso_in_desc);
+        }
+        hs_audio_desc[i] = NULL;
+}
+
 static int
 afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
 {
@@ -530,25 +648,29 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         uac2->ac_intf = ret;
         uac2->ac_alt = 0;
 
-        ret = usb_interface_id(cfg, fn);
-        if (ret < 0) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return ret;
+        if (EPOUT_EN(uac2_opts)) {
+                ret = usb_interface_id(cfg, fn);
+                if (ret < 0) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return ret;
+                }
+                std_as_out_if0_desc.bInterfaceNumber = ret;
+                std_as_out_if1_desc.bInterfaceNumber = ret;
+                uac2->as_out_intf = ret;
+                uac2->as_out_alt = 0;
         }
-        std_as_out_if0_desc.bInterfaceNumber = ret;
-        std_as_out_if1_desc.bInterfaceNumber = ret;
-        uac2->as_out_intf = ret;
-        uac2->as_out_alt = 0;
 
-        ret = usb_interface_id(cfg, fn);
-        if (ret < 0) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return ret;
+        if (EPIN_EN(uac2_opts)) {
+                ret = usb_interface_id(cfg, fn);
+                if (ret < 0) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return ret;
+                }
+                std_as_in_if0_desc.bInterfaceNumber = ret;
+                std_as_in_if1_desc.bInterfaceNumber = ret;
+                uac2->as_in_intf = ret;
+                uac2->as_in_alt = 0;
         }
-        std_as_in_if0_desc.bInterfaceNumber = ret;
-        std_as_in_if1_desc.bInterfaceNumber = ret;
-        uac2->as_in_intf = ret;
-        uac2->as_in_alt = 0;
 
         /* Calculate wMaxPacketSize according to audio bandwidth */
         set_ep_max_packet_size(uac2_opts, &fs_epin_desc, 1000, true);
@@ -556,16 +678,20 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         set_ep_max_packet_size(uac2_opts, &hs_epin_desc, 8000, true);
         set_ep_max_packet_size(uac2_opts, &hs_epout_desc, 8000, false);
 
-        agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
-        if (!agdev->out_ep) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return -ENODEV;
+        if (EPOUT_EN(uac2_opts)) {
+                agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
+                if (!agdev->out_ep) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return -ENODEV;
+                }
         }
 
-        agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
-        if (!agdev->in_ep) {
-                dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return -ENODEV;
+        if (EPIN_EN(uac2_opts)) {
+                agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
+                if (!agdev->in_ep) {
+                        dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
+                        return -ENODEV;
+                }
         }
 
         agdev->in_ep_maxpsize = max_t(u16,
@@ -578,6 +704,8 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         hs_epout_desc.bEndpointAddress = fs_epout_desc.bEndpointAddress;
         hs_epin_desc.bEndpointAddress = fs_epin_desc.bEndpointAddress;
 
+        setup_descriptor(uac2_opts);
+
         ret = usb_assign_descriptors(fn, fs_audio_desc, hs_audio_desc, NULL,
                                      NULL);
         if (ret)
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index d8ce7868fe22..8c99392df593 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -197,12 +197,6 @@ static const struct usb_descriptor_header * const uvc_ss_streaming[] = {
         NULL,
 };
 
-void uvc_set_trace_param(unsigned int trace)
-{
-        uvc_gadget_trace_param = trace;
-}
-EXPORT_SYMBOL(uvc_set_trace_param);
-
 /* --------------------------------------------------------------------------
  * Control requests
  */
@@ -232,13 +226,8 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
         struct v4l2_event v4l2_event;
         struct uvc_event *uvc_event = (void *)&v4l2_event.u.data;
 
-        /* printk(KERN_INFO "setup request %02x %02x value %04x index %04x %04x\n",
-         *      ctrl->bRequestType, ctrl->bRequest, le16_to_cpu(ctrl->wValue),
-         *      le16_to_cpu(ctrl->wIndex), le16_to_cpu(ctrl->wLength));
-         */
-
         if ((ctrl->bRequestType & USB_TYPE_MASK) != USB_TYPE_CLASS) {
-                INFO(f->config->cdev, "invalid request type\n");
+                uvcg_info(f, "invalid request type\n");
                 return -EINVAL;
         }
 
@@ -272,7 +261,7 @@ uvc_function_get_alt(struct usb_function *f, unsigned interface)
 {
         struct uvc_device *uvc = to_uvc(f);
 
-        INFO(f->config->cdev, "uvc_function_get_alt(%u)\n", interface);
+        uvcg_info(f, "%s(%u)\n", __func__, interface);
 
         if (interface == uvc->control_intf)
                 return 0;
@@ -291,13 +280,13 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
         struct uvc_event *uvc_event = (void *)&v4l2_event.u.data;
         int ret;
 
-        INFO(cdev, "uvc_function_set_alt(%u, %u)\n", interface, alt);
+        uvcg_info(f, "%s(%u, %u)\n", __func__, interface, alt);
 
         if (interface == uvc->control_intf) {
                 if (alt)
                         return -EINVAL;
 
-                INFO(cdev, "reset UVC Control\n");
+                uvcg_info(f, "reset UVC Control\n");
                 usb_ep_disable(uvc->control_ep);
 
                 if (!uvc->control_ep->desc)
@@ -348,7 +337,7 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
                 if (!uvc->video.ep)
                         return -EINVAL;
 
-                INFO(cdev, "reset UVC\n");
+                uvcg_info(f, "reset UVC\n");
                 usb_ep_disable(uvc->video.ep);
 
                 ret = config_ep_by_speed(f->config->cdev->gadget,
@@ -373,7 +362,7 @@ uvc_function_disable(struct usb_function *f)
         struct uvc_device *uvc = to_uvc(f);
         struct v4l2_event v4l2_event;
 
-        INFO(f->config->cdev, "uvc_function_disable\n");
+        uvcg_info(f, "%s()\n", __func__);
 
         memset(&v4l2_event, 0, sizeof(v4l2_event));
         v4l2_event.type = UVC_EVENT_DISCONNECT;
@@ -392,21 +381,19 @@ uvc_function_disable(struct usb_function *f)
 void
 uvc_function_connect(struct uvc_device *uvc)
 {
-        struct usb_composite_dev *cdev = uvc->func.config->cdev;
         int ret;
 
         if ((ret = usb_function_activate(&uvc->func)) < 0)
-                INFO(cdev, "UVC connect failed with %d\n", ret);
+                uvcg_info(&uvc->func, "UVC connect failed with %d\n", ret);
 }
 
 void
 uvc_function_disconnect(struct uvc_device *uvc)
 {
-        struct usb_composite_dev *cdev = uvc->func.config->cdev;
         int ret;
 
         if ((ret = usb_function_deactivate(&uvc->func)) < 0)
-                INFO(cdev, "UVC disconnect failed with %d\n", ret);
+                uvcg_info(&uvc->func, "UVC disconnect failed with %d\n", ret);
 }
 
 /* --------------------------------------------------------------------------
@@ -605,7 +592,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         struct f_uvc_opts *opts;
         int ret = -EINVAL;
 
-        INFO(cdev, "uvc_function_bind\n");
+        uvcg_info(f, "%s()\n", __func__);
 
         opts = fi_to_f_uvc_opts(f->fi);
         /* Sanity check the streaming endpoint module parameters.
@@ -618,8 +605,8 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         if (opts->streaming_maxburst &&
             (opts->streaming_maxpacket % 1024) != 0) {
                 opts->streaming_maxpacket = roundup(opts->streaming_maxpacket, 1024);
-                INFO(cdev, "overriding streaming_maxpacket to %d\n",
-                     opts->streaming_maxpacket);
+                uvcg_info(f, "overriding streaming_maxpacket to %d\n",
+                          opts->streaming_maxpacket);
         }
 
         /* Fill in the FS/HS/SS Video Streaming specific descriptors from the
@@ -658,7 +645,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         /* Allocate endpoints. */
         ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep);
         if (!ep) {
-                INFO(cdev, "Unable to allocate control EP\n");
+                uvcg_info(f, "Unable to allocate control EP\n");
                 goto error;
         }
         uvc->control_ep = ep;
@@ -672,7 +659,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
                 ep = usb_ep_autoconfig(cdev->gadget, &uvc_fs_streaming_ep);
 
         if (!ep) {
-                INFO(cdev, "Unable to allocate streaming EP\n");
+                uvcg_info(f, "Unable to allocate streaming EP\n");
                 goto error;
         }
         uvc->video.ep = ep;
@@ -699,12 +686,14 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         uvc_iad.bFirstInterface = ret;
         uvc_control_intf.bInterfaceNumber = ret;
         uvc->control_intf = ret;
+        opts->control_interface = ret;
 
         if ((ret = usb_interface_id(c, f)) < 0)
                 goto error;
         uvc_streaming_intf_alt0.bInterfaceNumber = ret;
         uvc_streaming_intf_alt1.bInterfaceNumber = ret;
         uvc->streaming_intf = ret;
+        opts->streaming_interface = ret;
 
         /* Copy descriptors */
         f->fs_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_FULL);
@@ -743,19 +732,19 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         uvc->control_req->context = uvc;
 
         if (v4l2_device_register(&cdev->gadget->dev, &uvc->v4l2_dev)) {
-                printk(KERN_INFO "v4l2_device_register failed\n");
+                uvcg_err(f, "failed to register V4L2 device\n");
                 goto error;
         }
 
         /* Initialise video. */
-        ret = uvcg_video_init(&uvc->video);
+        ret = uvcg_video_init(&uvc->video, uvc);
         if (ret < 0)
                 goto error;
 
         /* Register a V4L2 device. */
         ret = uvc_register_video(uvc);
         if (ret < 0) {
-                printk(KERN_INFO "Unable to register video device\n");
+                uvcg_err(f, "failed to register video device\n");
                 goto error;
         }
 
@@ -792,6 +781,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
         struct uvc_output_terminal_descriptor *od;
         struct uvc_color_matching_descriptor *md;
         struct uvc_descriptor_header **ctl_cls;
+        int ret;
 
         opts = kzalloc(sizeof(*opts), GFP_KERNEL);
         if (!opts)
@@ -868,7 +858,12 @@ static struct usb_function_instance *uvc_alloc_inst(void)
         opts->streaming_interval = 1;
         opts->streaming_maxpacket = 1024;
 
-        uvcg_attach_configfs(opts);
+        ret = uvcg_attach_configfs(opts);
+        if (ret < 0) {
+                kfree(opts);
+                return ERR_PTR(ret);
+        }
+
         return &opts->func_inst;
 }
 
@@ -886,7 +881,7 @@ static void uvc_unbind(struct usb_configuration *c, struct usb_function *f)
         struct usb_composite_dev *cdev = c->cdev;
         struct uvc_device *uvc = to_uvc(f);
 
-        INFO(cdev, "%s\n", __func__);
+        uvcg_info(f, "%s\n", __func__);
 
         device_remove_file(&uvc->vdev.dev, &dev_attr_function_name);
         video_unregister_device(&uvc->vdev);
diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h
index 2ed292e94fbc..5242d489e20a 100644
--- a/drivers/usb/gadget/function/u_uvc.h
+++ b/drivers/usb/gadget/function/u_uvc.h
@@ -25,6 +25,9 @@ struct f_uvc_opts {
         unsigned int                                    streaming_maxpacket;
         unsigned int                                    streaming_maxburst;
 
+        unsigned int                                    control_interface;
+        unsigned int                                    streaming_interface;
+
         /*
          * Control descriptors array pointers for full-/high-speed and
          * super-speed. They point by default to the uvc_fs_control_cls and
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h
index 93cf78b420fe..099d650082e5 100644
--- a/drivers/usb/gadget/function/uvc.h
+++ b/drivers/usb/gadget/function/uvc.h
@@ -24,6 +24,7 @@
 struct usb_ep;
 struct usb_request;
 struct uvc_descriptor_header;
+struct uvc_device;
 
 /* ------------------------------------------------------------------------
  * Debugging, printing and logging
@@ -51,14 +52,12 @@ extern unsigned int uvc_gadget_trace_param;
                         printk(KERN_DEBUG "uvcvideo: " msg); \
         } while (0)
 
-#define uvc_warn_once(dev, warn, msg...) \
-        do { \
-                if (!test_and_set_bit(warn, &dev->warnings)) \
-                        printk(KERN_INFO "uvcvideo: " msg); \
-        } while (0)
-
-#define uvc_printk(level, msg...) \
-        printk(level "uvcvideo: " msg)
+#define uvcg_dbg(f, fmt, args...) \
+        dev_dbg(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
+#define uvcg_info(f, fmt, args...) \
+        dev_info(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
+#define uvcg_err(f, fmt, args...) \
+        dev_err(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args)
 
 /* ------------------------------------------------------------------------
  * Driver specific constants
@@ -73,6 +72,7 @@ extern unsigned int uvc_gadget_trace_param;
  */
 
 struct uvc_video {
+        struct uvc_device *uvc;
         struct usb_ep *ep;
 
         /* Frame parameters */
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index b51f0d278826..bc1e2af566c3 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -9,9 +9,16 @@
  *
  * Author: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
  */
+
+#include <linux/sort.h>
+
 #include "u_uvc.h"
 #include "uvc_configfs.h"
 
+/* -----------------------------------------------------------------------------
+ * Global Utility Structures and Macros
+ */
+
 #define UVCG_STREAMING_CONTROL_SIZE     1
 
 #define UVC_ATTR(prefix, cname, aname) \
@@ -31,13 +38,93 @@ static struct configfs_attribute prefix##attr_##cname = { \
         .show           = prefix##cname##_show,                         \
 }
 
+#define le8_to_cpu(x)   (x)
+#define cpu_to_le8(x)   (x)
+
+static int uvcg_config_compare_u32(const void *l, const void *r)
+{
+        u32 li = *(const u32 *)l;
+        u32 ri = *(const u32 *)r;
+
+        return li < ri ? -1 : li == ri ? 0 : 1;
+}
+
 static inline struct f_uvc_opts *to_f_uvc_opts(struct config_item *item)
 {
         return container_of(to_config_group(item), struct f_uvc_opts,
                             func_inst.group);
 }
 
-/* control/header/<NAME> */
+struct uvcg_config_group_type {
+        struct config_item_type type;
+        const char *name;
+        const struct uvcg_config_group_type **children;
+        int (*create_children)(struct config_group *group);
+};
+
+static void uvcg_config_item_release(struct config_item *item)
+{
+        struct config_group *group = to_config_group(item);
+
+        kfree(group);
+}
+
+static struct configfs_item_operations uvcg_config_item_ops = {
+        .release        = uvcg_config_item_release,
+};
+
+static int uvcg_config_create_group(struct config_group *parent,
+                                    const struct uvcg_config_group_type *type);
+
+static int uvcg_config_create_children(struct config_group *group,
+                                const struct uvcg_config_group_type *type)
+{
+        const struct uvcg_config_group_type **child;
+        int ret;
+
+        if (type->create_children)
+                return type->create_children(group);
+
+        for (child = type->children; child && *child; ++child) {
+                ret = uvcg_config_create_group(group, *child);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static int uvcg_config_create_group(struct config_group *parent,
+                                    const struct uvcg_config_group_type *type)
+{
+        struct config_group *group;
+
+        group = kzalloc(sizeof(*group), GFP_KERNEL);
+        if (!group)
+                return -ENOMEM;
+
+        config_group_init_type_name(group, type->name, &type->type);
+        configfs_add_default_group(group, parent);
+
+        return uvcg_config_create_children(group, type);
+}
+
+static void uvcg_config_remove_children(struct config_group *group)
+{
+        struct config_group *child, *n;
+
+        list_for_each_entry_safe(child, n, &group->default_groups, group_entry) {
+                list_del(&child->group_entry);
+                uvcg_config_remove_children(child);
+                config_item_put(&child->cg_item);
+        }
+}
+
+/* -----------------------------------------------------------------------------
+ * control/header/<NAME>
+ * control/header
+ */
+
 DECLARE_UVC_HEADER_DESCRIPTOR(1);
 
 struct uvcg_control_header {
@@ -51,9 +138,9 @@ static struct uvcg_control_header *to_uvcg_control_header(struct config_item *it
         return container_of(item, struct uvcg_control_header, item);
 }
 
-#define UVCG_CTRL_HDR_ATTR(cname, aname, conv, str2u, uxx, vnoc, limit) \
+#define UVCG_CTRL_HDR_ATTR(cname, aname, bits, limit)                   \
 static ssize_t uvcg_control_header_##cname##_show(                      \
-        struct config_item *item, char *page)                   \
+        struct config_item *item, char *page)                           \
 {                                                                       \
         struct uvcg_control_header *ch = to_uvcg_control_header(item);  \
         struct f_uvc_opts *opts;                                        \
@@ -67,7 +154,7 @@ static ssize_t uvcg_control_header_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(ch->desc.aname));           \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(ch->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -83,7 +170,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,		\
         struct config_item *opts_item;                                  \
         struct mutex *su_mutex = &ch->item.ci_group->cg_subsys->su_mutex;\
         int ret;                                                        \
-        uxx num;                                                        \
+        u##bits num;                                                    \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
@@ -96,7 +183,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,		\
                 goto end;                                               \
         }                                                               \
                                                                         \
-        ret = str2u(page, 0, &num);                                     \
+        ret = kstrtou##bits(page, 0, &num);                             \
         if (ret)                                                        \
                 goto end;                                               \
                                                                         \
@@ -104,7 +191,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,		\
                 ret = -EINVAL;                                          \
                 goto end;                                               \
         }                                                               \
-        ch->desc.aname = vnoc(num);                                     \
+        ch->desc.aname = cpu_to_le##bits(num);                          \
         ret = len;                                                      \
 end:                                                                    \
         mutex_unlock(&opts->lock);                                      \
@@ -114,11 +201,9 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_control_header_, cname, aname)
 
-UVCG_CTRL_HDR_ATTR(bcd_uvc, bcdUVC, le16_to_cpu, kstrtou16, u16, cpu_to_le16,
-                   0xffff);
+UVCG_CTRL_HDR_ATTR(bcd_uvc, bcdUVC, 16, 0xffff);
 
-UVCG_CTRL_HDR_ATTR(dw_clock_frequency, dwClockFrequency, le32_to_cpu, kstrtou32,
-                   u32, cpu_to_le32, 0x7fffffff);
+UVCG_CTRL_HDR_ATTR(dw_clock_frequency, dwClockFrequency, 32, 0x7fffffff);
 
 #undef UVCG_CTRL_HDR_ATTR
 
@@ -129,6 +214,7 @@ static struct configfs_attribute *uvcg_control_header_attrs[] = {
 };
 
 static const struct config_item_type uvcg_control_header_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_attrs       = uvcg_control_header_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -153,60 +239,42 @@ static struct config_item *uvcg_control_header_make(struct config_group *group,
         return &h->item;
 }
 
-static void uvcg_control_header_drop(struct config_group *group,
-                              struct config_item *item)
-{
-        struct uvcg_control_header *h = to_uvcg_control_header(item);
-
-        kfree(h);
-}
-
-/* control/header */
-static struct uvcg_control_header_grp {
-        struct config_group     group;
-} uvcg_control_header_grp;
-
 static struct configfs_group_operations uvcg_control_header_grp_ops = {
         .make_item              = uvcg_control_header_make,
-        .drop_item              = uvcg_control_header_drop,
 };
 
-static const struct config_item_type uvcg_control_header_grp_type = {
-        .ct_group_ops   = &uvcg_control_header_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_control_header_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_control_header_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "header",
 };
 
-/* control/processing/default */
-static struct uvcg_default_processing {
-        struct config_group     group;
-} uvcg_default_processing;
-
-static inline struct uvcg_default_processing
-*to_uvcg_default_processing(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_processing, group);
-}
+/* -----------------------------------------------------------------------------
+ * control/processing/default
+ */
 
-#define UVCG_DEFAULT_PROCESSING_ATTR(cname, aname, conv)                \
+#define UVCG_DEFAULT_PROCESSING_ATTR(cname, aname, bits)                \
 static ssize_t uvcg_default_processing_##cname##_show(                  \
         struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_processing *dp = to_uvcg_default_processing(item); \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dp->group.cg_subsys->su_mutex;        \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_processing_unit_descriptor *pd;                      \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dp->group.cg_item.ci_parent->ci_parent->ci_parent;  \
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;     \
         opts = to_f_uvc_opts(opts_item);                                \
         pd = &opts->uvc_processing;                                     \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(pd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(pd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -215,37 +283,33 @@ static ssize_t uvcg_default_processing_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_default_processing_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_PROCESSING_ATTR(b_unit_id, bUnitID, identity_conv);
-UVCG_DEFAULT_PROCESSING_ATTR(b_source_id, bSourceID, identity_conv);
-UVCG_DEFAULT_PROCESSING_ATTR(w_max_multiplier, wMaxMultiplier, le16_to_cpu);
-UVCG_DEFAULT_PROCESSING_ATTR(i_processing, iProcessing, identity_conv);
-
-#undef identity_conv
+UVCG_DEFAULT_PROCESSING_ATTR(b_unit_id, bUnitID, 8);
+UVCG_DEFAULT_PROCESSING_ATTR(b_source_id, bSourceID, 8);
+UVCG_DEFAULT_PROCESSING_ATTR(w_max_multiplier, wMaxMultiplier, 16);
+UVCG_DEFAULT_PROCESSING_ATTR(i_processing, iProcessing, 8);
 
 #undef UVCG_DEFAULT_PROCESSING_ATTR
 
 static ssize_t uvcg_default_processing_bm_controls_show(
         struct config_item *item, char *page)
 {
-        struct uvcg_default_processing *dp = to_uvcg_default_processing(item);
+        struct config_group *group = to_config_group(item);
         struct f_uvc_opts *opts;
         struct config_item *opts_item;
-        struct mutex *su_mutex = &dp->group.cg_subsys->su_mutex;
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
         struct uvc_processing_unit_descriptor *pd;
         int result, i;
         char *pg = page;
 
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */
 
-        opts_item = dp->group.cg_item.ci_parent->ci_parent->ci_parent;
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;
         opts = to_f_uvc_opts(opts_item);
         pd = &opts->uvc_processing;
 
         mutex_lock(&opts->lock);
         for (result = 0, i = 0; i < pd->bControlSize; ++i) {
-                result += sprintf(pg, "%d\n", pd->bmControls[i]);
+                result += sprintf(pg, "%u\n", pd->bmControls[i]);
                 pg = page + result;
         }
         mutex_unlock(&opts->lock);
@@ -266,54 +330,55 @@ static struct configfs_attribute *uvcg_default_processing_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_processing_type = {
-        .ct_attrs       = uvcg_default_processing_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_processing_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_processing_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_processing {}; */
-
-/* control/processing */
-static struct uvcg_processing_grp {
-        struct config_group     group;
-} uvcg_processing_grp;
+/* -----------------------------------------------------------------------------
+ * control/processing
+ */
 
-static const struct config_item_type uvcg_processing_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_processing_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "processing",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_processing_type,
+                NULL,
+        },
 };
 
-/* control/terminal/camera/default */
-static struct uvcg_default_camera {
-        struct config_group     group;
-} uvcg_default_camera;
-
-static inline struct uvcg_default_camera
-*to_uvcg_default_camera(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_camera, group);
-}
+/* -----------------------------------------------------------------------------
+ * control/terminal/camera/default
+ */
 
-#define UVCG_DEFAULT_CAMERA_ATTR(cname, aname, conv)                    \
+#define UVCG_DEFAULT_CAMERA_ATTR(cname, aname, bits)                    \
 static ssize_t uvcg_default_camera_##cname##_show(                      \
         struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_camera *dc = to_uvcg_default_camera(item);  \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dc->group.cg_subsys->su_mutex;        \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_camera_terminal_descriptor *cd;                      \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dc->group.cg_item.ci_parent->ci_parent->ci_parent-> \
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent->    \
                         ci_parent;                                      \
         opts = to_f_uvc_opts(opts_item);                                \
         cd = &opts->uvc_camera_terminal;                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(cd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(cd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -323,44 +388,40 @@ static ssize_t uvcg_default_camera_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_default_camera_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_CAMERA_ATTR(b_terminal_id, bTerminalID, identity_conv);
-UVCG_DEFAULT_CAMERA_ATTR(w_terminal_type, wTerminalType, le16_to_cpu);
-UVCG_DEFAULT_CAMERA_ATTR(b_assoc_terminal, bAssocTerminal, identity_conv);
-UVCG_DEFAULT_CAMERA_ATTR(i_terminal, iTerminal, identity_conv);
+UVCG_DEFAULT_CAMERA_ATTR(b_terminal_id, bTerminalID, 8);
+UVCG_DEFAULT_CAMERA_ATTR(w_terminal_type, wTerminalType, 16);
+UVCG_DEFAULT_CAMERA_ATTR(b_assoc_terminal, bAssocTerminal, 8);
+UVCG_DEFAULT_CAMERA_ATTR(i_terminal, iTerminal, 8);
 UVCG_DEFAULT_CAMERA_ATTR(w_objective_focal_length_min, wObjectiveFocalLengthMin,
-                         le16_to_cpu);
+                         16);
 UVCG_DEFAULT_CAMERA_ATTR(w_objective_focal_length_max, wObjectiveFocalLengthMax,
-                         le16_to_cpu);
+                         16);
 UVCG_DEFAULT_CAMERA_ATTR(w_ocular_focal_length, wOcularFocalLength,
-                         le16_to_cpu);
-
-#undef identity_conv
+                         16);
 
 #undef UVCG_DEFAULT_CAMERA_ATTR
 
 static ssize_t uvcg_default_camera_bm_controls_show(
         struct config_item *item, char *page)
 {
-        struct uvcg_default_camera *dc = to_uvcg_default_camera(item);
+        struct config_group *group = to_config_group(item);
         struct f_uvc_opts *opts;
         struct config_item *opts_item;
-        struct mutex *su_mutex = &dc->group.cg_subsys->su_mutex;
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
         struct uvc_camera_terminal_descriptor *cd;
         int result, i;
         char *pg = page;
 
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */
 
-        opts_item = dc->group.cg_item.ci_parent->ci_parent->ci_parent->
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent->
                         ci_parent;
         opts = to_f_uvc_opts(opts_item);
         cd = &opts->uvc_camera_terminal;
 
         mutex_lock(&opts->lock);
         for (result = 0, i = 0; i < cd->bControlSize; ++i) {
-                result += sprintf(pg, "%d\n", cd->bmControls[i]);
+                result += sprintf(pg, "%u\n", cd->bmControls[i]);
                 pg = page + result;
         }
         mutex_unlock(&opts->lock);
@@ -383,54 +444,55 @@ static struct configfs_attribute *uvcg_default_camera_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_camera_type = {
-        .ct_attrs       = uvcg_default_camera_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_camera_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_camera_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_camera {}; */
-
-/* control/terminal/camera */
-static struct uvcg_camera_grp {
-        struct config_group     group;
-} uvcg_camera_grp;
+/* -----------------------------------------------------------------------------
+ * control/terminal/camera
+ */
 
-static const struct config_item_type uvcg_camera_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_camera_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "camera",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_camera_type,
+                NULL,
+        },
 };
 
-/* control/terminal/output/default */
-static struct uvcg_default_output {
-        struct config_group     group;
-} uvcg_default_output;
-
-static inline struct uvcg_default_output
-*to_uvcg_default_output(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_output, group);
-}
+/* -----------------------------------------------------------------------------
+ * control/terminal/output/default
+ */
 
-#define UVCG_DEFAULT_OUTPUT_ATTR(cname, aname, conv)                    \
+#define UVCG_DEFAULT_OUTPUT_ATTR(cname, aname, bits)                    \
 static ssize_t uvcg_default_output_##cname##_show(                      \
-        struct config_item *item, char *page)                   \
+        struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_output *dout = to_uvcg_default_output(item); \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dout->group.cg_subsys->su_mutex;      \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_output_terminal_descriptor *cd;                      \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dout->group.cg_item.ci_parent->ci_parent->          \
+        opts_item = group->cg_item.ci_parent->ci_parent->               \
                         ci_parent->ci_parent;                           \
         opts = to_f_uvc_opts(opts_item);                                \
         cd = &opts->uvc_output_terminal;                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(cd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(cd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -440,15 +502,11 @@ static ssize_t uvcg_default_output_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_default_output_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_OUTPUT_ATTR(b_terminal_id, bTerminalID, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(w_terminal_type, wTerminalType, le16_to_cpu);
-UVCG_DEFAULT_OUTPUT_ATTR(b_assoc_terminal, bAssocTerminal, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(b_source_id, bSourceID, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(i_terminal, iTerminal, identity_conv);
-
-#undef identity_conv
+UVCG_DEFAULT_OUTPUT_ATTR(b_terminal_id, bTerminalID, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(w_terminal_type, wTerminalType, 16);
+UVCG_DEFAULT_OUTPUT_ATTR(b_assoc_terminal, bAssocTerminal, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(b_source_id, bSourceID, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(i_terminal, iTerminal, 8);
 
 #undef UVCG_DEFAULT_OUTPUT_ATTR
 
@@ -461,47 +519,68 @@ static struct configfs_attribute *uvcg_default_output_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_output_type = {
-        .ct_attrs       = uvcg_default_output_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_output_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_output_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_output {}; */
-
-/* control/terminal/output */
-static struct uvcg_output_grp {
-        struct config_group     group;
-} uvcg_output_grp;
+/* -----------------------------------------------------------------------------
+ * control/terminal/output
+ */
 
-static const struct config_item_type uvcg_output_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_output_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "output",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_output_type,
+                NULL,
+        },
 };
 
-/* control/terminal */
-static struct uvcg_terminal_grp {
-        struct config_group     group;
-} uvcg_terminal_grp;
+/* -----------------------------------------------------------------------------
+ * control/terminal
+ */
 
-static const struct config_item_type uvcg_terminal_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_terminal_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "terminal",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_camera_grp_type,
+                &uvcg_output_grp_type,
+                NULL,
+        },
 };
 
-/* control/class/{fs} */
-static struct uvcg_control_class {
-        struct config_group     group;
-} uvcg_control_class_fs, uvcg_control_class_ss;
+/* -----------------------------------------------------------------------------
+ * control/class/{fs|ss}
+ */
 
+struct uvcg_control_class_group {
+        struct config_group group;
+        const char *name;
+};
 
 static inline struct uvc_descriptor_header
 **uvcg_get_ctl_class_arr(struct config_item *i, struct f_uvc_opts *o)
 {
-        struct uvcg_control_class *cl = container_of(to_config_group(i),
-                struct uvcg_control_class, group);
+        struct uvcg_control_class_group *group =
+                container_of(i, struct uvcg_control_class_group,
+                             group.cg_item);
 
-        if (cl == &uvcg_control_class_fs)
+        if (!strcmp(group->name, "fs"))
                 return o->uvc_fs_control_cls;
 
-        if (cl == &uvcg_control_class_ss)
+        if (!strcmp(group->name, "ss"))
                 return o->uvc_ss_control_cls;
 
         return NULL;
@@ -544,6 +623,7 @@ static int uvcg_control_class_allow_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
         return ret;
 }
@@ -579,10 +659,12 @@ static void uvcg_control_class_drop_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
 }
 
 static struct configfs_item_operations uvcg_control_class_item_ops = {
+        .release        = uvcg_config_item_release,
         .allow_link     = uvcg_control_class_allow_link,
         .drop_link      = uvcg_control_class_drop_link,
 };
@@ -592,37 +674,99 @@ static const struct config_item_type uvcg_control_class_type = {
         .ct_owner       = THIS_MODULE,
 };
 
-/* control/class */
-static struct uvcg_control_class_grp {
-        struct config_group     group;
-} uvcg_control_class_grp;
+/* -----------------------------------------------------------------------------
+ * control/class
+ */
+
+static int uvcg_control_class_create_children(struct config_group *parent)
+{
+        static const char * const names[] = { "fs", "ss" };
+        unsigned int i;
 
-static const struct config_item_type uvcg_control_class_grp_type = {
-        .ct_owner = THIS_MODULE,
+        for (i = 0; i < ARRAY_SIZE(names); ++i) {
+                struct uvcg_control_class_group *group;
+
+                group = kzalloc(sizeof(*group), GFP_KERNEL);
+                if (!group)
+                        return -ENOMEM;
+
+                group->name = names[i];
+
+                config_group_init_type_name(&group->group, group->name,
+                                            &uvcg_control_class_type);
+                configfs_add_default_group(&group->group, parent);
+        }
+
+        return 0;
+}
+
+static const struct uvcg_config_group_type uvcg_control_class_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "class",
+        .create_children = uvcg_control_class_create_children,
 };
 
-/* control */
-static struct uvcg_control_grp {
-        struct config_group     group;
-} uvcg_control_grp;
+/* -----------------------------------------------------------------------------
+ * control
+ */
+
+static ssize_t uvcg_default_control_b_interface_number_show(
+        struct config_item *item, char *page)
+{
+        struct config_group *group = to_config_group(item);
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
+        struct config_item *opts_item;
+        struct f_uvc_opts *opts;
+        int result = 0;
+
+        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+
+        opts_item = item->ci_parent;
+        opts = to_f_uvc_opts(opts_item);
+
+        mutex_lock(&opts->lock);
+        result += sprintf(page, "%u\n", opts->control_interface);
+        mutex_unlock(&opts->lock);
+
+        mutex_unlock(su_mutex);
+
+        return result;
+}
+
+UVC_ATTR_RO(uvcg_default_control_, b_interface_number, bInterfaceNumber);
 
-static const struct config_item_type uvcg_control_grp_type = {
-        .ct_owner = THIS_MODULE,
+static struct configfs_attribute *uvcg_default_control_attrs[] = {
+        &uvcg_default_control_attr_b_interface_number,
+        NULL,
 };
 
-/* streaming/uncompressed */
-static struct uvcg_uncompressed_grp {
-        struct config_group     group;
-} uvcg_uncompressed_grp;
+static const struct uvcg_config_group_type uvcg_control_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_control_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "control",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_control_header_grp_type,
+                &uvcg_processing_grp_type,
+                &uvcg_terminal_grp_type,
+                &uvcg_control_class_grp_type,
+                NULL,
+        },
+};
 
-/* streaming/mjpeg */
-static struct uvcg_mjpeg_grp {
-        struct config_group     group;
-} uvcg_mjpeg_grp;
+/* -----------------------------------------------------------------------------
+ * streaming/uncompressed
+ * streaming/mjpeg
+ */
 
-static struct config_item *fmt_parent[] = {
-        &uvcg_uncompressed_grp.group.cg_item,
-        &uvcg_mjpeg_grp.group.cg_item,
+static const char * const uvcg_format_names[] = {
+        "uncompressed",
+        "mjpeg",
 };
 
 enum uvcg_format_type {
@@ -706,7 +850,11 @@ struct uvcg_format_ptr {
         struct list_head        entry;
 };
 
-/* streaming/header/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/header/<NAME>
+ * streaming/header
+ */
+
 struct uvcg_streaming_header {
         struct config_item                              item;
         struct uvc_input_header_descriptor              desc;
@@ -720,6 +868,8 @@ static struct uvcg_streaming_header *to_uvcg_streaming_header(struct config_item
         return container_of(item, struct uvcg_streaming_header, item);
 }
 
+static void uvcg_format_set_indices(struct config_group *fmt);
+
 static int uvcg_streaming_header_allow_link(struct config_item *src,
                                             struct config_item *target)
 {
@@ -744,10 +894,22 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
                 goto out;
         }
 
-        for (i = 0; i < ARRAY_SIZE(fmt_parent); ++i)
-                if (target->ci_parent == fmt_parent[i])
+        /*
+         * Linking is only allowed to direct children of the format nodes
+         * (streaming/uncompressed or streaming/mjpeg nodes). First check that
+         * the grand-parent of the target matches the grand-parent of the source
+         * (the streaming node), and then verify that the target parent is a
+         * format node.
+         */
+        if (src->ci_parent->ci_parent != target->ci_parent->ci_parent)
+                goto out;
+
+        for (i = 0; i < ARRAY_SIZE(uvcg_format_names); ++i) {
+                if (!strcmp(target->ci_parent->ci_name, uvcg_format_names[i]))
                         break;
-        if (i == ARRAY_SIZE(fmt_parent))
+        }
+
+        if (i == ARRAY_SIZE(uvcg_format_names))
                 goto out;
 
         target_fmt = container_of(to_config_group(target), struct uvcg_format,
@@ -755,6 +917,8 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
         if (!target_fmt)
                 goto out;
 
+        uvcg_format_set_indices(to_config_group(target));
+
         format_ptr = kzalloc(sizeof(*format_ptr), GFP_KERNEL);
         if (!format_ptr) {
                 ret = -ENOMEM;
@@ -764,6 +928,7 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
         format_ptr->fmt = target_fmt;
         list_add_tail(&format_ptr->entry, &src_hdr->formats);
         ++src_hdr->num_fmt;
+        ++target_fmt->linked;
 
 out:
         mutex_unlock(&opts->lock);
@@ -801,19 +966,22 @@ static void uvcg_streaming_header_drop_link(struct config_item *src,
                         break;
                 }
 
+        --target_fmt->linked;
+
 out:
         mutex_unlock(&opts->lock);
         mutex_unlock(su_mutex);
 }
 
 static struct configfs_item_operations uvcg_streaming_header_item_ops = {
-        .allow_link             = uvcg_streaming_header_allow_link,
-        .drop_link              = uvcg_streaming_header_drop_link,
+        .release        = uvcg_config_item_release,
+        .allow_link     = uvcg_streaming_header_allow_link,
+        .drop_link      = uvcg_streaming_header_drop_link,
 };
 
-#define UVCG_STREAMING_HEADER_ATTR(cname, aname, conv)                  \
+#define UVCG_STREAMING_HEADER_ATTR(cname, aname, bits)                  \
 static ssize_t uvcg_streaming_header_##cname##_show(                    \
-        struct config_item *item, char *page)                   \
+        struct config_item *item, char *page)                           \
 {                                                                       \
         struct uvcg_streaming_header *sh = to_uvcg_streaming_header(item); \
         struct f_uvc_opts *opts;                                        \
@@ -827,7 +995,7 @@ static ssize_t uvcg_streaming_header_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(sh->desc.aname));           \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(sh->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -836,16 +1004,11 @@ static ssize_t uvcg_streaming_header_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_streaming_header_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_STREAMING_HEADER_ATTR(bm_info, bmInfo, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_terminal_link, bTerminalLink, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_still_capture_method, bStillCaptureMethod,
-                           identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_trigger_support, bTriggerSupport, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_trigger_usage, bTriggerUsage, identity_conv);
-
-#undef identity_conv
+UVCG_STREAMING_HEADER_ATTR(bm_info, bmInfo, 8);
+UVCG_STREAMING_HEADER_ATTR(b_terminal_link, bTerminalLink, 8);
+UVCG_STREAMING_HEADER_ATTR(b_still_capture_method, bStillCaptureMethod, 8);
+UVCG_STREAMING_HEADER_ATTR(b_trigger_support, bTriggerSupport, 8);
+UVCG_STREAMING_HEADER_ATTR(b_trigger_usage, bTriggerUsage, 8);
 
 #undef UVCG_STREAMING_HEADER_ATTR
 
@@ -884,31 +1047,26 @@ static struct config_item
         return &h->item;
 }
 
-static void uvcg_streaming_header_drop(struct config_group *group,
-                              struct config_item *item)
-{
-        struct uvcg_streaming_header *h = to_uvcg_streaming_header(item);
-
-        kfree(h);
-}
-
-/* streaming/header */
-static struct uvcg_streaming_header_grp {
-        struct config_group     group;
-} uvcg_streaming_header_grp;
-
 static struct configfs_group_operations uvcg_streaming_header_grp_ops = {
         .make_item              = uvcg_streaming_header_make,
-        .drop_item              = uvcg_streaming_header_drop,
 };
 
-static const struct config_item_type uvcg_streaming_header_grp_type = {
-        .ct_group_ops   = &uvcg_streaming_header_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_streaming_header_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_streaming_header_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "header",
 };
 
-/* streaming/<mode>/<format>/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/<mode>/<format>/<NAME>
+ */
+
 struct uvcg_frame {
+        struct config_item      item;
+        enum uvcg_format_type   fmt_type;
         struct {
                 u8      b_length;
                 u8      b_descriptor_type;
@@ -924,8 +1082,6 @@ struct uvcg_frame {
                 u8      b_frame_interval_type;
         } __attribute__((packed)) frame;
         u32 *dw_frame_interval;
-        enum uvcg_format_type   fmt_type;
-        struct config_item      item;
 };
 
 static struct uvcg_frame *to_uvcg_frame(struct config_item *item)
@@ -933,7 +1089,7 @@ static struct uvcg_frame *to_uvcg_frame(struct config_item *item)
         return container_of(item, struct uvcg_frame, item);
 }
 
-#define UVCG_FRAME_ATTR(cname, aname, to_cpu_endian, to_little_endian, bits) \
+#define UVCG_FRAME_ATTR(cname, aname, bits) \
 static ssize_t uvcg_frame_##cname##_show(struct config_item *item, char *page)\
 {                                                                       \
         struct uvcg_frame *f = to_uvcg_frame(item);                     \
@@ -948,7 +1104,7 @@ static ssize_t uvcg_frame_##cname##_show(struct config_item *item, char *page)\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", to_cpu_endian(f->frame.cname));  \
+        result = sprintf(page, "%u\n", f->frame.cname);                 \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -963,8 +1119,8 @@ static ssize_t  uvcg_frame_##cname##_store(struct config_item *item,	\
         struct config_item *opts_item;                                  \
         struct uvcg_format *fmt;                                        \
         struct mutex *su_mutex = &f->item.ci_group->cg_subsys->su_mutex;\
+        typeof(f->frame.cname) num;                                     \
         int ret;                                                        \
-        u##bits num;                                                    \
                                                                         \
         ret = kstrtou##bits(page, 0, &num);                             \
         if (ret)                                                        \
@@ -982,7 +1138,7 @@ static ssize_t  uvcg_frame_##cname##_store(struct config_item *item,	\
                 goto end;                                               \
         }                                                               \
                                                                         \
-        f->frame.cname = to_little_endian(num);                         \
+        f->frame.cname = num;                                           \
         ret = len;                                                      \
 end:                                                                    \
         mutex_unlock(&opts->lock);                                      \
@@ -992,20 +1148,48 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_frame_, cname, aname);
 
-#define noop_conversion(x) (x)
+static ssize_t uvcg_frame_b_frame_index_show(struct config_item *item,
+                                             char *page)
+{
+        struct uvcg_frame *f = to_uvcg_frame(item);
+        struct uvcg_format *fmt;
+        struct f_uvc_opts *opts;
+        struct config_item *opts_item;
+        struct config_item *fmt_item;
+        struct mutex *su_mutex = &f->item.ci_group->cg_subsys->su_mutex;
+        int result;
+
+        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+
+        fmt_item = f->item.ci_parent;
+        fmt = to_uvcg_format(fmt_item);
 
-UVCG_FRAME_ATTR(bm_capabilities, bmCapabilities, noop_conversion,
-                noop_conversion, 8);
-UVCG_FRAME_ATTR(w_width, wWidth, le16_to_cpu, cpu_to_le16, 16);
-UVCG_FRAME_ATTR(w_height, wHeight, le16_to_cpu, cpu_to_le16, 16);
-UVCG_FRAME_ATTR(dw_min_bit_rate, dwMinBitRate, le32_to_cpu, cpu_to_le32, 32);
-UVCG_FRAME_ATTR(dw_max_bit_rate, dwMaxBitRate, le32_to_cpu, cpu_to_le32, 32);
-UVCG_FRAME_ATTR(dw_max_video_frame_buffer_size, dwMaxVideoFrameBufferSize,
-                le32_to_cpu, cpu_to_le32, 32);
-UVCG_FRAME_ATTR(dw_default_frame_interval, dwDefaultFrameInterval,
-                le32_to_cpu, cpu_to_le32, 32);
+        if (!fmt->linked) {
+                result = -EBUSY;
+                goto out;
+        }
 
-#undef noop_conversion
+        opts_item = fmt_item->ci_parent->ci_parent->ci_parent;
+        opts = to_f_uvc_opts(opts_item);
+
+        mutex_lock(&opts->lock);
+        result = sprintf(page, "%u\n", f->frame.b_frame_index);
+        mutex_unlock(&opts->lock);
+
+out:
+        mutex_unlock(su_mutex);
+        return result;
+}
+
+UVC_ATTR_RO(uvcg_frame_, b_frame_index, bFrameIndex);
+
+UVCG_FRAME_ATTR(bm_capabilities, bmCapabilities, 8);
+UVCG_FRAME_ATTR(w_width, wWidth, 16);
+UVCG_FRAME_ATTR(w_height, wHeight, 16);
+UVCG_FRAME_ATTR(dw_min_bit_rate, dwMinBitRate, 32);
+UVCG_FRAME_ATTR(dw_max_bit_rate, dwMaxBitRate, 32);
+UVCG_FRAME_ATTR(dw_max_video_frame_buffer_size, dwMaxVideoFrameBufferSize, 32);
+UVCG_FRAME_ATTR(dw_default_frame_interval, dwDefaultFrameInterval, 32);
 
 #undef UVCG_FRAME_ATTR
 
@@ -1026,8 +1210,7 @@ static ssize_t uvcg_frame_dw_frame_interval_show(struct config_item *item,
 
         mutex_lock(&opts->lock);
         for (result = 0, i = 0; i < frm->frame.b_frame_interval_type; ++i) {
-                result += sprintf(pg, "%d\n",
-                                  le32_to_cpu(frm->dw_frame_interval[i]));
+                result += sprintf(pg, "%u\n", frm->dw_frame_interval[i]);
                 pg = page + result;
         }
         mutex_unlock(&opts->lock);
@@ -1052,7 +1235,7 @@ static inline int __uvcg_fill_frm_intrv(char *buf, void *priv)
                 return ret;
 
         interv = priv;
-        **interv = cpu_to_le32(num);
+        **interv = num;
         ++*interv;
 
         return 0;
@@ -1129,6 +1312,8 @@ static ssize_t uvcg_frame_dw_frame_interval_store(struct config_item *item,
         kfree(ch->dw_frame_interval);
         ch->dw_frame_interval = frm_intrv;
         ch->frame.b_frame_interval_type = n;
+        sort(ch->dw_frame_interval, n, sizeof(*ch->dw_frame_interval),
+             uvcg_config_compare_u32, NULL);
         ret = len;
 
 end:
@@ -1140,6 +1325,7 @@ end:
 UVC_ATTR(uvcg_frame_, dw_frame_interval, dwFrameInterval);
 
 static struct configfs_attribute *uvcg_frame_attrs[] = {
+        &uvcg_frame_attr_b_frame_index,
         &uvcg_frame_attr_bm_capabilities,
         &uvcg_frame_attr_w_width,
         &uvcg_frame_attr_w_height,
@@ -1152,6 +1338,7 @@ static struct configfs_attribute *uvcg_frame_attrs[] = {
 };
 
 static const struct config_item_type uvcg_frame_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_attrs       = uvcg_frame_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -1170,12 +1357,12 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
 
         h->frame.b_descriptor_type              = USB_DT_CS_INTERFACE;
         h->frame.b_frame_index                  = 1;
-        h->frame.w_width                        = cpu_to_le16(640);
-        h->frame.w_height                       = cpu_to_le16(360);
-        h->frame.dw_min_bit_rate                = cpu_to_le32(18432000);
-        h->frame.dw_max_bit_rate                = cpu_to_le32(55296000);
-        h->frame.dw_max_video_frame_buffer_size = cpu_to_le32(460800);
-        h->frame.dw_default_frame_interval      = cpu_to_le32(666666);
+        h->frame.w_width                        = 640;
+        h->frame.w_height                       = 360;
+        h->frame.dw_min_bit_rate                = 18432000;
+        h->frame.dw_max_bit_rate                = 55296000;
+        h->frame.dw_max_video_frame_buffer_size = 460800;
+        h->frame.dw_default_frame_interval      = 666666;
 
         opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;
         opts = to_f_uvc_opts(opts_item);
@@ -1203,7 +1390,6 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
 
 static void uvcg_frame_drop(struct config_group *group, struct config_item *item)
 {
-        struct uvcg_frame *h = to_uvcg_frame(item);
         struct uvcg_format *fmt;
         struct f_uvc_opts *opts;
         struct config_item *opts_item;
@@ -1214,11 +1400,31 @@ static void uvcg_frame_drop(struct config_group *group, struct config_item *item
         mutex_lock(&opts->lock);
         fmt = to_uvcg_format(&group->cg_item);
         --fmt->num_frames;
-        kfree(h);
         mutex_unlock(&opts->lock);
+
+        config_item_put(item);
+}
+
+static void uvcg_format_set_indices(struct config_group *fmt)
+{
+        struct config_item *ci;
+        unsigned int i = 1;
+
+        list_for_each_entry(ci, &fmt->cg_children, ci_entry) {
+                struct uvcg_frame *frm;
+
+                if (ci->ci_type != &uvcg_frame_type)
+                        continue;
+
+                frm = to_uvcg_frame(ci);
+                frm->frame.b_frame_index = i++;
+        }
 }
 
-/* streaming/uncompressed/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/uncompressed/<NAME>
+ */
+
 struct uvcg_uncompressed {
         struct uvcg_format              fmt;
         struct uvc_format_uncompressed  desc;
@@ -1290,7 +1496,7 @@ end:
 
 UVC_ATTR(uvcg_uncompressed_, guid_format, guidFormat);
 
-#define UVCG_UNCOMPRESSED_ATTR_RO(cname, aname, conv)                   \
+#define UVCG_UNCOMPRESSED_ATTR_RO(cname, aname, bits)                   \
 static ssize_t uvcg_uncompressed_##cname##_show(                        \
         struct config_item *item, char *page)                           \
 {                                                                       \
@@ -1306,7 +1512,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1315,7 +1521,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(			\
                                                                         \
 UVC_ATTR_RO(uvcg_uncompressed_, cname, aname);
 
-#define UVCG_UNCOMPRESSED_ATTR(cname, aname, conv)                      \
+#define UVCG_UNCOMPRESSED_ATTR(cname, aname, bits)                      \
 static ssize_t uvcg_uncompressed_##cname##_show(                        \
         struct config_item *item, char *page)                           \
 {                                                                       \
@@ -1331,7 +1537,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(			\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1378,16 +1584,12 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_uncompressed_, cname, aname);
 
-#define identity_conv(x) (x)
-
-UVCG_UNCOMPRESSED_ATTR(b_bits_per_pixel, bBitsPerPixel, identity_conv);
-UVCG_UNCOMPRESSED_ATTR(b_default_frame_index, bDefaultFrameIndex,
-                       identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(bm_interface_flags, bmInterfaceFlags, identity_conv);
-
-#undef identity_conv
+UVCG_UNCOMPRESSED_ATTR_RO(b_format_index, bFormatIndex, 8);
+UVCG_UNCOMPRESSED_ATTR(b_bits_per_pixel, bBitsPerPixel, 8);
+UVCG_UNCOMPRESSED_ATTR(b_default_frame_index, bDefaultFrameIndex, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(bm_interface_flags, bmInterfaceFlags, 8);
 
 #undef UVCG_UNCOMPRESSED_ATTR
 #undef UVCG_UNCOMPRESSED_ATTR_RO
@@ -1410,6 +1612,7 @@ uvcg_uncompressed_bma_controls_store(struct config_item *item,
 UVC_ATTR(uvcg_uncompressed_, bma_controls, bmaControls);
 
 static struct configfs_attribute *uvcg_uncompressed_attrs[] = {
+        &uvcg_uncompressed_attr_b_format_index,
         &uvcg_uncompressed_attr_guid_format,
         &uvcg_uncompressed_attr_b_bits_per_pixel,
         &uvcg_uncompressed_attr_b_default_frame_index,
@@ -1421,6 +1624,7 @@ static struct configfs_attribute *uvcg_uncompressed_attrs[] = {
 };
 
 static const struct config_item_type uvcg_uncompressed_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_group_ops   = &uvcg_uncompressed_group_ops,
         .ct_attrs       = uvcg_uncompressed_attrs,
         .ct_owner       = THIS_MODULE,
@@ -1457,25 +1661,23 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group,
         return &h->fmt.group;
 }
 
-static void uvcg_uncompressed_drop(struct config_group *group,
-                            struct config_item *item)
-{
-        struct uvcg_uncompressed *h = to_uvcg_uncompressed(item);
-
-        kfree(h);
-}
-
 static struct configfs_group_operations uvcg_uncompressed_grp_ops = {
         .make_group             = uvcg_uncompressed_make,
-        .drop_item              = uvcg_uncompressed_drop,
 };
 
-static const struct config_item_type uvcg_uncompressed_grp_type = {
-        .ct_group_ops   = &uvcg_uncompressed_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_uncompressed_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_uncompressed_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "uncompressed",
 };
 
-/* streaming/mjpeg/<NAME> */
+/* -----------------------------------------------------------------------------
+ * streaming/mjpeg/<NAME>
+ */
+
 struct uvcg_mjpeg {
         struct uvcg_format              fmt;
         struct uvc_format_mjpeg         desc;
@@ -1493,7 +1695,7 @@ static struct configfs_group_operations uvcg_mjpeg_group_ops = {
         .drop_item              = uvcg_frame_drop,
 };
 
-#define UVCG_MJPEG_ATTR_RO(cname, aname, conv)                          \
+#define UVCG_MJPEG_ATTR_RO(cname, aname, bits)                          \
 static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
 {                                                                       \
         struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);                     \
@@ -1508,7 +1710,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1517,7 +1719,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
                                                                         \
 UVC_ATTR_RO(uvcg_mjpeg_, cname, aname)
 
-#define UVCG_MJPEG_ATTR(cname, aname, conv)                             \
+#define UVCG_MJPEG_ATTR(cname, aname, bits)                             \
 static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
 {                                                                       \
         struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);                     \
@@ -1532,7 +1734,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
         opts = to_f_uvc_opts(opts_item);                                \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(u->desc.aname));\
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1579,16 +1781,12 @@ end:									\
                                                                         \
 UVC_ATTR(uvcg_mjpeg_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_MJPEG_ATTR(b_default_frame_index, bDefaultFrameIndex,
-                       identity_conv);
-UVCG_MJPEG_ATTR_RO(bm_flags, bmFlags, identity_conv);
-UVCG_MJPEG_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, identity_conv);
-UVCG_MJPEG_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, identity_conv);
-UVCG_MJPEG_ATTR_RO(bm_interface_flags, bmInterfaceFlags, identity_conv);
-
-#undef identity_conv
+UVCG_MJPEG_ATTR_RO(b_format_index, bFormatIndex, 8);
+UVCG_MJPEG_ATTR(b_default_frame_index, bDefaultFrameIndex, 8);
+UVCG_MJPEG_ATTR_RO(bm_flags, bmFlags, 8);
+UVCG_MJPEG_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, 8);
+UVCG_MJPEG_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, 8);
+UVCG_MJPEG_ATTR_RO(bm_interface_flags, bmInterfaceFlags, 8);
 
 #undef UVCG_MJPEG_ATTR
 #undef UVCG_MJPEG_ATTR_RO
@@ -1611,6 +1809,7 @@ uvcg_mjpeg_bma_controls_store(struct config_item *item,
 UVC_ATTR(uvcg_mjpeg_, bma_controls, bmaControls);
 
 static struct configfs_attribute *uvcg_mjpeg_attrs[] = {
+        &uvcg_mjpeg_attr_b_format_index,
         &uvcg_mjpeg_attr_b_default_frame_index,
         &uvcg_mjpeg_attr_bm_flags,
         &uvcg_mjpeg_attr_b_aspect_ratio_x,
@@ -1621,6 +1820,7 @@ static struct configfs_attribute *uvcg_mjpeg_attrs[] = {
 };
 
 static const struct config_item_type uvcg_mjpeg_type = {
+        .ct_item_ops    = &uvcg_config_item_ops,
         .ct_group_ops   = &uvcg_mjpeg_group_ops,
         .ct_attrs       = uvcg_mjpeg_attrs,
         .ct_owner       = THIS_MODULE,
@@ -1651,56 +1851,42 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group,
         return &h->fmt.group;
 }
 
-static void uvcg_mjpeg_drop(struct config_group *group,
-                            struct config_item *item)
-{
-        struct uvcg_mjpeg *h = to_uvcg_mjpeg(item);
-
-        kfree(h);
-}
-
 static struct configfs_group_operations uvcg_mjpeg_grp_ops = {
         .make_group             = uvcg_mjpeg_make,
-        .drop_item              = uvcg_mjpeg_drop,
 };
 
-static const struct config_item_type uvcg_mjpeg_grp_type = {
-        .ct_group_ops   = &uvcg_mjpeg_grp_ops,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_mjpeg_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_group_ops   = &uvcg_mjpeg_grp_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "mjpeg",
 };
 
-/* streaming/color_matching/default */
-static struct uvcg_default_color_matching {
-        struct config_group     group;
-} uvcg_default_color_matching;
-
-static inline struct uvcg_default_color_matching
-*to_uvcg_default_color_matching(struct config_item *item)
-{
-        return container_of(to_config_group(item),
-                            struct uvcg_default_color_matching, group);
-}
+/* -----------------------------------------------------------------------------
+ * streaming/color_matching/default
+ */
 
-#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, conv)            \
+#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, bits)            \
 static ssize_t uvcg_default_color_matching_##cname##_show(              \
-        struct config_item *item, char *page)           \
+        struct config_item *item, char *page)                           \
 {                                                                       \
-        struct uvcg_default_color_matching *dc =                        \
-                to_uvcg_default_color_matching(item);                   \
+        struct config_group *group = to_config_group(item);             \
         struct f_uvc_opts *opts;                                        \
         struct config_item *opts_item;                                  \
-        struct mutex *su_mutex = &dc->group.cg_subsys->su_mutex;        \
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;           \
         struct uvc_color_matching_descriptor *cd;                       \
         int result;                                                     \
                                                                         \
         mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                         \
-        opts_item = dc->group.cg_item.ci_parent->ci_parent->ci_parent;  \
+        opts_item = group->cg_item.ci_parent->ci_parent->ci_parent;     \
         opts = to_f_uvc_opts(opts_item);                                \
         cd = &opts->uvc_color_matching;                                 \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(cd->aname));                \
+        result = sprintf(page, "%u\n", le##bits##_to_cpu(cd->aname));   \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         mutex_unlock(su_mutex);                                         \
@@ -1709,16 +1895,10 @@ static ssize_t uvcg_default_color_matching_##cname##_show(		\
                                                                         \
 UVC_ATTR_RO(uvcg_default_color_matching_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries,
-                                 identity_conv);
+UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
 UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_transfer_characteristics,
-                                 bTransferCharacteristics, identity_conv);
-UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients,
-                                 identity_conv);
-
-#undef identity_conv
+                                 bTransferCharacteristics, 8);
+UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients, 8);
 
 #undef UVCG_DEFAULT_COLOR_MATCHING_ATTR
 
@@ -1729,41 +1909,54 @@ static struct configfs_attribute *uvcg_default_color_matching_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvcg_default_color_matching_type = {
-        .ct_attrs       = uvcg_default_color_matching_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_default_color_matching_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_color_matching_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "default",
 };
 
-/* struct uvcg_color_matching {}; */
-
-/* streaming/color_matching */
-static struct uvcg_color_matching_grp {
-        struct config_group     group;
-} uvcg_color_matching_grp;
+/* -----------------------------------------------------------------------------
+ * streaming/color_matching
+ */
 
-static const struct config_item_type uvcg_color_matching_grp_type = {
-        .ct_owner = THIS_MODULE,
+static const struct uvcg_config_group_type uvcg_color_matching_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "color_matching",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_default_color_matching_type,
+                NULL,
+        },
 };
 
-/* streaming/class/{fs|hs|ss} */
-static struct uvcg_streaming_class {
-        struct config_group     group;
-} uvcg_streaming_class_fs, uvcg_streaming_class_hs, uvcg_streaming_class_ss;
+/* -----------------------------------------------------------------------------
+ * streaming/class/{fs|hs|ss}
+ */
 
+struct uvcg_streaming_class_group {
+        struct config_group group;
+        const char *name;
+};
 
 static inline struct uvc_descriptor_header
 ***__uvcg_get_stream_class_arr(struct config_item *i, struct f_uvc_opts *o)
 {
-        struct uvcg_streaming_class *cl = container_of(to_config_group(i),
-                struct uvcg_streaming_class, group);
+        struct uvcg_streaming_class_group *group =
+                container_of(i, struct uvcg_streaming_class_group,
+                             group.cg_item);
 
-        if (cl == &uvcg_streaming_class_fs)
+        if (!strcmp(group->name, "fs"))
                 return &o->uvc_fs_streaming_cls;
 
-        if (cl == &uvcg_streaming_class_hs)
+        if (!strcmp(group->name, "hs"))
                 return &o->uvc_hs_streaming_cls;
 
-        if (cl == &uvcg_streaming_class_ss)
+        if (!strcmp(group->name, "ss"))
                 return &o->uvc_ss_streaming_cls;
 
         return NULL;
@@ -1922,24 +2115,22 @@ static int __uvcg_fill_strm(void *priv1, void *priv2, void *priv3, int n,
                 struct uvcg_format *fmt = priv1;
 
                 if (fmt->type == UVCG_UNCOMPRESSED) {
-                        struct uvc_format_uncompressed *unc = *dest;
                         struct uvcg_uncompressed *u =
                                 container_of(fmt, struct uvcg_uncompressed,
                                              fmt);
 
+                        u->desc.bFormatIndex = n + 1;
+                        u->desc.bNumFrameDescriptors = fmt->num_frames;
                         memcpy(*dest, &u->desc, sizeof(u->desc));
                         *dest += sizeof(u->desc);
-                        unc->bNumFrameDescriptors = fmt->num_frames;
-                        unc->bFormatIndex = n + 1;
                 } else if (fmt->type == UVCG_MJPEG) {
-                        struct uvc_format_mjpeg *mjp = *dest;
                         struct uvcg_mjpeg *m =
                                 container_of(fmt, struct uvcg_mjpeg, fmt);
 
+                        m->desc.bFormatIndex = n + 1;
+                        m->desc.bNumFrameDescriptors = fmt->num_frames;
                         memcpy(*dest, &m->desc, sizeof(m->desc));
                         *dest += sizeof(m->desc);
-                        mjp->bNumFrameDescriptors = fmt->num_frames;
-                        mjp->bFormatIndex = n + 1;
                 } else {
                         return -EINVAL;
                 }
@@ -2038,6 +2229,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
         return ret;
 }
@@ -2078,10 +2270,12 @@ static void uvcg_streaming_class_drop_link(struct config_item *src,
 unlock:
         mutex_unlock(&opts->lock);
 out:
+        config_item_put(header);
         mutex_unlock(su_mutex);
 }
 
 static struct configfs_item_operations uvcg_streaming_class_item_ops = {
+        .release        = uvcg_config_item_release,
         .allow_link     = uvcg_streaming_class_allow_link,
         .drop_link      = uvcg_streaming_class_drop_link,
 };
@@ -2091,36 +2285,109 @@ static const struct config_item_type uvcg_streaming_class_type = {
         .ct_owner       = THIS_MODULE,
 };
 
-/* streaming/class */
-static struct uvcg_streaming_class_grp {
-        struct config_group     group;
-} uvcg_streaming_class_grp;
+/* -----------------------------------------------------------------------------
+ * streaming/class
+ */
+
+static int uvcg_streaming_class_create_children(struct config_group *parent)
+{
+        static const char * const names[] = { "fs", "hs", "ss" };
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(names); ++i) {
+                struct uvcg_streaming_class_group *group;
+
+                group = kzalloc(sizeof(*group), GFP_KERNEL);
+                if (!group)
+                        return -ENOMEM;
 
-static const struct config_item_type uvcg_streaming_class_grp_type = {
-        .ct_owner = THIS_MODULE,
+                group->name = names[i];
+
+                config_group_init_type_name(&group->group, group->name,
+                                            &uvcg_streaming_class_type);
+                configfs_add_default_group(&group->group, parent);
+        }
+
+        return 0;
+}
+
+static const struct uvcg_config_group_type uvcg_streaming_class_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "class",
+        .create_children = uvcg_streaming_class_create_children,
 };
 
-/* streaming */
-static struct uvcg_streaming_grp {
-        struct config_group     group;
-} uvcg_streaming_grp;
+/* -----------------------------------------------------------------------------
+ * streaming
+ */
 
-static const struct config_item_type uvcg_streaming_grp_type = {
-        .ct_owner = THIS_MODULE,
+static ssize_t uvcg_default_streaming_b_interface_number_show(
+        struct config_item *item, char *page)
+{
+        struct config_group *group = to_config_group(item);
+        struct mutex *su_mutex = &group->cg_subsys->su_mutex;
+        struct config_item *opts_item;
+        struct f_uvc_opts *opts;
+        int result = 0;
+
+        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
+
+        opts_item = item->ci_parent;
+        opts = to_f_uvc_opts(opts_item);
+
+        mutex_lock(&opts->lock);
+        result += sprintf(page, "%u\n", opts->streaming_interface);
+        mutex_unlock(&opts->lock);
+
+        mutex_unlock(su_mutex);
+
+        return result;
+}
+
+UVC_ATTR_RO(uvcg_default_streaming_, b_interface_number, bInterfaceNumber);
+
+static struct configfs_attribute *uvcg_default_streaming_attrs[] = {
+        &uvcg_default_streaming_attr_b_interface_number,
+        NULL,
+};
+
+static const struct uvcg_config_group_type uvcg_streaming_grp_type = {
+        .type = {
+                .ct_item_ops    = &uvcg_config_item_ops,
+                .ct_attrs       = uvcg_default_streaming_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "streaming",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_streaming_header_grp_type,
+                &uvcg_uncompressed_grp_type,
+                &uvcg_mjpeg_grp_type,
+                &uvcg_color_matching_grp_type,
+                &uvcg_streaming_class_grp_type,
+                NULL,
+        },
 };
 
-static void uvc_attr_release(struct config_item *item)
+/* -----------------------------------------------------------------------------
+ * UVC function
+ */
+
+static void uvc_func_item_release(struct config_item *item)
 {
         struct f_uvc_opts *opts = to_f_uvc_opts(item);
 
+        uvcg_config_remove_children(to_config_group(item));
         usb_put_function_instance(&opts->func_inst);
 }
 
-static struct configfs_item_operations uvc_item_ops = {
-        .release                = uvc_attr_release,
+static struct configfs_item_operations uvc_func_item_ops = {
+        .release        = uvc_func_item_release,
 };
 
-#define UVCG_OPTS_ATTR(cname, aname, conv, str2u, uxx, vnoc, limit)     \
+#define UVCG_OPTS_ATTR(cname, aname, limit)                             \
 static ssize_t f_uvc_opts_##cname##_show(                               \
         struct config_item *item, char *page)                           \
 {                                                                       \
@@ -2128,7 +2395,7 @@ static ssize_t f_uvc_opts_##cname##_show(				\
         int result;                                                     \
                                                                         \
         mutex_lock(&opts->lock);                                        \
-        result = sprintf(page, "%d\n", conv(opts->cname));              \
+        result = sprintf(page, "%u\n", opts->cname);                    \
         mutex_unlock(&opts->lock);                                      \
                                                                         \
         return result;                                                  \
@@ -2139,8 +2406,8 @@ f_uvc_opts_##cname##_store(struct config_item *item,			\
                            const char *page, size_t len)                \
 {                                                                       \
         struct f_uvc_opts *opts = to_f_uvc_opts(item);                  \
+        unsigned int num;                                               \
         int ret;                                                        \
-        uxx num;                                                        \
                                                                         \
         mutex_lock(&opts->lock);                                        \
         if (opts->refcnt) {                                             \
@@ -2148,7 +2415,7 @@ f_uvc_opts_##cname##_store(struct config_item *item,			\
                 goto end;                                               \
         }                                                               \
                                                                         \
-        ret = str2u(page, 0, &num);                                     \
+        ret = kstrtouint(page, 0, &num);                                \
         if (ret)                                                        \
                 goto end;                                               \
                                                                         \
@@ -2156,7 +2423,7 @@ f_uvc_opts_##cname##_store(struct config_item *item,			\
                 ret = -EINVAL;                                          \
                 goto end;                                               \
         }                                                               \
-        opts->cname = vnoc(num);                                        \
+        opts->cname = num;                                              \
         ret = len;                                                      \
 end:                                                                    \
         mutex_unlock(&opts->lock);                                      \
@@ -2165,16 +2432,9 @@ end:									\
                                                                         \
 UVC_ATTR(f_uvc_opts_, cname, cname)
 
-#define identity_conv(x) (x)
-
-UVCG_OPTS_ATTR(streaming_interval, streaming_interval, identity_conv,
-               kstrtou8, u8, identity_conv, 16);
-UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, le16_to_cpu,
-               kstrtou16, u16, le16_to_cpu, 3072);
-UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, identity_conv,
-               kstrtou8, u8, identity_conv, 15);
-
-#undef identity_conv
+UVCG_OPTS_ATTR(streaming_interval, streaming_interval, 16);
+UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, 3072);
+UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, 15);
 
 #undef UVCG_OPTS_ATTR
 
@@ -2185,123 +2445,31 @@ static struct configfs_attribute *uvc_attrs[] = {
         NULL,
 };
 
-static const struct config_item_type uvc_func_type = {
-        .ct_item_ops    = &uvc_item_ops,
-        .ct_attrs       = uvc_attrs,
-        .ct_owner       = THIS_MODULE,
+static const struct uvcg_config_group_type uvc_func_type = {
+        .type = {
+                .ct_item_ops    = &uvc_func_item_ops,
+                .ct_attrs       = uvc_attrs,
+                .ct_owner       = THIS_MODULE,
+        },
+        .name = "",
+        .children = (const struct uvcg_config_group_type*[]) {
+                &uvcg_control_grp_type,
+                &uvcg_streaming_grp_type,
+                NULL,
+        },
 };
 
 int uvcg_attach_configfs(struct f_uvc_opts *opts)
 {
-        config_group_init_type_name(&uvcg_control_header_grp.group,
-                                    "header",
-                                    &uvcg_control_header_grp_type);
-
-        config_group_init_type_name(&uvcg_default_processing.group,
-                        "default", &uvcg_default_processing_type);
-        config_group_init_type_name(&uvcg_processing_grp.group,
-                        "processing", &uvcg_processing_grp_type);
-        configfs_add_default_group(&uvcg_default_processing.group,
-                        &uvcg_processing_grp.group);
-
-        config_group_init_type_name(&uvcg_default_camera.group,
-                        "default", &uvcg_default_camera_type);
-        config_group_init_type_name(&uvcg_camera_grp.group,
-                        "camera", &uvcg_camera_grp_type);
-        configfs_add_default_group(&uvcg_default_camera.group,
-                        &uvcg_camera_grp.group);
-
-        config_group_init_type_name(&uvcg_default_output.group,
-                        "default", &uvcg_default_output_type);
-        config_group_init_type_name(&uvcg_output_grp.group,
-                        "output", &uvcg_output_grp_type);
-        configfs_add_default_group(&uvcg_default_output.group,
-                        &uvcg_output_grp.group);
-
-        config_group_init_type_name(&uvcg_terminal_grp.group,
-                        "terminal", &uvcg_terminal_grp_type);
-        configfs_add_default_group(&uvcg_camera_grp.group,
-                        &uvcg_terminal_grp.group);
-        configfs_add_default_group(&uvcg_output_grp.group,
-                        &uvcg_terminal_grp.group);
-
-        config_group_init_type_name(&uvcg_control_class_fs.group,
-                        "fs", &uvcg_control_class_type);
-        config_group_init_type_name(&uvcg_control_class_ss.group,
-                        "ss", &uvcg_control_class_type);
-        config_group_init_type_name(&uvcg_control_class_grp.group,
-                        "class",
-                        &uvcg_control_class_grp_type);
-        configfs_add_default_group(&uvcg_control_class_fs.group,
-                        &uvcg_control_class_grp.group);
-        configfs_add_default_group(&uvcg_control_class_ss.group,
-                        &uvcg_control_class_grp.group);
-
-        config_group_init_type_name(&uvcg_control_grp.group,
-                        "control",
-                        &uvcg_control_grp_type);
-        configfs_add_default_group(&uvcg_control_header_grp.group,
-                        &uvcg_control_grp.group);
-        configfs_add_default_group(&uvcg_processing_grp.group,
-                        &uvcg_control_grp.group);
-        configfs_add_default_group(&uvcg_terminal_grp.group,
-                        &uvcg_control_grp.group);
-        configfs_add_default_group(&uvcg_control_class_grp.group,
-                        &uvcg_control_grp.group);
-
-        config_group_init_type_name(&uvcg_streaming_header_grp.group,
-                                    "header",
-                                    &uvcg_streaming_header_grp_type);
-        config_group_init_type_name(&uvcg_uncompressed_grp.group,
-                                    "uncompressed",
-                                    &uvcg_uncompressed_grp_type);
-        config_group_init_type_name(&uvcg_mjpeg_grp.group,
-                                    "mjpeg",
-                                    &uvcg_mjpeg_grp_type);
-        config_group_init_type_name(&uvcg_default_color_matching.group,
-                                    "default",
-                                    &uvcg_default_color_matching_type);
-        config_group_init_type_name(&uvcg_color_matching_grp.group,
-                        "color_matching",
-                        &uvcg_color_matching_grp_type);
-        configfs_add_default_group(&uvcg_default_color_matching.group,
-                        &uvcg_color_matching_grp.group);
-
-        config_group_init_type_name(&uvcg_streaming_class_fs.group,
-                        "fs", &uvcg_streaming_class_type);
-        config_group_init_type_name(&uvcg_streaming_class_hs.group,
-                        "hs", &uvcg_streaming_class_type);
-        config_group_init_type_name(&uvcg_streaming_class_ss.group,
-                        "ss", &uvcg_streaming_class_type);
-        config_group_init_type_name(&uvcg_streaming_class_grp.group,
-                        "class", &uvcg_streaming_class_grp_type);
-        configfs_add_default_group(&uvcg_streaming_class_fs.group,
-                        &uvcg_streaming_class_grp.group);
-        configfs_add_default_group(&uvcg_streaming_class_hs.group,
-                        &uvcg_streaming_class_grp.group);
-        configfs_add_default_group(&uvcg_streaming_class_ss.group,
-                        &uvcg_streaming_class_grp.group);
-
-        config_group_init_type_name(&uvcg_streaming_grp.group,
-                        "streaming", &uvcg_streaming_grp_type);
-        configfs_add_default_group(&uvcg_streaming_header_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_uncompressed_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_mjpeg_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_color_matching_grp.group,
-                        &uvcg_streaming_grp.group);
-        configfs_add_default_group(&uvcg_streaming_class_grp.group,
-                        &uvcg_streaming_grp.group);
-
-        config_group_init_type_name(&opts->func_inst.group,
-                        "",
-                        &uvc_func_type);
-        configfs_add_default_group(&uvcg_control_grp.group,
-                        &opts->func_inst.group);
-        configfs_add_default_group(&uvcg_streaming_grp.group,
-                        &opts->func_inst.group);
+        int ret;
 
-        return 0;
+        config_group_init_type_name(&opts->func_inst.group, uvc_func_type.name,
+                                    &uvc_func_type.type);
+
+        ret = uvcg_config_create_children(&opts->func_inst.group,
+                                          &uvc_func_type);
+        if (ret < 0)
+                config_group_put(&opts->func_inst.group);
+
+        return ret;
 }
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 7f1ca3b57823..a1183eccee22 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -115,8 +115,8 @@ uvc_v4l2_set_format(struct file *file, void *fh, struct v4l2_format *fmt)
         }
 
         if (i == ARRAY_SIZE(uvc_formats)) {
-                printk(KERN_INFO "Unsupported format 0x%08x.\n",
-                        fmt->fmt.pix.pixelformat);
+                uvcg_info(&uvc->func, "Unsupported format 0x%08x.\n",
+                          fmt->fmt.pix.pixelformat);
                 return -EINVAL;
         }
 
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index d3567b90343a..5c042f380708 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -125,6 +125,23 @@ uvc_video_encode_isoc(struct usb_request *req, struct uvc_video *video,
  * Request handling
  */
 
+static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_request *req)
+{
+        int ret;
+
+        ret = usb_ep_queue(video->ep, req, GFP_ATOMIC);
+        if (ret < 0) {
+                uvcg_err(&video->uvc->func, "Failed to queue request (%d).\n",
+                         ret);
+
+                /* Isochronous endpoints can't be halted. */
+                if (usb_endpoint_xfer_bulk(video->ep->desc))
+                        usb_ep_set_halt(video->ep);
+        }
+
+        return ret;
+}
+
 /*
  * I somehow feel that synchronisation won't be easy to achieve here. We have
  * three events that control USB requests submission:
@@ -169,13 +186,14 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
                 break;
 
         case -ESHUTDOWN:        /* disconnect from host. */
-                printk(KERN_DEBUG "VS request cancelled.\n");
+                uvcg_dbg(&video->uvc->func, "VS request cancelled.\n");
                 uvcg_queue_cancel(queue, 1);
                 goto requeue;
 
         default:
-                printk(KERN_INFO "VS request completed with status %d.\n",
-                        req->status);
+                uvcg_info(&video->uvc->func,
+                          "VS request completed with status %d.\n",
+                          req->status);
                 uvcg_queue_cancel(queue, 0);
                 goto requeue;
         }
@@ -189,14 +207,13 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
 
         video->encode(req, video, buf);
 
-        if ((ret = usb_ep_queue(ep, req, GFP_ATOMIC)) < 0) {
-                printk(KERN_INFO "Failed to queue request (%d).\n", ret);
-                usb_ep_set_halt(ep);
-                spin_unlock_irqrestore(&video->queue.irqlock, flags);
+        ret = uvcg_video_ep_queue(video, req);
+        spin_unlock_irqrestore(&video->queue.irqlock, flags);
+
+        if (ret < 0) {
                 uvcg_queue_cancel(queue, 0);
                 goto requeue;
         }
-        spin_unlock_irqrestore(&video->queue.irqlock, flags);
 
         return;
 
@@ -316,15 +333,13 @@ int uvcg_video_pump(struct uvc_video *video)
                 video->encode(req, video, buf);
 
                 /* Queue the USB request */
-                ret = usb_ep_queue(video->ep, req, GFP_ATOMIC);
+                ret = uvcg_video_ep_queue(video, req);
+                spin_unlock_irqrestore(&queue->irqlock, flags);
+
                 if (ret < 0) {
-                        printk(KERN_INFO "Failed to queue request (%d)\n", ret);
-                        usb_ep_set_halt(video->ep);
-                        spin_unlock_irqrestore(&queue->irqlock, flags);
                         uvcg_queue_cancel(queue, 0);
                         break;
                 }
-                spin_unlock_irqrestore(&queue->irqlock, flags);
         }
 
         spin_lock_irqsave(&video->req_lock, flags);
@@ -342,8 +357,8 @@ int uvcg_video_enable(struct uvc_video *video, int enable)
         int ret;
 
         if (video->ep == NULL) {
-                printk(KERN_INFO "Video enable failed, device is "
-                        "uninitialized.\n");
+                uvcg_info(&video->uvc->func,
+                          "Video enable failed, device is uninitialized.\n");
                 return -ENODEV;
         }
 
@@ -375,11 +390,12 @@ int uvcg_video_enable(struct uvc_video *video, int enable)
 /*
  * Initialize the UVC video stream.
  */
-int uvcg_video_init(struct uvc_video *video)
+int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc)
 {
         INIT_LIST_HEAD(&video->req_free);
         spin_lock_init(&video->req_lock);
 
+        video->uvc = uvc;
         video->fcc = V4L2_PIX_FMT_YUYV;
         video->bpp = 16;
         video->width = 320;
diff --git a/drivers/usb/gadget/function/uvc_video.h b/drivers/usb/gadget/function/uvc_video.h
index 7d77122b0ff9..278dc52c7604 100644
--- a/drivers/usb/gadget/function/uvc_video.h
+++ b/drivers/usb/gadget/function/uvc_video.h
@@ -18,6 +18,6 @@ int uvcg_video_pump(struct uvc_video *video);
 
 int uvcg_video_enable(struct uvc_video *video, int enable);
 
-int uvcg_video_init(struct uvc_video *video);
+int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc);
 
 #endif /* __UVC_VIDEO_H__ */
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 17147b8c771e..11247322d587 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -2004,7 +2004,6 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
                                                     struct usba_udc *udc)
 {
         u32 val;
-        const char *name;
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *match;
         struct device_node *pp;
@@ -2018,6 +2017,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
         udc->errata = match->data;
         udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc");
         if (IS_ERR(udc->pmc))
+                udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc");
+        if (IS_ERR(udc->pmc))
                 udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc");
         if (udc->errata && IS_ERR(udc->pmc))
                 return ERR_CAST(udc->pmc);
@@ -2094,11 +2095,6 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
                 ep->can_dma = of_property_read_bool(pp, "atmel,can-dma");
                 ep->can_isoc = of_property_read_bool(pp, "atmel,can-isoc");
 
-                ret = of_property_read_string(pp, "name", &name);
-                if (ret) {
-                        dev_err(&pdev->dev, "of_probe: name error(%d)\n", ret);
-                        goto err;
-                }
                 sprintf(ep->name, "ep%d", ep->index);
                 ep->ep.name = ep->name;
 
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index af88b48c1cea..87d6b12779f2 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -690,6 +690,9 @@ EXPORT_SYMBOL_GPL(usb_gadget_connect);
  * as a disconnect (when a VBUS session is active).  Not all systems
  * support software pullup controls.
  *
+ * Following a successful disconnect, invoke the ->disconnect() callback
+ * for the current gadget driver so that UDC drivers don't need to.
+ *
  * Returns zero on success, else negative errno.
  */
 int usb_gadget_disconnect(struct usb_gadget *gadget)
@@ -711,8 +714,10 @@ int usb_gadget_disconnect(struct usb_gadget *gadget)
         }
 
         ret = gadget->ops->pullup(gadget, 0);
-        if (!ret)
+        if (!ret) {
                 gadget->connected = 0;
+                gadget->udc->driver->disconnect(gadget);
+        }
 
 out:
         trace_usb_gadget_disconnect(gadget, ret);
@@ -1281,7 +1286,6 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
         kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 
         usb_gadget_disconnect(udc->gadget);
-        udc->driver->disconnect(udc->gadget);
         udc->driver->unbind(udc->gadget);
         usb_gadget_udc_stop(udc);
 
@@ -1471,7 +1475,6 @@ static ssize_t soft_connect_store(struct device *dev,
                 usb_gadget_connect(udc->gadget);
         } else if (sysfs_streq(buf, "disconnect")) {
                 usb_gadget_disconnect(udc->gadget);
-                udc->driver->disconnect(udc->gadget);
                 usb_gadget_udc_stop(udc);
         } else {
                 dev_err(dev, "unsupported command '%s'\n", buf);
diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index 587c5037ff07..bc6abaea907d 100644
--- a/drivers/usb/gadget/udc/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -741,7 +741,7 @@ static void fotg210_get_status(struct fotg210_udc *fotg210,
         fotg210->ep0_req->length = 2;
 
         spin_unlock(&fotg210->lock);
-        fotg210_ep_queue(fotg210->gadget.ep0, fotg210->ep0_req, GFP_KERNEL);
+        fotg210_ep_queue(fotg210->gadget.ep0, fotg210->ep0_req, GFP_ATOMIC);
         spin_lock(&fotg210->lock);
 }
 
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index be59309e848c..20141c3096f6 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -2234,8 +2234,10 @@ static void fsl_udc_release(struct device *dev)
         Internal structure setup functions
 *******************************************************************/
 /*------------------------------------------------------------------
- * init resource for globle controller
- * Return the udc handle on success or NULL on failure
+ * init resource for global controller called by fsl_udc_probe()
+ * On success the udc handle is initialized, on failure it is
+ * unchanged (reset).
+ * Return 0 on success and -1 on allocation failure
  ------------------------------------------------------------------*/
 static int struct_udc_setup(struct fsl_udc *udc,
                 struct platform_device *pdev)
@@ -2247,8 +2249,10 @@ static int struct_udc_setup(struct fsl_udc *udc,
         udc->phy_mode = pdata->phy_mode;
 
         udc->eps = kcalloc(udc->max_ep, sizeof(struct fsl_ep), GFP_KERNEL);
-        if (!udc->eps)
-                return -1;
+        if (!udc->eps) {
+                ERR("kmalloc udc endpoint status failed\n");
+                goto eps_alloc_failed;
+        }
 
         /* initialized QHs, take care of alignment */
         size = udc->max_ep * sizeof(struct ep_queue_head);
@@ -2262,8 +2266,7 @@ static int struct_udc_setup(struct fsl_udc *udc,
                                         &udc->ep_qh_dma, GFP_KERNEL);
         if (!udc->ep_qh) {
                 ERR("malloc QHs for udc failed\n");
-                kfree(udc->eps);
-                return -1;
+                goto ep_queue_alloc_failed;
         }
 
         udc->ep_qh_size = size;
@@ -2272,8 +2275,17 @@ static int struct_udc_setup(struct fsl_udc *udc,
         /* FIXME: fsl_alloc_request() ignores ep argument */
         udc->status_req = container_of(fsl_alloc_request(NULL, GFP_KERNEL),
                         struct fsl_req, req);
+        if (!udc->status_req) {
+                ERR("kzalloc for udc status request failed\n");
+                goto udc_status_alloc_failed;
+        }
+
         /* allocate a small amount of memory to get valid address */
         udc->status_req->req.buf = kmalloc(8, GFP_KERNEL);
+        if (!udc->status_req->req.buf) {
+                ERR("kzalloc for udc request buffer failed\n");
+                goto udc_req_buf_alloc_failed;
+        }
 
         udc->resume_state = USB_STATE_NOTATTACHED;
         udc->usb_state = USB_STATE_POWERED;
@@ -2281,6 +2293,18 @@ static int struct_udc_setup(struct fsl_udc *udc,
         udc->remote_wakeup = 0; /* default to 0 on reset */
 
         return 0;
+
+udc_req_buf_alloc_failed:
+        kfree(udc->status_req);
+udc_status_alloc_failed:
+        kfree(udc->ep_qh);
+        udc->ep_qh_size = 0;
+ep_queue_alloc_failed:
+        kfree(udc->eps);
+eps_alloc_failed:
+        udc->phy_mode = 0;
+        return -1;
+
 }
 
 /*----------------------------------------------------------------
diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 95f52232493b..cafde053788b 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -185,7 +185,7 @@ static int process_ep_req(struct mv_udc *udc, int index,
         else
                 bit_pos = 1 << (16 + curr_req->ep->ep_num);
 
-        while ((curr_dqh->curr_dtd_ptr == curr_dtd->td_dma)) {
+        while (curr_dqh->curr_dtd_ptr == curr_dtd->td_dma) {
                 if (curr_dtd->dtd_next == EP_QUEUE_HEAD_NEXT_TERMINATE) {
                         while (readl(&udc->op_regs->epstatus) & bit_pos)
                                 udelay(1);
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index b02ab2a8d927..e7dae5379e04 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1550,9 +1550,6 @@ static int net2280_pullup(struct usb_gadget *_gadget, int is_on)
 
         spin_unlock_irqrestore(&dev->lock, flags);
 
-        if (!is_on && dev->driver)
-                dev->driver->disconnect(&dev->gadget);
-
         return 0;
 }
 
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index e1656f361e08..cdffbd1e0316 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -2437,6 +2437,9 @@ static ssize_t renesas_usb3_b_device_write(struct file *file,
         else
                 usb3->forced_b_device = false;
 
+        if (usb3->workaround_for_vbus)
+                usb3_disconnect(usb3);
+
         /* Let this driver call usb3_connect() anyway */
         usb3_check_id(usb3);
 
@@ -2600,6 +2603,13 @@ static const struct renesas_usb3_priv renesas_usb3_priv_gen3 = {
         .ramsize_per_pipe = SZ_4K,
 };
 
+static const struct renesas_usb3_priv renesas_usb3_priv_r8a77990 = {
+        .ramsize_per_ramif = SZ_16K,
+        .num_ramif = 4,
+        .ramsize_per_pipe = SZ_4K,
+        .workaround_for_vbus = true,
+};
+
 static const struct of_device_id usb3_of_match[] = {
         {
                 .compatible = "renesas,r8a7795-usb3-peri",
@@ -2618,6 +2628,10 @@ static const struct soc_device_attribute renesas_usb3_quirks_match[] = {
                 .soc_id = "r8a7795", .revision = "ES1.*",
                 .data = &renesas_usb3_priv_r8a7795_es1,
         },
+        {
+                .soc_id = "r8a77990",
+                .data = &renesas_usb3_priv_r8a77990,
+        },
         { /* sentinel */ },
 };
 
diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h
index ff6cc6cb4227..d854cb19c42c 100644
--- a/include/uapi/linux/usb/video.h
+++ b/include/uapi/linux/usb/video.h
@@ -192,14 +192,14 @@ struct uvc_descriptor_header {
 
 /* 3.7.2. Video Control Interface Header Descriptor */
 struct uvc_header_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u16 bcdUVC;
-        __u16 wTotalLength;
-        __u32 dwClockFrequency;
-        __u8  bInCollection;
-        __u8  baInterfaceNr[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __le16 bcdUVC;
+        __le16 wTotalLength;
+        __le32 dwClockFrequency;
+        __u8   bInCollection;
+        __u8   baInterfaceNr[];
 } __attribute__((__packed__));
 
 #define UVC_DT_HEADER_SIZE(n)                           (12+(n))
@@ -209,57 +209,57 @@ struct uvc_header_descriptor {
 
 #define DECLARE_UVC_HEADER_DESCRIPTOR(n)                \
 struct UVC_HEADER_DESCRIPTOR(n) {                       \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u16 bcdUVC;                                   \
-        __u16 wTotalLength;                             \
-        __u32 dwClockFrequency;                         \
-        __u8  bInCollection;                            \
-        __u8  baInterfaceNr[n];                         \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __le16 bcdUVC;                                  \
+        __le16 wTotalLength;                            \
+        __le32 dwClockFrequency;                        \
+        __u8   bInCollection;                           \
+        __u8   baInterfaceNr[n];                        \
 } __attribute__ ((packed))
 
 /* 3.7.2.1. Input Terminal Descriptor */
 struct uvc_input_terminal_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bTerminalID;
-        __u16 wTerminalType;
-        __u8  bAssocTerminal;
-        __u8  iTerminal;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bTerminalID;
+        __le16 wTerminalType;
+        __u8   bAssocTerminal;
+        __u8   iTerminal;
 } __attribute__((__packed__));
 
 #define UVC_DT_INPUT_TERMINAL_SIZE                      8
 
 /* 3.7.2.2. Output Terminal Descriptor */
 struct uvc_output_terminal_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bTerminalID;
-        __u16 wTerminalType;
-        __u8  bAssocTerminal;
-        __u8  bSourceID;
-        __u8  iTerminal;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bTerminalID;
+        __le16 wTerminalType;
+        __u8   bAssocTerminal;
+        __u8   bSourceID;
+        __u8   iTerminal;
 } __attribute__((__packed__));
 
 #define UVC_DT_OUTPUT_TERMINAL_SIZE                     9
 
 /* 3.7.2.3. Camera Terminal Descriptor */
 struct uvc_camera_terminal_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bTerminalID;
-        __u16 wTerminalType;
-        __u8  bAssocTerminal;
-        __u8  iTerminal;
-        __u16 wObjectiveFocalLengthMin;
-        __u16 wObjectiveFocalLengthMax;
-        __u16 wOcularFocalLength;
-        __u8  bControlSize;
-        __u8  bmControls[3];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bTerminalID;
+        __le16 wTerminalType;
+        __u8   bAssocTerminal;
+        __u8   iTerminal;
+        __le16 wObjectiveFocalLengthMin;
+        __le16 wObjectiveFocalLengthMax;
+        __le16 wOcularFocalLength;
+        __u8   bControlSize;
+        __u8   bmControls[3];
 } __attribute__((__packed__));
 
 #define UVC_DT_CAMERA_TERMINAL_SIZE(n)                  (15+(n))
@@ -293,15 +293,15 @@ struct UVC_SELECTOR_UNIT_DESCRIPTOR(n) {		\
 
 /* 3.7.2.5. Processing Unit Descriptor */
 struct uvc_processing_unit_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bUnitID;
-        __u8  bSourceID;
-        __u16 wMaxMultiplier;
-        __u8  bControlSize;
-        __u8  bmControls[2];
-        __u8  iProcessing;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bUnitID;
+        __u8   bSourceID;
+        __le16 wMaxMultiplier;
+        __u8   bControlSize;
+        __u8   bmControls[2];
+        __u8   iProcessing;
 } __attribute__((__packed__));
 
 #define UVC_DT_PROCESSING_UNIT_SIZE(n)                  (9+(n))
@@ -343,29 +343,29 @@ struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) {		\
 
 /* 3.8.2.2. Video Control Interrupt Endpoint Descriptor */
 struct uvc_control_endpoint_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u16 wMaxTransferSize;
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __le16 wMaxTransferSize;
 } __attribute__((__packed__));
 
 #define UVC_DT_CONTROL_ENDPOINT_SIZE                    5
 
 /* 3.9.2.1. Input Header Descriptor */
 struct uvc_input_header_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bNumFormats;
-        __u16 wTotalLength;
-        __u8  bEndpointAddress;
-        __u8  bmInfo;
-        __u8  bTerminalLink;
-        __u8  bStillCaptureMethod;
-        __u8  bTriggerSupport;
-        __u8  bTriggerUsage;
-        __u8  bControlSize;
-        __u8  bmaControls[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bNumFormats;
+        __le16 wTotalLength;
+        __u8   bEndpointAddress;
+        __u8   bmInfo;
+        __u8   bTerminalLink;
+        __u8   bStillCaptureMethod;
+        __u8   bTriggerSupport;
+        __u8   bTriggerUsage;
+        __u8   bControlSize;
+        __u8   bmaControls[];
 } __attribute__((__packed__));
 
 #define UVC_DT_INPUT_HEADER_SIZE(n, p)                  (13+(n*p))
@@ -375,32 +375,32 @@ struct uvc_input_header_descriptor {
 
 #define DECLARE_UVC_INPUT_HEADER_DESCRIPTOR(n, p)       \
 struct UVC_INPUT_HEADER_DESCRIPTOR(n, p) {              \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bNumFormats;                              \
-        __u16 wTotalLength;                             \
-        __u8  bEndpointAddress;                         \
-        __u8  bmInfo;                                   \
-        __u8  bTerminalLink;                            \
-        __u8  bStillCaptureMethod;                      \
-        __u8  bTriggerSupport;                          \
-        __u8  bTriggerUsage;                            \
-        __u8  bControlSize;                             \
-        __u8  bmaControls[p][n];                        \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bNumFormats;                             \
+        __le16 wTotalLength;                            \
+        __u8   bEndpointAddress;                        \
+        __u8   bmInfo;                                  \
+        __u8   bTerminalLink;                           \
+        __u8   bStillCaptureMethod;                     \
+        __u8   bTriggerSupport;                         \
+        __u8   bTriggerUsage;                           \
+        __u8   bControlSize;                            \
+        __u8   bmaControls[p][n];                       \
 } __attribute__ ((packed))
 
 /* 3.9.2.2. Output Header Descriptor */
 struct uvc_output_header_descriptor {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bNumFormats;
-        __u16 wTotalLength;
-        __u8  bEndpointAddress;
-        __u8  bTerminalLink;
-        __u8  bControlSize;
-        __u8  bmaControls[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bNumFormats;
+        __le16 wTotalLength;
+        __u8   bEndpointAddress;
+        __u8   bTerminalLink;
+        __u8   bControlSize;
+        __u8   bmaControls[];
 } __attribute__((__packed__));
 
 #define UVC_DT_OUTPUT_HEADER_SIZE(n, p)                 (9+(n*p))
@@ -410,15 +410,15 @@ struct uvc_output_header_descriptor {
 
 #define DECLARE_UVC_OUTPUT_HEADER_DESCRIPTOR(n, p)      \
 struct UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) {             \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bNumFormats;                              \
-        __u16 wTotalLength;                             \
-        __u8  bEndpointAddress;                         \
-        __u8  bTerminalLink;                            \
-        __u8  bControlSize;                             \
-        __u8  bmaControls[p][n];                        \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bNumFormats;                             \
+        __le16 wTotalLength;                            \
+        __u8   bEndpointAddress;                        \
+        __u8   bTerminalLink;                           \
+        __u8   bControlSize;                            \
+        __u8   bmaControls[p][n];                       \
 } __attribute__ ((packed))
 
 /* 3.9.2.6. Color matching descriptor */
@@ -473,19 +473,19 @@ struct uvc_format_uncompressed {
 
 /* Uncompressed Payload - 3.1.2. Uncompressed Video Frame Descriptor */
 struct uvc_frame_uncompressed {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bFrameIndex;
-        __u8  bmCapabilities;
-        __u16 wWidth;
-        __u16 wHeight;
-        __u32 dwMinBitRate;
-        __u32 dwMaxBitRate;
-        __u32 dwMaxVideoFrameBufferSize;
-        __u32 dwDefaultFrameInterval;
-        __u8  bFrameIntervalType;
-        __u32 dwFrameInterval[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bFrameIndex;
+        __u8   bmCapabilities;
+        __le16 wWidth;
+        __le16 wHeight;
+        __le32 dwMinBitRate;
+        __le32 dwMaxBitRate;
+        __le32 dwMaxVideoFrameBufferSize;
+        __le32 dwDefaultFrameInterval;
+        __u8   bFrameIntervalType;
+        __le32 dwFrameInterval[];
 } __attribute__((__packed__));
 
 #define UVC_DT_FRAME_UNCOMPRESSED_SIZE(n)               (26+4*(n))
@@ -495,19 +495,19 @@ struct uvc_frame_uncompressed {
 
 #define DECLARE_UVC_FRAME_UNCOMPRESSED(n)               \
 struct UVC_FRAME_UNCOMPRESSED(n) {                      \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bFrameIndex;                              \
-        __u8  bmCapabilities;                           \
-        __u16 wWidth;                                   \
-        __u16 wHeight;                                  \
-        __u32 dwMinBitRate;                             \
-        __u32 dwMaxBitRate;                             \
-        __u32 dwMaxVideoFrameBufferSize;                \
-        __u32 dwDefaultFrameInterval;                   \
-        __u8  bFrameIntervalType;                       \
-        __u32 dwFrameInterval[n];                       \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bFrameIndex;                             \
+        __u8   bmCapabilities;                          \
+        __le16 wWidth;                                  \
+        __le16 wHeight;                                 \
+        __le32 dwMinBitRate;                            \
+        __le32 dwMaxBitRate;                            \
+        __le32 dwMaxVideoFrameBufferSize;               \
+        __le32 dwDefaultFrameInterval;                  \
+        __u8   bFrameIntervalType;                      \
+        __le32 dwFrameInterval[n];                      \
 } __attribute__ ((packed))
 
 /* MJPEG Payload - 3.1.1. MJPEG Video Format Descriptor */
@@ -529,19 +529,19 @@ struct uvc_format_mjpeg {
 
 /* MJPEG Payload - 3.1.2. MJPEG Video Frame Descriptor */
 struct uvc_frame_mjpeg {
-        __u8  bLength;
-        __u8  bDescriptorType;
-        __u8  bDescriptorSubType;
-        __u8  bFrameIndex;
-        __u8  bmCapabilities;
-        __u16 wWidth;
-        __u16 wHeight;
-        __u32 dwMinBitRate;
-        __u32 dwMaxBitRate;
-        __u32 dwMaxVideoFrameBufferSize;
-        __u32 dwDefaultFrameInterval;
-        __u8  bFrameIntervalType;
-        __u32 dwFrameInterval[];
+        __u8   bLength;
+        __u8   bDescriptorType;
+        __u8   bDescriptorSubType;
+        __u8   bFrameIndex;
+        __u8   bmCapabilities;
+        __le16 wWidth;
+        __le16 wHeight;
+        __le32 dwMinBitRate;
+        __le32 dwMaxBitRate;
+        __le32 dwMaxVideoFrameBufferSize;
+        __le32 dwDefaultFrameInterval;
+        __u8   bFrameIntervalType;
+        __le32 dwFrameInterval[];
 } __attribute__((__packed__));
 
 #define UVC_DT_FRAME_MJPEG_SIZE(n)                      (26+4*(n))
@@ -551,19 +551,19 @@ struct uvc_frame_mjpeg {
 
 #define DECLARE_UVC_FRAME_MJPEG(n)                      \
 struct UVC_FRAME_MJPEG(n) {                             \
-        __u8  bLength;                                  \
-        __u8  bDescriptorType;                          \
-        __u8  bDescriptorSubType;                       \
-        __u8  bFrameIndex;                              \
-        __u8  bmCapabilities;                           \
-        __u16 wWidth;                                   \
-        __u16 wHeight;                                  \
-        __u32 dwMinBitRate;                             \
-        __u32 dwMaxBitRate;                             \
-        __u32 dwMaxVideoFrameBufferSize;                \
-        __u32 dwDefaultFrameInterval;                   \
-        __u8  bFrameIntervalType;                       \
-        __u32 dwFrameInterval[n];                       \
+        __u8   bLength;                                 \
+        __u8   bDescriptorType;                         \
+        __u8   bDescriptorSubType;                      \
+        __u8   bFrameIndex;                             \
+        __u8   bmCapabilities;                          \
+        __le16 wWidth;                                  \
+        __le16 wHeight;                                 \
+        __le32 dwMinBitRate;                            \
+        __le32 dwMaxBitRate;                            \
+        __le32 dwMaxVideoFrameBufferSize;               \
+        __le32 dwDefaultFrameInterval;                  \
+        __u8   bFrameIntervalType;                      \
+        __le32 dwFrameInterval[n];                      \
 } __attribute__ ((packed))
 
 #endif /* __LINUX_USB_VIDEO_H */