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

   1 From 1d5682ccc7d6088179b6cfd50a3e3bb6d2b0527e Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Mon, 5 Jun 2023 08:10:49 +0200
   4 Subject: [PATCH] ARM: dts: BCM5301X: Relicense Christian's code to the GPL
   5  2.0+ / 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 Christian to the bcm-ns.dtsi which uses dual
  11 licensing. That syncs more Northstar code to be based on the same
  12 licensing schema.
  13
  14 Cc: Christian Lamparter <chunkeey@gmail.com>
  15 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  16 Acked-by: Christian Lamparter <chunkeey@gmail.com>
  17 Link: https://lore.kernel.org/r/20230605061049.16136-1-zajec5@gmail.com
  18 Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
  19 ---
  20  arch/arm/boot/dts/bcm-ns.dtsi   | 21 +++++++++++++++++++++
  21  arch/arm/boot/dts/bcm5301x.dtsi | 23 -----------------------
  22  2 files changed, 21 insertions(+), 23 deletions(-)
  23
  24 --- a/arch/arm/boot/dts/bcm-ns.dtsi
  25 +++ b/arch/arm/boot/dts/bcm-ns.dtsi
  26 @@ -182,6 +182,10 @@
  27                         reg = <0x00013000 0x1000>;
  28                 };
  29
  30 +               pcie2: pcie@14000 {
  31 +                       reg = <0x00014000 0x1000>;
  32 +               };
  33 +
  34                 usb2: usb2@21000 {
  35                         reg = <0x00021000 0x1000>;
  36
  37 @@ -274,6 +278,14 @@
  38                 };
  39         };
  40
  41 +       pwm: pwm@18002000 {
  42 +               compatible = "brcm,iproc-pwm";
  43 +               reg = <0x18002000 0x28>;
  44 +               clocks = <&osc>;
  45 +               #pwm-cells = <3>;
  46 +               status = "disabled";
  47 +       };
  48 +
  49         mdio: mdio@18003000 {
  50                 compatible = "brcm,iproc-mdio";
  51                 reg = <0x18003000 0x8>;
  52 @@ -299,6 +311,15 @@
  53                 };
  54         };
  55
  56 +       uart2: serial@18008000 {
  57 +               compatible = "ns16550a";
  58 +               reg = <0x18008000 0x20>;
  59 +               clocks = <&iprocslow>;
  60 +               interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
  61 +               reg-shift = <2>;
  62 +               status = "disabled";
  63 +       };
  64 +
  65         dmu-bus@1800c000 {
  66                 compatible = "simple-bus";
  67                 ranges = <0 0x1800c000 0x1000>;
  68 --- a/arch/arm/boot/dts/bcm5301x.dtsi
  69 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
  70 @@ -69,20 +69,6 @@
  71                 };
  72         };
  73
  74 -       axi@18000000 {
  75 -               pcie2: pcie@14000 {
  76 -                       reg = <0x00014000 0x1000>;
  77 -               };
  78 -       };
  79 -
  80 -       pwm: pwm@18002000 {
  81 -               compatible = "brcm,iproc-pwm";
  82 -               reg = <0x18002000 0x28>;
  83 -               clocks = <&osc>;
  84 -               #pwm-cells = <3>;
  85 -               status = "disabled";
  86 -       };
  87 -
  88         mdio-mux@18003000 {
  89                 compatible = "mdio-mux-mmioreg", "mdio-mux";
  90                 mdio-parent-bus = <&mdio>;
  91 @@ -110,15 +96,6 @@
  92                 reg = <0x18105000 0x1000>;
  93         };
  94
  95 -       uart2: serial@18008000 {
  96 -               compatible = "ns16550a";
  97 -               reg = <0x18008000 0x20>;
  98 -               clocks = <&iprocslow>;
  99 -               interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 100 -               reg-shift = <2>;
 101 -               status = "disabled";
 102 -       };
 103 -
 104         i2c0: i2c@18009000 {
 105                 compatible = "brcm,iproc-i2c";
 106                 reg = <0x18009000 0x50>;