Commit 1e805d19 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge tag 'phy-fixes-5.17' into next 

Merge phy fixes for 5.17 into next branch to resolve the conflict
between fixes and next for upcoming patches
parents 1f1b0c10 9a8406ba

drivers/gpu/drm/bridge/nwl-dsi.c

+5 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/bitfield.h>

#include <linux/bits.h>

#include <linux/clk.h>

#include <linux/irq.h>

#include <linux/math64.h>
@@ -196,12 +197,9 @@ static u32 ps2bc(struct nwl_dsi *dsi, unsigned long long ps) 
/*

 * ui2bc - UI time periods to byte clock cycles

 */

static u32 ui2bc(struct nwl_dsi *dsi, unsigned long long ui)

static u32 ui2bc(unsigned int ui)

{

	u32 bpp = mipi_dsi_pixel_format_to_bpp(dsi->format);



	return DIV64_U64_ROUND_UP(ui * dsi->lanes,

				  dsi->mode.clock * 1000 * bpp);

	return DIV_ROUND_UP(ui, BITS_PER_BYTE);

}



/*
@@ -232,12 +230,12 @@ static int nwl_dsi_config_host(struct nwl_dsi *dsi) 
	}



	/* values in byte clock cycles */

	cycles = ui2bc(dsi, cfg->clk_pre);

	cycles = ui2bc(cfg->clk_pre);

	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_t_pre: 0x%x\n", cycles);

	nwl_dsi_write(dsi, NWL_DSI_CFG_T_PRE, cycles);

	cycles = ps2bc(dsi, cfg->lpx + cfg->clk_prepare + cfg->clk_zero);

	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_tx_gap (pre): 0x%x\n", cycles);

	cycles += ui2bc(dsi, cfg->clk_pre);

	cycles += ui2bc(cfg->clk_pre);

	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_t_post: 0x%x\n", cycles);

	nwl_dsi_write(dsi, NWL_DSI_CFG_T_POST, cycles);

	cycles = ps2bc(dsi, cfg->hs_exit);

drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/bitfield.h>

#include <linux/bitops.h>

#include <linux/bits.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/io.h>
@@ -250,7 +251,7 @@ static int phy_meson_axg_mipi_dphy_power_on(struct phy *phy) 
		     (DIV_ROUND_UP(priv->config.clk_zero, temp) << 16) |

		     (DIV_ROUND_UP(priv->config.clk_prepare, temp) << 24));

	regmap_write(priv->regmap, MIPI_DSI_CLK_TIM1,

		     DIV_ROUND_UP(priv->config.clk_pre, temp));

		     DIV_ROUND_UP(priv->config.clk_pre, BITS_PER_BYTE));



	regmap_write(priv->regmap, MIPI_DSI_HS_TIM,

		     DIV_ROUND_UP(priv->config.hs_exit, temp) |

drivers/phy/broadcom/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ config PHY_BRCM_USB 
	depends on OF

	select GENERIC_PHY

	select SOC_BRCMSTB if ARCH_BRCMSTB

	default ARCH_BCM4908

	default ARCH_BRCMSTB

	default ARCH_BCM4908 || ARCH_BRCMSTB

	help

	  Enable this to support the Broadcom STB USB PHY.

	  This driver is required by the USB XHCI, EHCI and OHCI

drivers/phy/broadcom/phy-brcm-usb.c

+38 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/soc/brcmstb/brcmstb.h>

#include <dt-bindings/phy/phy.h>

#include <linux/mfd/syscon.h>

#include <linux/suspend.h>



#include "phy-brcm-usb-init.h"
@@ -70,12 +71,35 @@ struct brcm_usb_phy_data { 
	int			init_count;

	int			wake_irq;

	struct brcm_usb_phy	phys[BRCM_USB_PHY_ID_MAX];

	struct notifier_block	pm_notifier;

	bool			pm_active;

};



static s8 *node_reg_names[BRCM_REGS_MAX] = {

	"crtl", "xhci_ec", "xhci_gbl", "usb_phy", "usb_mdio", "bdc_ec"

};



static int brcm_pm_notifier(struct notifier_block *notifier,

			    unsigned long pm_event,

			    void *unused)

{

	struct brcm_usb_phy_data *priv =

		container_of(notifier, struct brcm_usb_phy_data, pm_notifier);



	switch (pm_event) {

	case PM_HIBERNATION_PREPARE:

	case PM_SUSPEND_PREPARE:

		priv->pm_active = true;

		break;

	case PM_POST_RESTORE:

	case PM_POST_HIBERNATION:

	case PM_POST_SUSPEND:

		priv->pm_active = false;

		break;

	}

	return NOTIFY_DONE;

}



static irqreturn_t brcm_usb_phy_wake_isr(int irq, void *dev_id)

{

	struct phy *gphy = dev_id;
@@ -91,6 +115,9 @@ static int brcm_usb_phy_init(struct phy *gphy) 
	struct brcm_usb_phy_data *priv =

		container_of(phy, struct brcm_usb_phy_data, phys[phy->id]);



	if (priv->pm_active)

		return 0;



	/*

	 * Use a lock to make sure a second caller waits until

	 * the base phy is inited before using it.
@@ -120,6 +147,9 @@ static int brcm_usb_phy_exit(struct phy *gphy) 
	struct brcm_usb_phy_data *priv =

		container_of(phy, struct brcm_usb_phy_data, phys[phy->id]);



	if (priv->pm_active)

		return 0;



	dev_dbg(&gphy->dev, "EXIT\n");

	if (phy->id == BRCM_USB_PHY_2_0)

		brcm_usb_uninit_eohci(&priv->ini);
@@ -488,6 +518,9 @@ static int brcm_usb_phy_probe(struct platform_device *pdev) 
	if (err)

		return err;



	priv->pm_notifier.notifier_call = brcm_pm_notifier;

	register_pm_notifier(&priv->pm_notifier);



	mutex_init(&priv->mutex);



	/* make sure invert settings are correct */
@@ -528,7 +561,10 @@ static int brcm_usb_phy_probe(struct platform_device *pdev) 


static int brcm_usb_phy_remove(struct platform_device *pdev)

{

	struct brcm_usb_phy_data *priv = dev_get_drvdata(&pdev->dev);



	sysfs_remove_group(&pdev->dev.kobj, &brcm_usb_phy_group);

	unregister_pm_notifier(&priv->pm_notifier);



	return 0;

}
@@ -539,6 +575,7 @@ static int brcm_usb_phy_suspend(struct device *dev) 
	struct brcm_usb_phy_data *priv = dev_get_drvdata(dev);



	if (priv->init_count) {

		dev_dbg(dev, "SUSPEND\n");

		priv->ini.wake_enabled = device_may_wakeup(dev);

		if (priv->phys[BRCM_USB_PHY_3_0].inited)

			brcm_usb_uninit_xhci(&priv->ini);
@@ -578,6 +615,7 @@ static int brcm_usb_phy_resume(struct device *dev) 
	 * Uninitialize anything that wasn't previously initialized.

	 */

	if (priv->init_count) {

		dev_dbg(dev, "RESUME\n");

		if (priv->wake_irq >= 0)

			disable_irq_wake(priv->wake_irq);

		brcm_usb_init_common(&priv->ini);

drivers/phy/cadence/phy-cadence-sierra.c

+21 −14
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	const struct cdns_sierra_data *data;

	unsigned int id_value;

	int i, ret, node = 0;

	int ret, node = 0;

	void __iomem *base;

	struct device_node *dn = dev->of_node, *child;
@@ -1416,7 +1416,8 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev) 
			dev_err(dev, "failed to get reset %s\n",

				child->full_name);

			ret = PTR_ERR(sp->phys[node].lnk_rst);

			goto put_child2;

			of_node_put(child);

			goto put_control;

		}



		if (!sp->autoconf) {
@@ -1424,7 +1425,9 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev) 
			if (ret) {

				dev_err(dev, "missing property in node %s\n",

					child->name);

				goto put_child;

				of_node_put(child);

				reset_control_put(sp->phys[node].lnk_rst);

				goto put_control;

			}

		}
@@ -1434,7 +1437,9 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev) 


		if (IS_ERR(gphy)) {

			ret = PTR_ERR(gphy);

			goto put_child;

			of_node_put(child);

			reset_control_put(sp->phys[node].lnk_rst);

			goto put_control;

		}

		sp->phys[node].phy = gphy;

		phy_set_drvdata(gphy, &sp->phys[node]);
@@ -1446,26 +1451,28 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev) 
	if (sp->num_lanes > SIERRA_MAX_LANES) {

		ret = -EINVAL;

		dev_err(dev, "Invalid lane configuration\n");

		goto put_child2;

		goto put_control;

	}



	/* If more than one subnode, configure the PHY as multilink */

	if (!sp->autoconf && sp->nsubnodes > 1) {

		ret = cdns_sierra_phy_configure_multilink(sp);

		if (ret)

			goto put_child2;

			goto put_control;

	}



	pm_runtime_enable(dev);

	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);

	return PTR_ERR_OR_ZERO(phy_provider);

	if (IS_ERR(phy_provider)) {

		ret = PTR_ERR(phy_provider);

		goto put_control;

	}



put_child:

	node++;

put_child2:

	for (i = 0; i < node; i++)

		reset_control_put(sp->phys[i].lnk_rst);

	of_node_put(child);

	return 0;



put_control:

	while (--node >= 0)

		reset_control_put(sp->phys[node].lnk_rst);

clk_disable:

	cdns_sierra_phy_disable_clocks(sp);

	reset_control_assert(sp->apb_rst);