Commit aaaf919c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'phy-fixes-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy 

Pull phy fixes from Vinod Koul:

 - binding fix for g12a phys

 - Kconfig operator precedence for TI driver

 - renesas: register setting

 - sunplus: null deref fix

 - rockchip-inno fix for clk_disable_unprepare()

 - MDM9607 init sequence revert due to regression

* tag 'phy-fixes-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: phy-can-transceiver: Skip warning if no "max-bitrate"
  dt-bindings: phy: g12a-usb2-phy: fix compatible string documentation
  dt-bindings: phy: g12a-usb3-pcie-phy: fix compatible string documentation
  phy: freescale: imx8m-pcie: Add one missing error return
  phy: Revert "phy: qualcomm: usb28nm: Add MDM9607 init sequence"
  phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on()
  phy: renesas: r8a779f0-eth-serdes: Fix register setting
  phy: usb: sunplus: Fix potential null-ptr-deref in sp_usb_phy_probe()
  phy: ti: fix Kconfig warning and operator precedence
parents 5deaa985 bc30c15f

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml

+4 −4
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

# Copyright 2019 BayLibre, SAS

%YAML 1.2

%YAML 1.2

---

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb2-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb2-phy.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"





title: Amlogic G12A USB2 PHY

title: Amlogic G12A USB2 PHY
@@ -13,8 +13,8 @@ maintainers: 
properties:

properties:

  compatible:

  compatible:

    enum:

    enum:

      - amlogic,meson-g12a-usb2-phy

      - amlogic,g12a-usb2-phy

      - amlogic,meson-a1-usb2-phy

      - amlogic,a1-usb2-phy





  reg:

  reg:

    maxItems: 1

    maxItems: 1
@@ -68,7 +68,7 @@ additionalProperties: false 
examples:

examples:

  - |

  - |

    phy@36000 {

    phy@36000 {

          compatible = "amlogic,meson-g12a-usb2-phy";

          compatible = "amlogic,g12a-usb2-phy";

          reg = <0x36000 0x2000>;

          reg = <0x36000 0x2000>;

          clocks = <&xtal>;

          clocks = <&xtal>;

          clock-names = "xtal";

          clock-names = "xtal";

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml

+3 −3
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

# Copyright 2019 BayLibre, SAS

%YAML 1.2

%YAML 1.2

---

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"





title: Amlogic G12A USB3 + PCIE Combo PHY

title: Amlogic G12A USB3 + PCIE Combo PHY
@@ -13,7 +13,7 @@ maintainers: 
properties:

properties:

  compatible:

  compatible:

    enum:

    enum:

      - amlogic,meson-g12a-usb3-pcie-phy

      - amlogic,g12a-usb3-pcie-phy





  reg:

  reg:

    maxItems: 1

    maxItems: 1
@@ -49,7 +49,7 @@ additionalProperties: false 
examples:

examples:

  - |

  - |

    phy@46000 {

    phy@46000 {

          compatible = "amlogic,meson-g12a-usb3-pcie-phy";

          compatible = "amlogic,g12a-usb3-pcie-phy";

          reg = <0x46000 0x2000>;

          reg = <0x46000 0x2000>;

          clocks = <&ref_clk>;

          clocks = <&ref_clk>;

          clock-names = "ref_clk";

          clock-names = "ref_clk";

Documentation/devicetree/bindings/phy/qcom,usb-hs-28nm.yaml

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ properties: 
  compatible:

  compatible:

    enum:

    enum:

      - qcom,usb-hs-28nm-femtophy

      - qcom,usb-hs-28nm-femtophy

      - qcom,usb-hs-28nm-mdm9607





  reg:

  reg:

    maxItems: 1

    maxItems: 1

drivers/phy/freescale/phy-fsl-imx8m-pcie.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ static int imx8_pcie_phy_probe(struct platform_device *pdev) 
		imx8_phy->perst =

		imx8_phy->perst =

			devm_reset_control_get_exclusive(dev, "perst");

			devm_reset_control_get_exclusive(dev, "perst");

		if (IS_ERR(imx8_phy->perst))

		if (IS_ERR(imx8_phy->perst))

			dev_err_probe(dev, PTR_ERR(imx8_phy->perst),

			return dev_err_probe(dev, PTR_ERR(imx8_phy->perst),

				      "Failed to get PCIE PHY PERST control\n");

				      "Failed to get PCIE PHY PERST control\n");

	}

	}

drivers/phy/phy-can-transceiver.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ static int can_transceiver_phy_probe(struct platform_device *pdev) 
	struct gpio_desc *standby_gpio;

	struct gpio_desc *standby_gpio;

	struct gpio_desc *enable_gpio;

	struct gpio_desc *enable_gpio;

	u32 max_bitrate = 0;

	u32 max_bitrate = 0;

	int err;





	can_transceiver_phy = devm_kzalloc(dev, sizeof(struct can_transceiver_phy), GFP_KERNEL);

	can_transceiver_phy = devm_kzalloc(dev, sizeof(struct can_transceiver_phy), GFP_KERNEL);

	if (!can_transceiver_phy)

	if (!can_transceiver_phy)
@@ -124,8 +125,8 @@ static int can_transceiver_phy_probe(struct platform_device *pdev) 
		return PTR_ERR(phy);

		return PTR_ERR(phy);

	}

	}





	device_property_read_u32(dev, "max-bitrate", &max_bitrate);

	err = device_property_read_u32(dev, "max-bitrate", &max_bitrate);

	if (!max_bitrate)

	if ((err != -EINVAL) && !max_bitrate)

		dev_warn(dev, "Invalid value for transceiver max bitrate. Ignoring bitrate limit\n");

		dev_warn(dev, "Invalid value for transceiver max bitrate. Ignoring bitrate limit\n");

	phy->attrs.max_link_rate = max_bitrate;

	phy->attrs.max_link_rate = max_bitrate;