From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 10 Feb 2021 09:39:23 +0000 (+0100)
Subject: Merge tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~7747^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e94114a40f2c58637bf99d2fb8f25ddfe497ce2;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'phy-fixes2-5.11' of git://git./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
---

8e94114a40f2c58637bf99d2fb8f25ddfe497ce2
diff --cc drivers/phy/mediatek/phy-mtk-mipi-dsi.c
index eeb357bf,9c7815b..c51114d
--- a/drivers/phy/mediatek/phy-mtk-mipi-dsi.c
+++ b/drivers/phy/mediatek/phy-mtk-mipi-dsi.c
@@@ -233,8 -233,9 +233,9 @@@ static const struct of_device_id mtk_mi
  	  .data = &mt8183_mipitx_data },
  	{ },
  };
+ MODULE_DEVICE_TABLE(of, mtk_mipi_tx_match);
  
 -struct platform_driver mtk_mipi_tx_driver = {
 +static struct platform_driver mtk_mipi_tx_driver = {
  	.probe = mtk_mipi_tx_probe,
  	.remove = mtk_mipi_tx_remove,
  	.driver = {