Commit 0ec7f1ae authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-fixes-5.16' of... 

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

Vinod writes:

phy: fixes for 5.16

Fixes for:
 - kernel-doc warnings for various drivers
 - error handling fix for HiSilicon driver
 - name fix for zynqmp phy
 - property name fix in stm32 phy

* tag 'phy-fixes-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  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
  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
  phy: ti: report 2 non-kernel-doc comments
  phy: stm32: fix st,slow-hs-slew-rate with st,decrease-hs-slew-rate
parents d58071a8 f0ae8685

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

drivers/phy/hisilicon/phy-hi3670-pcie.c

+2 −2
Original line number Diff line number Diff line
@@ -757,8 +757,8 @@ static int hi3670_pcie_phy_get_resources(struct hi3670_pcie_phy *phy, 
		return PTR_ERR(phy->sysctrl);



	phy->pmctrl = syscon_regmap_lookup_by_compatible("hisilicon,hi3670-pmctrl");

	if (IS_ERR(phy->sysctrl))

		return PTR_ERR(phy->sysctrl);

	if (IS_ERR(phy->pmctrl))

		return PTR_ERR(phy->pmctrl);



	/* clocks */

	phy->phy_ref_clk = devm_clk_get(dev, "phy_ref");

drivers/phy/marvell/phy-mvebu-cp110-utmi.c

+2 −2
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ 
 * struct mvebu_cp110_utmi - PHY driver data

 *

 * @regs: PHY registers

 * @syscom: Regmap with system controller registers

 * @syscon: Regmap with system controller registers

 * @dev: device driver handle

 * @caps: PHY capabilities

 * @ops: phy ops

 */

struct mvebu_cp110_utmi {

	void __iomem *regs;

drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c

+14 −12
Original line number Diff line number Diff line
@@ -127,12 +127,13 @@ struct phy_drvdata { 
};



/**

 * Write register and read back masked value to confirm it is written

 * usb_phy_write_readback() - Write register and read back masked value to

 * confirm it is written

 *

 * @base - QCOM DWC3 PHY base virtual address.

 * @offset - register offset.

 * @mask - register bitmask specifying what should be updated

 * @val - value to write.

 * @phy_dwc3: QCOM DWC3 phy context

 * @offset: register offset.

 * @mask: register bitmask specifying what should be updated

 * @val: value to write.

 */

static inline void usb_phy_write_readback(struct usb_phy *phy_dwc3,

					  u32 offset,
@@ -171,11 +172,11 @@ static int wait_for_latch(void __iomem *addr) 
}



/**

 * Write SSPHY register

 * usb_ss_write_phycreg() - Write SSPHY register

 *

 * @base - QCOM DWC3 PHY base virtual address.

 * @addr - SSPHY address to write.

 * @val - value to write.

 * @phy_dwc3: QCOM DWC3 phy context

 * @addr: SSPHY address to write.

 * @val: value to write.

 */

static int usb_ss_write_phycreg(struct usb_phy *phy_dwc3,

				u32 addr, u32 val)
@@ -209,10 +210,11 @@ static int usb_ss_write_phycreg(struct usb_phy *phy_dwc3, 
}



/**

 * Read SSPHY register.

 * usb_ss_read_phycreg() - Read SSPHY register.

 *

 * @base - QCOM DWC3 PHY base virtual address.

 * @addr - SSPHY address to read.

 * @phy_dwc3: QCOM DWC3 phy context

 * @addr: SSPHY address to read.

 * @val: pointer in which read is store.

 */

static int usb_ss_read_phycreg(struct usb_phy *phy_dwc3,

			       u32 addr, u32 *val)

drivers/phy/qualcomm/phy-qcom-qmp.c

+3 −0
Original line number Diff line number Diff line
@@ -2973,6 +2973,9 @@ struct qmp_phy_combo_cfg { 
 * @qmp: QMP phy to which this lane belongs

 * @lane_rst: lane's reset controller

 * @mode: current PHY mode

 * @dp_aux_cfg: Display port aux config

 * @dp_opts: Display port optional config

 * @dp_clks: Display port clocks

 */

struct qmp_phy {

	struct phy *phy;