Commit 4334f30e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small driver fixes for 5.7-rc5 that resolve a number of
  minor reported issues:

   - mhi bus driver fixes found as people actually use the code

   - phy driver fixes and compat string additions

   - most driver fix due to link order changing when the core moved out
     of staging

   - mei driver fix

   - interconnect build warning fix

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  bus: mhi: core: Fix channel device name conflict
  bus: mhi: core: Fix typo in comment
  bus: mhi: core: Offload register accesses to the controller
  bus: mhi: core: Remove link_status() callback
  bus: mhi: core: Make sure to powerdown if mhi_sync_power_up fails
  bus: mhi: Fix parsing of mhi_flags
  mei: me: disable mei interface on LBG servers.
  phy: qualcomm: usb-hs-28nm: Prepare clocks in init
  MAINTAINERS: Add Vinod Koul as Generic PHY co-maintainer
  interconnect: qcom: Move the static keyword to the front of declaration
  most: core: use function subsys_initcall()
  bus: mhi: core: Fix a NULL vs IS_ERR check in mhi_create_devices()
  phy: qcom-qusb2: Re add "qcom,sdm845-qusb2-phy" compat string
  phy: tegra: Select USB_COMMON for usb_get_maximum_speed()
parents c61529f6 f0e1d3ac

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7119,9 +7119,10 @@ F: include/uapi/asm-generic/ 














GENERIC PHY FRAMEWORK















M:	Kishon Vijay Abraham I <kishon@ti.com>













M:	Vinod Koul <vkoul@kernel.org>















L:	linux-kernel@vger.kernel.org















S:	Supported













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git















F:	Documentation/devicetree/bindings/phy/















F:	drivers/phy/















F:	include/linux/phy/

































drivers/bus/mhi/core/init.c



+3
−4






























Original line number
Diff line number
Diff line








@@ -812,10 +812,9 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,













	if (!mhi_cntrl)















		return -EINVAL;





























	if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put)













		return -EINVAL;



























	if (!mhi_cntrl->status_cb || !mhi_cntrl->link_status)













	if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||













	    !mhi_cntrl->status_cb || !mhi_cntrl->read_reg ||













	    !mhi_cntrl->write_reg)















		return -EINVAL;































	ret = parse_config(mhi_cntrl, config);

































drivers/bus/mhi/core/internal.h



+0
−3






























Original line number
Diff line number
Diff line








@@ -11,9 +11,6 @@





























extern struct bus_type mhi_bus_type;





























/* MHI MMIO register mapping */













#define PCI_INVALID_READ(val) (val == U32_MAX)





























#define MHIREGLEN (0x0)















#define MHIREGLEN_MHIREGLEN_MASK (0xFFFFFFFF)















#define MHIREGLEN_MHIREGLEN_SHIFT (0)

































drivers/bus/mhi/core/main.c



+5
−13






























Original line number
Diff line number
Diff line








@@ -18,16 +18,7 @@













int __must_check mhi_read_reg(struct mhi_controller *mhi_cntrl,















			      void __iomem *base, u32 offset, u32 *out)















{













	u32 tmp = readl(base + offset);



























	/* If there is any unexpected value, query the link status */













	if (PCI_INVALID_READ(tmp) &&













	    mhi_cntrl->link_status(mhi_cntrl))













		return -EIO;



























	*out = tmp;



























	return 0;













	return mhi_cntrl->read_reg(mhi_cntrl, base + offset, out);















}































int __must_check mhi_read_reg_field(struct mhi_controller *mhi_cntrl,









@@ -49,7 +40,7 @@ int __must_check mhi_read_reg_field(struct mhi_controller *mhi_cntrl,













void mhi_write_reg(struct mhi_controller *mhi_cntrl, void __iomem *base,















		   u32 offset, u32 val)















{













	writel(val, base + offset);













	mhi_cntrl->write_reg(mhi_cntrl, base + offset, val);















}































void mhi_write_reg_field(struct mhi_controller *mhi_cntrl, void __iomem *base,










@@ -294,7 +285,7 @@ void mhi_create_devices(struct mhi_controller *mhi_cntrl)













		    !(mhi_chan->ee_mask & BIT(mhi_cntrl->ee)))















			continue;















		mhi_dev = mhi_alloc_device(mhi_cntrl);













		if (!mhi_dev)













		if (IS_ERR(mhi_dev))















			return;































		mhi_dev->dev_type = MHI_DEVICE_XFER;










@@ -336,7 +327,8 @@ void mhi_create_devices(struct mhi_controller *mhi_cntrl)





























		/* Channel name is same for both UL and DL */















		mhi_dev->chan_name = mhi_chan->name;













		dev_set_name(&mhi_dev->dev, "%04x_%s", mhi_chan->chan,













		dev_set_name(&mhi_dev->dev, "%s_%s",













			     dev_name(mhi_cntrl->cntrl_dev),















			     mhi_dev->chan_name);































		/* Init wakeup source if available */

































drivers/bus/mhi/core/pm.c



+5
−1






























Original line number
Diff line number
Diff line








@@ -902,7 +902,11 @@ int mhi_sync_power_up(struct mhi_controller *mhi_cntrl)













			   MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state),















			   msecs_to_jiffies(mhi_cntrl->timeout_ms));





























	return (MHI_IN_MISSION_MODE(mhi_cntrl->ee)) ? 0 : -EIO;













	ret = (MHI_IN_MISSION_MODE(mhi_cntrl->ee)) ? 0 : -ETIMEDOUT;













	if (ret)













		mhi_power_down(mhi_cntrl, false);



























	return ret;















}















EXPORT_SYMBOL(mhi_sync_power_up);

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE