git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From b8d4f7c1be04d66c37c119c501c87bccc4197694 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Sat, 16 Sep 2023 10:58:55 +0200
   4 Subject: [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ /
   5  MIT
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 Move code added by Vivek to the bcm-ns.dtsi which uses dual licensing.
  11 That syncs more Northstar code to be based on the same licensing schema.
  12
  13 This code was added in the commit 37f6130ec39f ("ARM: dts: BCM5301X:
  14 Make USB 3.0 PHY use MDIO PHY driver").
  15
  16 Cc: Vivek Unune <npcomplete13@gmail.com>
  17 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  18 Acked-by: Vivek Unune <npcomplete13@gmail.com>
  19 Link: https://lore.kernel.org/r/20230916085855.28375-1-zajec5@gmail.com
  20 Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
  21 ---
  22  arch/arm/boot/dts/broadcom/bcm-ns.dtsi   | 27 ++++++++++++++++++++++++
  23  arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 27 ------------------------
  24  2 files changed, 27 insertions(+), 27 deletions(-)
  25
  26 --- a/arch/arm/boot/dts/bcm-ns.dtsi
  27 +++ b/arch/arm/boot/dts/bcm-ns.dtsi
  28 @@ -327,6 +327,29 @@
  29                 #address-cells = <1>;
  30         };
  31
  32 +       mdio-mux@18003000 {
  33 +               compatible = "mdio-mux-mmioreg", "mdio-mux";
  34 +               mdio-parent-bus = <&mdio>;
  35 +               #address-cells = <1>;
  36 +               #size-cells = <0>;
  37 +               reg = <0x18003000 0x4>;
  38 +               mux-mask = <0x200>;
  39 +
  40 +               mdio@0 {
  41 +                       reg = <0x0>;
  42 +                       #address-cells = <1>;
  43 +                       #size-cells = <0>;
  44 +
  45 +                       usb3_phy: usb3-phy@10 {
  46 +                               compatible = "brcm,ns-ax-usb3-phy";
  47 +                               reg = <0x10>;
  48 +                               usb3-dmp-syscon = <&usb3_dmp>;
  49 +                               #phy-cells = <0>;
  50 +                               status = "disabled";
  51 +                       };
  52 +               };
  53 +       };
  54 +
  55         rng: rng@18004000 {
  56                 compatible = "brcm,bcm5301x-rng";
  57                 reg = <0x18004000 0x14>;
  58 @@ -467,6 +490,10 @@
  59                 brcm,nand-has-wp;
  60         };
  61
  62 +       usb3_dmp: syscon@18105000 {
  63 +               reg = <0x18105000 0x1000>;
  64 +       };
  65 +
  66         thermal-zones {
  67                 cpu_thermal: cpu-thermal {
  68                         polling-delay-passive = <0>;
  69 --- a/arch/arm/boot/dts/bcm5301x.dtsi
  70 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
  71 @@ -62,33 +62,6 @@
  72                 };
  73         };
  74
  75 -       mdio-mux@18003000 {
  76 -               compatible = "mdio-mux-mmioreg", "mdio-mux";
  77 -               mdio-parent-bus = <&mdio>;
  78 -               #address-cells = <1>;
  79 -               #size-cells = <0>;
  80 -               reg = <0x18003000 0x4>;
  81 -               mux-mask = <0x200>;
  82 -
  83 -               mdio@0 {
  84 -                       reg = <0x0>;
  85 -                       #address-cells = <1>;
  86 -                       #size-cells = <0>;
  87 -
  88 -                       usb3_phy: usb3-phy@10 {
  89 -                               compatible = "brcm,ns-ax-usb3-phy";
  90 -                               reg = <0x10>;
  91 -                               usb3-dmp-syscon = <&usb3_dmp>;
  92 -                               #phy-cells = <0>;
  93 -                               status = "disabled";
  94 -                       };
  95 -               };
  96 -       };
  97 -
  98 -       usb3_dmp: syscon@18105000 {
  99 -               reg = <0x18105000 0x1000>;
 100 -       };
 101 -
 102         i2c0: i2c@18009000 {
 103                 compatible = "brcm,iproc-i2c";
 104                 reg = <0x18009000 0x50>;