Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: bcm-ns-usb2: drop support for old binding variant

The old binding was incorrectly designed and ended up being deprecated 3
years ago. Finally it has been dropped so relevant code it not needed
anymore.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20240913044557.28315-2-zajec5@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Rafał Miłecki and committed by
Vinod Koul
0175a673 c3639d42

+15 -39
+15 -39
drivers/phy/broadcom/phy-bcm-ns-usb2.c
··· 24 24 struct phy *phy; 25 25 struct regmap *clkset; 26 26 void __iomem *base; 27 - 28 - /* Deprecated binding */ 29 - void __iomem *dmu; 30 27 }; 31 28 32 29 static int bcm_ns_usb2_phy_init(struct phy *phy) ··· 46 49 goto err_clk_off; 47 50 } 48 51 49 - if (usb2->base) 50 - usb2ctl = readl(usb2->base); 51 - else 52 - usb2ctl = readl(usb2->dmu + BCMA_DMU_CRU_USB2_CONTROL); 52 + usb2ctl = readl(usb2->base); 53 53 54 54 if (usb2ctl & BCMA_DMU_CRU_USB2_CONTROL_USB_PLL_PDIV_MASK) { 55 55 usb_pll_pdiv = usb2ctl; ··· 60 66 usb_pll_ndiv = (1920000000 * usb_pll_pdiv) / ref_clk_rate; 61 67 62 68 /* Unlock DMU PLL settings with some magic value */ 63 - if (usb2->clkset) 64 - regmap_write(usb2->clkset, 0, 0x0000ea68); 65 - else 66 - writel(0x0000ea68, usb2->dmu + BCMA_DMU_CRU_CLKSET_KEY); 69 + regmap_write(usb2->clkset, 0, 0x0000ea68); 67 70 68 71 /* Write USB 2.0 PLL control setting */ 69 72 usb2ctl &= ~BCMA_DMU_CRU_USB2_CONTROL_USB_PLL_NDIV_MASK; 70 73 usb2ctl |= usb_pll_ndiv << BCMA_DMU_CRU_USB2_CONTROL_USB_PLL_NDIV_SHIFT; 71 - if (usb2->base) 72 - writel(usb2ctl, usb2->base); 73 - else 74 - writel(usb2ctl, usb2->dmu + BCMA_DMU_CRU_USB2_CONTROL); 74 + 75 + writel(usb2ctl, usb2->base); 75 76 76 77 /* Lock DMU PLL settings */ 77 - if (usb2->clkset) 78 - regmap_write(usb2->clkset, 0, 0x00000000); 79 - else 80 - writel(0x00000000, usb2->dmu + BCMA_DMU_CRU_CLKSET_KEY); 78 + regmap_write(usb2->clkset, 0, 0x00000000); 81 79 82 80 err_clk_off: 83 81 clk_disable_unprepare(usb2->ref_clk); ··· 93 107 return -ENOMEM; 94 108 usb2->dev = dev; 95 109 96 - if (of_property_present(dev->of_node, "brcm,syscon-clkset")) { 97 - usb2->base = devm_platform_ioremap_resource(pdev, 0); 98 - if (IS_ERR(usb2->base)) { 99 - dev_err(dev, "Failed to map control reg\n"); 100 - return PTR_ERR(usb2->base); 101 - } 110 + usb2->base = devm_platform_ioremap_resource(pdev, 0); 111 + if (IS_ERR(usb2->base)) { 112 + dev_err(dev, "Failed to map control reg\n"); 113 + return PTR_ERR(usb2->base); 114 + } 102 115 103 - usb2->clkset = syscon_regmap_lookup_by_phandle(dev->of_node, 104 - "brcm,syscon-clkset"); 105 - if (IS_ERR(usb2->clkset)) { 106 - dev_err(dev, "Failed to lookup clkset regmap\n"); 107 - return PTR_ERR(usb2->clkset); 108 - } 109 - } else { 110 - usb2->dmu = devm_platform_ioremap_resource_byname(pdev, "dmu"); 111 - if (IS_ERR(usb2->dmu)) { 112 - dev_err(dev, "Failed to map DMU regs\n"); 113 - return PTR_ERR(usb2->dmu); 114 - } 115 - 116 - dev_warn(dev, "using deprecated DT binding\n"); 116 + usb2->clkset = syscon_regmap_lookup_by_phandle(dev->of_node, 117 + "brcm,syscon-clkset"); 118 + if (IS_ERR(usb2->clkset)) { 119 + dev_err(dev, "Failed to lookup clkset regmap\n"); 120 + return PTR_ERR(usb2->clkset); 117 121 } 118 122 119 123 usb2->ref_clk = devm_clk_get(dev, "phy-ref-clk");