* [PATCH 1/3] Revert "usb: dwc2: Add bindings to disable gadget DMA modes"
[not found] ` <cover.1479176826.git.johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
@ 2016-11-15 2:29 ` John Youn
2016-11-15 2:29 ` John Youn
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: John Youn @ 2016-11-15 2:29 UTC (permalink / raw)
To: John Youn, Felipe Balbi, linux-usb-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Mark Rutland
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.
Signed-off-by: John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
---
Documentation/devicetree/bindings/usb/dwc2.txt | 2 --
drivers/usb/dwc2/params.c | 9 ++-------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 10a2a4b..389bb13 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -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.
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index 64d5c66..2f18a7b 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -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);
}
--
2.10.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/3] Revert "usb: dwc2: Add bindings to disable gadget DMA modes"
[not found] ` <cover.1479176826.git.johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
2016-11-15 2:29 ` [PATCH 1/3] Revert "usb: dwc2: Add bindings to disable gadget DMA modes" John Youn
@ 2016-11-15 2:29 ` John Youn
2016-11-15 2:29 ` [PATCH 2/3] Revert "Documentation: devicetree: dwc2: Add host DMA binding" John Youn
2016-11-15 11:32 ` [PATCH 0/3] usb: dwc2: params revert and rework Felipe Balbi
3 siblings, 0 replies; 6+ messages in thread
From: John Youn @ 2016-11-15 2:29 UTC (permalink / raw)
To: John Youn, Felipe Balbi, linux-usb-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Mark Rutland
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.
Signed-off-by: John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
---
Documentation/devicetree/bindings/usb/dwc2.txt | 2 --
drivers/usb/dwc2/params.c | 9 ++-------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 10a2a4b..389bb13 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -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.
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index 64d5c66..2f18a7b 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -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);
}
--
2.10.0
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] Revert "Documentation: devicetree: dwc2: Add host DMA binding"
[not found] ` <cover.1479176826.git.johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
2016-11-15 2:29 ` [PATCH 1/3] Revert "usb: dwc2: Add bindings to disable gadget DMA modes" John Youn
2016-11-15 2:29 ` John Youn
@ 2016-11-15 2:29 ` John Youn
2016-11-15 11:32 ` [PATCH 0/3] usb: dwc2: params revert and rework Felipe Balbi
3 siblings, 0 replies; 6+ messages in thread
From: John Youn @ 2016-11-15 2:29 UTC (permalink / raw)
To: John Youn, Felipe Balbi, linux-usb-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Mark Rutland
This reverts commit 751089ecaab0 ("Documentation: devicetree: dwc2: Add
host DMA binding").
Remove this binding as it is not needed by any hardware.
Signed-off-by: John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
---
Documentation/devicetree/bindings/usb/dwc2.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 389bb13..ad8f7ff 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -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.
--
2.10.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] usb: dwc2: params revert and rework
[not found] ` <cover.1479176826.git.johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
` (2 preceding siblings ...)
2016-11-15 2:29 ` [PATCH 2/3] Revert "Documentation: devicetree: dwc2: Add host DMA binding" John Youn
@ 2016-11-15 11:32 ` Felipe Balbi
[not found] ` <87polxugfo.fsf-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
3 siblings, 1 reply; 6+ messages in thread
From: Felipe Balbi @ 2016-11-15 11:32 UTC (permalink / raw)
To: John Youn
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi,
John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org> writes:
> 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.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread