Commit 8e94114a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-fixes2-5.11' of... 

Merge tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next

Vinod writes:

phy: second round of phy fixes for v5.11

 - rockchip: init return and vednor prefix to dt-property
 - cpcap: bool conversion fix
 - lantiq: clock enable fix
 - lgm: kconfig depends on x86
 - mediatek: add mising MODULE_DEVICE_TABLE()

* tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: mediatek: Add missing MODULE_DEVICE_TABLE()
  phy: phy-brcm-sata: remove unneeded semicolon
  phy: USB_LGM_PHY should depend on X86
  phy: lantiq: rcu-usb2: wait after clock enable
  phy: rockchip: emmc, add vendor prefix to dts properties
  devicetree: phy: rockchip-emmc optional add vendor prefix
  phy: cpcap-usb: remove unneeded conversion to bool
  phy: rockchip-emmc: emmc_phy_init() always return 0
parents db4e8de1 9a8b9434

Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt

+5 −5
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ Optional properties: 
 - drive-impedance-ohm: Specifies the drive impedance in Ohm.

                        Possible values are 33, 40, 50, 66 and 100.

                        If not set, the default value of 50 will be applied.

 - enable-strobe-pulldown: Enable internal pull-down for the strobe line.

                           If not set, pull-down is not used.

 - output-tapdelay-select: Specifies the phyctrl_otapdlysec register.

 - rockchip,enable-strobe-pulldown: Enable internal pull-down for the strobe

                                    line.  If not set, pull-down is not used.

 - rockchip,output-tapdelay-select: Specifies the phyctrl_otapdlysec register.

                                    If not set, the register defaults to 0x4.

                                    Maximum value 0xf.

drivers/phy/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ config PHY_XGENE 
config USB_LGM_PHY

	tristate "INTEL Lightning Mountain USB PHY Driver"

	depends on USB_SUPPORT

	depends on X86 || COMPILE_TEST

	select USB_PHY

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

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

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static int brcm_dsl_sata_init(struct brcm_sata_port *port) 
			break;

		msleep(20);

		try--;

	};

	}



	if (!try) {

		/* PLL did not lock; give up */

drivers/phy/lantiq/phy-lantiq-rcu-usb2.c

+9 −1
Original line number Diff line number Diff line
@@ -124,8 +124,16 @@ static int ltq_rcu_usb2_phy_power_on(struct phy *phy) 
	reset_control_deassert(priv->phy_reset);



	ret = clk_prepare_enable(priv->phy_gate_clk);

	if (ret)

	if (ret) {

		dev_err(dev, "failed to enable PHY gate\n");

		return ret;

	}



	/*

	 * at least the xrx200 usb2 phy requires some extra time to be

	 * operational after enabling the clock

	 */

	usleep_range(100, 200);



	return ret;

}

drivers/phy/mediatek/phy-mtk-hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ static const struct of_device_id mtk_hdmi_phy_match[] = { 
	},

	{},

};

MODULE_DEVICE_TABLE(of, mtk_hdmi_phy_match);



static struct platform_driver mtk_hdmi_phy_driver = {

	.probe = mtk_hdmi_phy_probe,