From 1d5682ccc7d6088179b6cfd50a3e3bb6d2b0527e Mon Sep 17 00:00:00 2001 From: Rafał Miłecki Date: Mon, 5 Jun 2023 08:10:49 +0200 Subject: ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move code added by Christian to the bcm-ns.dtsi which uses dual licensing. That syncs more Northstar code to be based on the same licensing schema. Cc: Christian Lamparter Signed-off-by: Rafał Miłecki Acked-by: Christian Lamparter Link: https://lore.kernel.org/r/20230605061049.16136-1-zajec5@gmail.com Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-ns.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/bcm-ns.dtsi b/arch/arm/boot/dts/bcm-ns.dtsi index 793891f1f260..d9455b33adee 100644 --- a/arch/arm/boot/dts/bcm-ns.dtsi +++ b/arch/arm/boot/dts/bcm-ns.dtsi @@ -182,6 +182,10 @@ reg = <0x00013000 0x1000>; }; + pcie2: pcie@14000 { + reg = <0x00014000 0x1000>; + }; + usb2: usb2@21000 { reg = <0x00021000 0x1000>; @@ -274,6 +278,14 @@ }; }; + pwm: pwm@18002000 { + compatible = "brcm,iproc-pwm"; + reg = <0x18002000 0x28>; + clocks = <&osc>; + #pwm-cells = <3>; + status = "disabled"; + }; + mdio: mdio@18003000 { compatible = "brcm,iproc-mdio"; reg = <0x18003000 0x8>; @@ -299,6 +311,15 @@ }; }; + uart2: serial@18008000 { + compatible = "ns16550a"; + reg = <0x18008000 0x20>; + clocks = <&iprocslow>; + interrupts = ; + reg-shift = <2>; + status = "disabled"; + }; + dmu-bus@1800c000 { compatible = "simple-bus"; ranges = <0 0x1800c000 0x1000>; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 0f40812eb5a4..600a1b54f2ae 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -69,20 +69,6 @@ }; }; - axi@18000000 { - pcie2: pcie@14000 { - reg = <0x00014000 0x1000>; - }; - }; - - pwm: pwm@18002000 { - compatible = "brcm,iproc-pwm"; - reg = <0x18002000 0x28>; - clocks = <&osc>; - #pwm-cells = <3>; - status = "disabled"; - }; - mdio-mux@18003000 { compatible = "mdio-mux-mmioreg", "mdio-mux"; mdio-parent-bus = <&mdio>; @@ -110,15 +96,6 @@ reg = <0x18105000 0x1000>; }; - uart2: serial@18008000 { - compatible = "ns16550a"; - reg = <0x18008000 0x20>; - clocks = <&iprocslow>; - interrupts = ; - reg-shift = <2>; - status = "disabled"; - }; - i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>; -- cgit