linux/rockchip: update the USB 3.0 controller node patch

This has been added in Linux 5.10.51 [1], but it's broken/incomplete. Update our
patch and refresh the remaining patches.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.51&id=421aff50af5e4cdc56b3ac8d6b670e09697bc8ac

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>

diff --git a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
index 44a6b6a0476f268ac6e3fbf15ecea925f7e369cd..9e16564953cf56bdf3980be2f3e93ea75a94eea8 100644 (file)
--- a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
+++ b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
@@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 74 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
-index 6e411821583e..f072e2509cc9 100644
 --- a/drivers/of/of_net.c
 +++ b/drivers/of/of_net.c
 @@ -11,6 +11,7 @@
@@ -27,7 +25,7 @@ index 6e411821583e..f072e2509cc9 100644
  
  /**
   * of_get_phy_mode - Get phy mode for given device_node
-@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *np, phy_interface_t *interface)
+@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *
  }
  EXPORT_SYMBOL_GPL(of_get_phy_mode);
  
@@ -36,7 +34,7 @@ index 6e411821583e..f072e2509cc9 100644
  {
        struct property *pp = of_find_property(np, name, NULL);
  
-@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
+@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem
        return mac;
  }
  
@@ -107,7 +105,7 @@ index 6e411821583e..f072e2509cc9 100644
  /**
   * Search the device tree for the best MAC address to use.  'mac-address' is
   * checked first, because that is supposed to contain to "most recent" MAC
-@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
+@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem
   * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
   * but is all zeros.
   *
@@ -118,7 +116,7 @@ index 6e411821583e..f072e2509cc9 100644
   * Return: Will be a valid pointer on success and ERR_PTR in case of error.
  */
  const void *of_get_mac_address(struct device_node *np)
-@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct device_node *np)
+@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct de
        if (addr)
                return addr;
  
@@ -129,6 +127,3 @@ index 6e411821583e..f072e2509cc9 100644
        return of_get_mac_addr_nvmem(np);
  }
  EXPORT_SYMBOL(of_get_mac_address);
--- 
-2.30.2
-

diff --git a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
index 1c08e23699460030d840cbf056a17c8f4afc56a4..0776d7bccc6799796a14c533ea9b8481811c391b 100644 (file)
--- a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
+++ b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
@@ -18,11 +18,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++-----------
  1 file changed, 45 insertions(+), 14 deletions(-)
 
-diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
-index f072e2509cc9..0dbd1f7ef396 100644
 --- a/drivers/of/of_net.c
 +++ b/drivers/of/of_net.c
-@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name)
+@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct devi
        return NULL;
  }
  
@@ -67,7 +65,7 @@ index f072e2509cc9..0dbd1f7ef396 100644
  {
  #ifdef CONFIG_MTD
        struct device_node *mtd_np = NULL;
-@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np)
+@@ -167,28 +172,54 @@ free:
   * If a mtd-mac-address property exists, try to fetch the MAC address from the
   * specified mtd device, and store it as a 'mac-address' property
   *
@@ -128,6 +126,3 @@ index f072e2509cc9..0dbd1f7ef396 100644
 +      return addr;
  }
  EXPORT_SYMBOL(of_get_mac_address);
--- 
-2.30.2
-

diff --git a/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch b/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch
index 54036c0f6b863a5ad06ff19d66bc0a558c76a2ce..2dd6e40ebf921cbb01f534e272688298de5fb475 100644 (file)
--- a/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch
+++ b/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch
@@ -26,20 +26,30 @@ use-case. You've been warned.
 
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1003,6 +1003,33 @@
-               status = "disabled";
+@@ -985,22 +985,30 @@
        };
  
-+      usbdrd3: usb@ff600000 {
+       usbdrd3: usb@ff600000 {
+-              compatible = "rockchip,rk3328-dwc3", "snps,dwc3";
+-              reg = <0x0 0xff600000 0x0 0x100000>;
+-              interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
 +              compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3";
-+              clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
-+                       <&cru ACLK_USB3OTG>;
-+              clock-names = "ref_clk", "suspend_clk",
-+                            "bus_clk";
+               clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
+                        <&cru ACLK_USB3OTG>;
+               clock-names = "ref_clk", "suspend_clk",
+                             "bus_clk";
+-              dr_mode = "otg";
+-              phy_type = "utmi_wide";
+-              snps,dis-del-phy-power-chg-quirk;
+-              snps,dis_enblslpm_quirk;
+-              snps,dis-tx-ipgap-linecheck-quirk;
+-              snps,dis-u2-freeclk-exists-quirk;
+-              snps,dis_u2_susphy_quirk;
+-              snps,dis_u3_susphy_quirk;
 +              #address-cells = <2>;
 +              #size-cells = <2>;
 +              ranges;
-+              status = "disabled";
+               status = "disabled";
 +
 +              usbdrd_dwc3: dwc3@ff600000 {
 +                      compatible = "snps,dwc3";
@@ -55,8 +65,6 @@ use-case. You've been warned.
 +                      snps,dis-tx-ipgap-linecheck-quirk;
 +                      status = "disabled";
 +              };
-+      };
-+
+       };
+ 
        gic: interrupt-controller@ff811000 {
-               compatible = "arm,gic-400";
-               #interrupt-cells = <3>;