Commit d3bc6269 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Vinod Koul
Browse files

phy: bcm-ns-usb2: support updated DT binding with PHY reg space 



Updated DT binding maps just a PHY's register space instead of the whole
DMU block. Accessing a common CRU reg is handled using syscon &
regmap.

The old binding has been deprecated and remains supported as a fallback
method.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20211026093716.5567-1-zajec5@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent fa55b7dc

drivers/phy/broadcom/phy-bcm-ns-usb2.c

+43 −9
Original line number Diff line number Diff line
@@ -9,17 +9,23 @@ 
#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/slab.h>



struct bcm_ns_usb2 {

	struct device *dev;

	struct clk *ref_clk;

	struct phy *phy;

	struct regmap *clkset;

	void __iomem *base;



	/* Deprecated binding */

	void __iomem *dmu;

};
@@ -27,7 +33,6 @@ static int bcm_ns_usb2_phy_init(struct phy *phy) 
{

	struct bcm_ns_usb2 *usb2 = phy_get_drvdata(phy);

	struct device *dev = usb2->dev;

	void __iomem *dmu = usb2->dmu;

	u32 ref_clk_rate, usb2ctl, usb_pll_ndiv, usb_pll_pdiv;

	int err = 0;
@@ -44,7 +49,10 @@ static int bcm_ns_usb2_phy_init(struct phy *phy) 
		goto err_clk_off;

	}



	usb2ctl = readl(dmu + BCMA_DMU_CRU_USB2_CONTROL);

	if (usb2->base)

		usb2ctl = readl(usb2->base);

	else

		usb2ctl = readl(usb2->dmu + BCMA_DMU_CRU_USB2_CONTROL);



	if (usb2ctl & BCMA_DMU_CRU_USB2_CONTROL_USB_PLL_PDIV_MASK) {

		usb_pll_pdiv = usb2ctl;
@@ -58,15 +66,24 @@ static int bcm_ns_usb2_phy_init(struct phy *phy) 
	usb_pll_ndiv = (1920000000 * usb_pll_pdiv) / ref_clk_rate;



	/* Unlock DMU PLL settings with some magic value */

	writel(0x0000ea68, dmu + BCMA_DMU_CRU_CLKSET_KEY);

	if (usb2->clkset)

		regmap_write(usb2->clkset, 0, 0x0000ea68);

	else

		writel(0x0000ea68, usb2->dmu + BCMA_DMU_CRU_CLKSET_KEY);



	/* Write USB 2.0 PLL control setting */

	usb2ctl &= ~BCMA_DMU_CRU_USB2_CONTROL_USB_PLL_NDIV_MASK;

	usb2ctl |= usb_pll_ndiv << BCMA_DMU_CRU_USB2_CONTROL_USB_PLL_NDIV_SHIFT;

	writel(usb2ctl, dmu + BCMA_DMU_CRU_USB2_CONTROL);

	if (usb2->base)

		writel(usb2ctl, usb2->base);

	else

		writel(usb2ctl, usb2->dmu + BCMA_DMU_CRU_USB2_CONTROL);



	/* Lock DMU PLL settings */

	writel(0x00000000, dmu + BCMA_DMU_CRU_CLKSET_KEY);

	if (usb2->clkset)

		regmap_write(usb2->clkset, 0, 0x00000000);

	else

		writel(0x00000000, usb2->dmu + BCMA_DMU_CRU_CLKSET_KEY);



err_clk_off:

	clk_disable_unprepare(usb2->ref_clk);
@@ -90,12 +107,29 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev) 
		return -ENOMEM;

	usb2->dev = dev;



	if (of_find_property(dev->of_node, "brcm,syscon-clkset", NULL)) {

		usb2->base = devm_platform_ioremap_resource(pdev, 0);

		if (IS_ERR(usb2->base)) {

			dev_err(dev, "Failed to map control reg\n");

			return PTR_ERR(usb2->base);

		}



		usb2->clkset = syscon_regmap_lookup_by_phandle(dev->of_node,

							       "brcm,syscon-clkset");

		if (IS_ERR(usb2->clkset)) {

			dev_err(dev, "Failed to lookup clkset regmap\n");

			return PTR_ERR(usb2->clkset);

		}

	} else {

		usb2->dmu = devm_platform_ioremap_resource_byname(pdev, "dmu");

		if (IS_ERR(usb2->dmu)) {

			dev_err(dev, "Failed to map DMU regs\n");

			return PTR_ERR(usb2->dmu);

		}



		dev_warn(dev, "using deprecated DT binding\n");

	}



	usb2->ref_clk = devm_clk_get(dev, "phy-ref-clk");

	if (IS_ERR(usb2->ref_clk)) {

		dev_err(dev, "Clock not defined\n");