Commit 8d7ed104 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver fixes from Greg KH:
 "Here are a bunch of small char/misc and other driver subsystem fixes.

  Included in here are:

   - iio driver fixes for reported problems

   - phy driver fixes for a number of reported problems

   - mhi resume bugfix for broken hardware

   - nvmem driver fix

   - rtsx driver fix for irq issues

   - fastrpc packet parsing fix

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

* tag 'char-misc-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (33 commits)
  bus: mhi: core: Add support for forced PM resume
  iio: trigger: stm32-timer: fix MODULE_ALIAS
  misc: rtsx: Avoid mangling IRQ during runtime PM
  nvmem: eeprom: at25: fix FRAM byte_len
  misc: fastrpc: fix improper packet size calculation
  MAINTAINERS: add maintainer for Qualcomm FastRPC driver
  bus: mhi: pci_generic: Fix device recovery failed issue
  iio: adc: stm32: fix null pointer on defer_probe error
  phy: HiSilicon: Fix copy and paste bug in error handling
  dt-bindings: phy: zynqmp-psgtr: fix USB phy name
  phy: ti: omap-usb2: Fix the kernel-doc style
  phy: qualcomm: ipq806x-usb: Fix kernel-doc style
  iio: at91-sama5d2: Fix incorrect sign extension
  iio: adc: axp20x_adc: fix charging current reporting on AXP22x
  iio: gyro: adxrs290: fix data signedness
  phy: ti: tusb1210: Fix the kernel-doc warn
  phy: qualcomm: usb-hsic: Fix the kernel-doc warn
  phy: qualcomm: qmp: Add missing struct documentation
  phy: mvebu-cp110-utmi: Fix kernel-doc warns
  iio: ad7768-1: Call iio_trigger_notify_done() on error
  ...
parents c7fc5126 cab2d3fd

Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ properties: 
          - PHY_TYPE_PCIE

          - PHY_TYPE_SATA

          - PHY_TYPE_SGMII

          - PHY_TYPE_USB

          - PHY_TYPE_USB3

      - description: The PHY instance

        minimum: 0

        maximum: 1 # for DP, SATA or USB

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -15770,6 +15770,15 @@ S: Maintained 
F:	Documentation/devicetree/bindings/net/qcom,ethqos.txt

F:	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c









QUALCOMM FASTRPC DRIVER









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Amol Maheshwari <amahesh@qti.qualcomm.com>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/misc/qcom,fastrpc.txt









F:	drivers/misc/fastrpc.c









F:	include/uapi/misc/fastrpc.h

















QUALCOMM GENERIC INTERFACE I2C DRIVER









M:	Akash Asthana <akashast@codeaurora.org>









M:	Mukesh Savaliya <msavaliy@codeaurora.org>
































drivers/bus/mhi/core/pm.c



+18
−3






























Original line number
Diff line number
Diff line







@@ -881,7 +881,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl)







}









EXPORT_SYMBOL_GPL(mhi_pm_suspend);



















int mhi_pm_resume(struct mhi_controller *mhi_cntrl)









static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force)









{









	struct mhi_chan *itr, *tmp;









	struct device *dev = &mhi_cntrl->mhi_dev->dev;








@@ -898,8 +898,12 @@ int mhi_pm_resume(struct mhi_controller *mhi_cntrl)







	if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state))









		return -EIO;



















	if (mhi_get_mhi_state(mhi_cntrl) != MHI_STATE_M3)









	if (mhi_get_mhi_state(mhi_cntrl) != MHI_STATE_M3) {









		dev_warn(dev, "Resuming from non M3 state (%s)\n",









			 TO_MHI_STATE_STR(mhi_get_mhi_state(mhi_cntrl)));









		if (!force)









			return -EINVAL;









	}



















	/* Notify clients about exiting LPM */









	list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) {








@@ -940,8 +944,19 @@ int mhi_pm_resume(struct mhi_controller *mhi_cntrl)

















	return 0;









}



















int mhi_pm_resume(struct mhi_controller *mhi_cntrl)









{









	return __mhi_pm_resume(mhi_cntrl, false);









}









EXPORT_SYMBOL_GPL(mhi_pm_resume);



















int mhi_pm_resume_force(struct mhi_controller *mhi_cntrl)









{









	return __mhi_pm_resume(mhi_cntrl, true);









}









EXPORT_SYMBOL_GPL(mhi_pm_resume_force);



















int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl)









{









	int ret;
































drivers/bus/mhi/pci_generic.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -20,7 +20,7 @@

















#define MHI_PCI_DEFAULT_BAR_NUM 0



















#define MHI_POST_RESET_DELAY_MS 500









#define MHI_POST_RESET_DELAY_MS 2000



















#define HEALTH_CHECK_PERIOD (HZ * 2)










































drivers/iio/accel/kxcjk-1013.c



+2
−3






























Original line number
Diff line number
Diff line







@@ -1595,7 +1595,6 @@ static int kxcjk1013_probe(struct i2c_client *client,







	return 0;



















err_buffer_cleanup:









	if (data->dready_trig)









	iio_triggered_buffer_cleanup(indio_dev);









err_trigger_unregister:









	if (data->dready_trig)








@@ -1618,8 +1617,8 @@ static int kxcjk1013_remove(struct i2c_client *client)







	pm_runtime_disable(&client->dev);









	pm_runtime_set_suspended(&client->dev);



















	if (data->dready_trig) {









	iio_triggered_buffer_cleanup(indio_dev);









	if (data->dready_trig) {









		iio_trigger_unregister(data->dready_trig);









		iio_trigger_unregister(data->motion_trig);









	}