dmaengine: fsl-edma: Fix typo in Vybrid name
Subsystems (4)
PATCH 1/2 dmaengine: fsl-edma: Fix typo in Vybrid name
Fix typo in comment for Vybrid SoC family.
--- drivers/dma/fsl-edma-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/fsl-edma-common.h +1 -1
@@ -136,7 +136,7 @@ struct fsl_edma_desc { };enum edma_version { - v1,/* 32ch, Vybdir, mpc57x, etc */ + v1,/* 32ch, Vybrid, mpc57x, etc */ v2,/* 64ch Coldfire */ };
PATCH 1/1 usb: dwc2: gadget: Replace phyif with phy_utmi_width
From: Jules Maselbas <[email protected]>
The phy utmi width information is already set in hsotg params, phyif is only used in few places and I don't see any reason to not use hsotg's params.
Moreover the utmi width was being forced to 16 bits by platform initialization which doesn't take in account HW configuration.
--- drivers/usb/dwc2/core.h | 2 -- drivers/usb/dwc2/gadget.c | 20 ++++++++++++++------ drivers/usb/dwc2/platform.c | 5 +---- 3 files changed, 15 insertions(+), 12 deletions(-)
drivers/usb/dwc2/core.h +0 -2
@@ -871,7 +871,6 @@ struct dwc2_hregs_backup {* removed once all SoCs support usb transceiver. * @supplies: Definition of USB power supplies * @vbus_supply: Regulator supplying vbus. -* @phyif: PHY interface width * @lock: Spinlock that protects all the driver data structures * @priv: Stores a pointer to the struct usb_hcd * @queuing_high_bandwidth: True if multiple packets of a high-bandwidth
@@ -1056,7 +1055,6 @@ struct dwc2_hsotg {struct dwc2_hsotg_plat *plat;struct regulator_bulk_data supplies[DWC2_NUM_SUPPLIES ];struct regulator *vbus_supply; -u32 phyif;spinlock_t lock;void *priv;
drivers/usb/dwc2/gadget.c +14 -6
@@ -3314,20 +3314,28 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,/* keep other bits untouched (so e.g. forced modes are not lost) */ usbcfg =dwc2_readl (hsotg,GUSBCFG ); +/* remove the HNP/SRP */ usbcfg &= ~(GUSBCFG_TOUTCAL_MASK |GUSBCFG_PHYIF16 |GUSBCFG_SRPCAP | -GUSBCFG_HNPCAP |GUSBCFG_USBTRDTIM_MASK ); +GUSBCFG_HNPCAP ); + usbcfg |=GUSBCFG_TOUTCAL (7 );if (hsotg->params.phy_type ==DWC2_PHY_TYPE_PARAM_FS && (hsotg->params.speed ==DWC2_SPEED_PARAM_FULL || hsotg->params.speed ==DWC2_SPEED_PARAM_LOW )) {/* FS/LS Dedicated Transceiver Interface */ usbcfg |=GUSBCFG_PHYSEL ; - }else { -/* set the PLL on, remove the HNP/SRP and set the PHY */ - val = (hsotg->phyif ==GUSBCFG_PHYIF8 ) ?9 :5 ; - usbcfg |= hsotg->phyif |GUSBCFG_TOUTCAL (7 ) | - (val <<GUSBCFG_USBTRDTIM_SHIFT ); + }else if (hsotg->params.phy_type ==DWC2_PHY_TYPE_PARAM_UTMI ) { +if (hsotg->params.phy_utmi_width ==16 ) + usbcfg |=GUSBCFG_PHYIF16 ; + +/* Set turnaround time */ + usbcfg &= ~GUSBCFG_USBTRDTIM_MASK ; +if (hsotg->params.phy_utmi_width ==16 ) + usbcfg |=5 <<GUSBCFG_USBTRDTIM_SHIFT ; +else + usbcfg |=9 <<GUSBCFG_USBTRDTIM_SHIFT ; } +dwc2_writel (hsotg, usbcfg,GUSBCFG );dwc2_hsotg_init_fifo (hsotg);
drivers/usb/dwc2/platform.c +1 -4
@@ -230,9 +230,6 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)reset_control_deassert (hsotg->reset_ecc); -/* Set default UTMI width */ - hsotg->phyif =GUSBCFG_PHYIF16 ; -/* * Attempt to find a generic PHY, then look for an old style * USB PHY and then fall back to pdata
@@ -280,7 +277,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)* width is 8-bit and set the phyif appropriately. */ if (phy_get_bus_width (hsotg->phy) ==8 ) - hsotg->phyif =GUSBCFG_PHYIF8 ; + hsotg->params.phy_utmi_width =8 ; }/* Clock */
PATCH 2/2 dmaengine: fsl-edma: Adjust indentation
In reply to Krzysztof KozlowskiFix indentation and remove unneeded space after 'return' keyword. This fixes checkpatch warning:
WARNING: Statements should start on a tabstop
--- drivers/dma/fsl-edma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/fsl-edma.c +3 -3
@@ -144,21 +144,21 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma fsl_edma_irq_handler, 0, "eDMA", fsl_edma);if (ret) {dev_err (&pdev->dev,"Can't register eDMA IRQ.\n" ); -return ret; +return ret; } }else { ret =devm_request_irq (&pdev->dev, fsl_edma->txirq, fsl_edma_tx_handler,0 ,"eDMA tx" , fsl_edma);if (ret) {dev_err (&pdev->dev,"Can't register eDMA tx IRQ.\n" ); -return ret; +return ret; } ret =devm_request_irq (&pdev->dev, fsl_edma->errirq, fsl_edma_err_handler,0 ,"eDMA err" , fsl_edma);if (ret) {dev_err (&pdev->dev,"Can't register eDMA err IRQ.\n" ); -return ret; +return ret; } }
Quoted 1 line · Krzysztof Kozlowski
Fix typo in comment for Vybrid SoC family.
Applied both in the series and ignore the (3rd?) usb patch! thanks