Commit 4315eab7 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge tag 'phy-fixes-6.2' into next 

Merge fixes tag pulled into mainline by Linus into phy/next due to
dependency on amlogic patches
parents 4ca651df 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 Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%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#"



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

  compatible:

    enum:

      - amlogic,meson-g12a-usb2-phy

      - amlogic,meson-a1-usb2-phy

      - amlogic,g12a-usb2-phy

      - amlogic,a1-usb2-phy



  reg:

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

  - |

    phy@36000 {

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

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

          reg = <0x36000 0x2000>;

          clocks = <&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 Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%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#"



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

  compatible:

    enum:

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

      - amlogic,g12a-usb3-pcie-phy



  reg:

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

  - |

    phy@46000 {

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

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

          reg = <0x46000 0x2000>;

          clocks = <&ref_clk>;

          clock-names = "ref_clk";

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

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

    enum:

      - qcom,usb-hs-28nm-femtophy

      - qcom,usb-hs-28nm-mdm9607



  reg:

    maxItems: 1

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

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

			devm_reset_control_get_exclusive(dev, "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");

	}

drivers/phy/phy-can-transceiver.c

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

	struct gpio_desc *enable_gpio;

	u32 max_bitrate = 0;

	int err;



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

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

	}



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

	if (!max_bitrate)

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

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

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

	phy->attrs.max_link_rate = max_bitrate;