usb: dwc2: params revert and rework
Subsystems (3)
cover usb: dwc2: params revert and rework
Hi Felipe,
This reverts and fixes a few commits that are queued on your testing/next, removing the previously added DT bindings, and the code that reads them in.
The feedback was that IP validation is not reason enough to add these. So we'll leave them out for now.
Regards,
John
John Youn (3):
Revert "usb: dwc2: Add bindings to disable gadget DMA modes" Revert "Documentation: devicetree: dwc2: Add host DMA binding"
usb: dwc2: Remove reading in of invalid property
Documentation/devicetree/bindings/usb/dwc2.txt | 3 --- drivers/usb/dwc2/params.c | 16 +++------------- 2 files changed, 3 insertions(+), 16 deletions(-)
Signature · 6 lines
2.10.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): cover.1479176826.git.johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]
PATCH 1/3 Revert "usb: dwc2: Add bindings to disable gadget DMA modes"
This reverts commit 9acc1ee2b723 ("usb: dwc2: Add bindings to disable gadget DMA modes").
Don't add bindings and don't read them in. These are not yet needed by any hardware.
--- Documentation/devicetree/bindings/usb/dwc2.txt | 2 -- drivers/usb/dwc2/params.c | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -2
@@ -26,8 +26,6 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties - dr_mode: shall be one of "host", "peripheral" and "otg" Refer to usb/generic.txt - snps,host-dma-disable: disable host DMA mode. -- snps,gadget-dma-disable: disable gadget DMA mode. -- snps,gadget-dma-desc-disable: disable gadget DMA descriptor mode. - g-rx-fifo-size: size of rx fifo size in gadget mode. - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode. - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
drivers/usb/dwc2/params.c +2 -7
@@ -1091,22 +1091,17 @@ static void dwc2_set_gadget_dma(struct dwc2_hsotg *hsotg)struct dwc2_hw_params *hw = &hsotg->hw_params;struct dwc2_core_params *p = &hsotg->params;bool dma_capable = !(hw->arch ==GHWCFG2_SLAVE_ONLY_ARCH ); -bool disable;/* Buffer DMA */ - disable =device_property_read_bool (hsotg->dev, -"snps,gadget-dma-disable" );dwc2_set_param_bool (hsotg, &p->g_dma, false,"gadget-dma" , - !disable, false, + true, false, dma_capable);/* DMA Descriptor */ - disable =device_property_read_bool (hsotg->dev, -"snps,gadget-dma-desc-disable" );dwc2_set_param_bool (hsotg, &p->g_dma_desc, false,"gadget-dma-desc" , - p->g_dma && !disable, false, + p->g_dma, false, !!hw->dma_desc_enable); }
Signature · 6 lines
2.10.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/3 Revert "usb: dwc2: Add bindings to disable gadget DMA modes"
In reply to a message not in the archiveThis reverts commit 9acc1ee2b723 ("usb: dwc2: Add bindings to disable gadget DMA modes").
Don't add bindings and don't read them in. These are not yet needed by any hardware.
--- Documentation/devicetree/bindings/usb/dwc2.txt | 2 -- drivers/usb/dwc2/params.c | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -2
@@ -26,8 +26,6 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties - dr_mode: shall be one of "host", "peripheral" and "otg" Refer to usb/generic.txt - snps,host-dma-disable: disable host DMA mode. -- snps,gadget-dma-disable: disable gadget DMA mode. -- snps,gadget-dma-desc-disable: disable gadget DMA descriptor mode. - g-rx-fifo-size: size of rx fifo size in gadget mode. - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode. - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
drivers/usb/dwc2/params.c +2 -7
@@ -1091,22 +1091,17 @@ static void dwc2_set_gadget_dma(struct dwc2_hsotg *hsotg)struct dwc2_hw_params *hw = &hsotg->hw_params;struct dwc2_core_params *p = &hsotg->params;bool dma_capable = !(hw->arch ==GHWCFG2_SLAVE_ONLY_ARCH ); -bool disable;/* Buffer DMA */ - disable =device_property_read_bool (hsotg->dev, -"snps,gadget-dma-disable" );dwc2_set_param_bool (hsotg, &p->g_dma, false,"gadget-dma" , - !disable, false, + true, false, dma_capable);/* DMA Descriptor */ - disable =device_property_read_bool (hsotg->dev, -"snps,gadget-dma-desc-disable" );dwc2_set_param_bool (hsotg, &p->g_dma_desc, false,"gadget-dma-desc" , - p->g_dma && !disable, false, + p->g_dma, false, !!hw->dma_desc_enable); }
Signature · 6 lines
2.10.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/3 Revert "Documentation: devicetree: dwc2: Add host DMA binding"
In reply to a message not in the archiveThis reverts commit 751089ecaab0 ("Documentation: devicetree: dwc2: Add host DMA binding").
Remove this binding as it is not needed by any hardware.
--- Documentation/devicetree/bindings/usb/dwc2.txt | 1 - 1 file changed, 1 deletion(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -1
@@ -25,7 +25,6 @@ Optional properties: Refer to phy/phy-bindings.txt for generic phy consumer properties - dr_mode: shall be one of "host", "peripheral" and "otg" Refer to usb/generic.txt -- snps,host-dma-disable: disable host DMA mode. - g-rx-fifo-size: size of rx fifo size in gadget mode. - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode. - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
Signature · 6 lines
2.10.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Quoted 8 lines · John Youn
Hi Felipe,
This reverts and fixes a few commits that are queued on your testing/next, removing the previously added DT bindings, and the code that reads them in.
The feedback was that IP validation is not reason enough to add these. So we'll leave them out for now.
these are still in testing/next, so I can actually still drop them. I'm applying only patch 3/3, please make sure it all looks good on testing/next.
Signature · 1 line
balbi
A message that is not in the archive (sent off-list or not yet received): 87polxugfo.fsf-VuQAYsv1563Yd54FQh9/[email protected]
Quoted 10 lines · Felipe Balbi
Hi,
Quoted 6 lines · John Youn
Hi Felipe,
This reverts and fixes a few commits that are queued on your testing/next, removing the previously added DT bindings, and the code that reads them in.
Quoted 7 lines
Quoted 2 lines
The feedback was that IP validation is not reason enough to add these. So we'll leave them out for now.
these are still in testing/next, so I can actually still drop them. I'm applying only patch 3/3, please make sure it all looks good on testing/next.
Ok thanks. There were merge issues when I did that locally so I figured I'd give you the reverts.
Checked and looks good.
Regards,
John
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html