diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-05-19 13:55:44 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-05-19 13:55:44 +0200 |
commit | 94ab7a49efd9a3ee787b13afd2cd66e017cb8456 (patch) | |
tree | a1f00b3c374351e2714aa130b0672ddfaad28ecd /drivers | |
parent | ac082938497f82c4cf1aa015436a4b8261741348 (diff) | |
parent | b156cfe186cc6456934ad771a914e35caefaeb60 (diff) | |
download | barebox-94ab7a49efd9a3ee787b13afd2cd66e017cb8456.tar.gz barebox-94ab7a49efd9a3ee787b13afd2cd66e017cb8456.tar.xz |
Merge branch 'for-next/stm32'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/phy/phy-stm32-usbphyc.c | 9 | ||||
-rw-r--r-- | drivers/usb/dwc2/dwc2.c | 51 |
2 files changed, 59 insertions, 1 deletions
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c index 4c1d7bfa48..2fa1f0fd01 100644 --- a/drivers/phy/phy-stm32-usbphyc.c +++ b/drivers/phy/phy-stm32-usbphyc.c @@ -423,10 +423,17 @@ static int stm32_usbphyc_probe(struct device_d *dev) for_each_child_of_node(np, child) { struct stm32_usbphyc_phy *usbphyc_phy; + struct device_d *phydev; struct phy *phy; u32 index; - phy = phy_create(dev, child, &stm32_usbphyc_phy_ops); + phydev = of_platform_device_create(child, dev); + if (!phydev) + continue; + + of_platform_device_dummy_drv(phydev); + + phy = phy_create(phydev, child, &stm32_usbphyc_phy_ops); if (IS_ERR(phy)) { ret = PTR_ERR(phy); if (ret != -EPROBE_DEFER) diff --git a/drivers/usb/dwc2/dwc2.c b/drivers/usb/dwc2/dwc2.c index 1b5981c2d5..8cb99446e4 100644 --- a/drivers/usb/dwc2/dwc2.c +++ b/drivers/usb/dwc2/dwc2.c @@ -13,9 +13,49 @@ #include <driver.h> #include <linux/clk.h> #include <linux/reset.h> +#include <of_device.h> #include "dwc2.h" +static void dwc2_set_stm32mp15_fsotg_params(struct dwc2 *dwc2) +{ + struct dwc2_core_params *p = &dwc2->params; + + p->otg_cap &= ~(DWC2_CAP_PARAM_HNP_SRP_CAPABLE + | DWC2_CAP_PARAM_SRP_ONLY_CAPABLE); + p->otg_cap |= DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; + p->speed = DWC2_SPEED_PARAM_FULL; + p->host_rx_fifo_size = 128; + p->host_nperio_tx_fifo_size = 96; + p->host_perio_tx_fifo_size = 96; + p->max_packet_count = 256; + p->phy_type = DWC2_PHY_TYPE_PARAM_FS; + p->i2c_enable = false; + p->activate_stm_fs_transceiver = true; + p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << GAHBCFG_HBSTLEN_SHIFT; + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; + p->host_support_fs_ls_low_power = true; + p->host_ls_low_power_phy_clk = true; +} + +static void dwc2_set_stm32mp15_hsotg_params(struct dwc2 *dwc2) +{ + struct dwc2_core_params *p = &dwc2->params; + + p->otg_cap &= ~(DWC2_CAP_PARAM_HNP_SRP_CAPABLE + | DWC2_CAP_PARAM_SRP_ONLY_CAPABLE); + p->otg_cap |= DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; + p->host_rx_fifo_size = 440; + p->host_nperio_tx_fifo_size = 256; + p->host_perio_tx_fifo_size = 256; + p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 << GAHBCFG_HBSTLEN_SHIFT; + p->power_down = DWC2_POWER_DOWN_PARAM_NONE; + p->lpm = false; + p->lpm_clock_gating = false; + p->besl = false; + p->hird_threshold_en = false; +} + static int dwc2_set_mode(void *ctx, enum usb_dr_mode mode) { struct dwc2 *dwc2 = ctx; @@ -43,10 +83,13 @@ static int dwc2_set_mode(void *ctx, enum usb_dr_mode mode) return ret; } +typedef void (*set_params_cb)(struct dwc2 *dwc2); + static int dwc2_probe(struct device_d *dev) { struct resource *iores; struct dwc2 *dwc2; + set_params_cb set_params; int ret; dwc2 = xzalloc(sizeof(*dwc2)); @@ -107,6 +150,10 @@ static int dwc2_probe(struct device_d *dev) dwc2_set_default_params(dwc2); + set_params = of_device_get_match_data(dev); + if (set_params) + set_params(dwc2); + dma_set_mask(dev, DMA_BIT_MASK(32)); dev->priv = dwc2; @@ -148,6 +195,10 @@ static const struct of_device_id dwc2_platform_dt_ids[] = { { .compatible = "brcm,bcm2835-usb", }, { .compatible = "brcm,bcm2708-usb", }, { .compatible = "snps,dwc2", }, + { .compatible = "st,stm32mp15-fsotg", + .data = dwc2_set_stm32mp15_fsotg_params }, + { .compatible = "st,stm32mp15-hsotg", + .data = dwc2_set_stm32mp15_hsotg_params }, { } }; |