ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT
PATCH 1/1 ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT
From: Rafał Miłecki <[email protected]>
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.
---
Florian: we need to ask & wait for Christian's Acked-by before applying this one.
--- arch/arm/boot/dts/bcm-ns.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-)
arch/arm/boot/dts/bcm-ns.dtsi +21 -0
@@ -182,6 +182,10 @@ pcie1: pcie@13000 { reg = <0x00013000 0x1000>; }; + pcie2: pcie@14000 { + reg = <0x00014000 0x1000>; + }; + usb2: usb2@21000 { reg = <0x00021000 0x1000>;
@@ -274,6 +278,14 @@ gmac3: ethernet@27000 { }; }; + 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 @@ ports { }; }; + uart2: serial@18008000 { + compatible = "ns16550a"; + reg = <0x18008000 0x20>; + clocks = <&iprocslow>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + status = "disabled"; + }; + dmu-bus@1800c000 { compatible = "simple-bus"; ranges = <0 0x1800c000 0x1000>;
arch/arm/boot/dts/bcm5301x.dtsi +0 -23
@@ -69,20 +69,6 @@ periph_clk: periph_clk { }; }; - 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 @@ usb3_dmp: syscon@18105000 { reg = <0x18105000 0x1000>; }; - uart2: serial@18008000 { - compatible = "ns16550a"; - reg = <0x18008000 0x20>; - clocks = <&iprocslow>; - interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - status = "disabled"; - }; - i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>;
Signature · 1 line
2.35.3
Quoted 11 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
Move code added by Christian to the
bcm-ns.dtsiwhich uses dual licensing. That syncs more Northstar code to be based on the same licensing schema.Cc Christian Lamparter <[email protected]>Signed-off-by Rafał Miłecki <[email protected]>---
Florian: we need to ask & wait for Christian's Acked-by before applying this one.
Quoted 95 lines
--- arch/arm/boot/dts/bcm-ns.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-)arch/arm/boot/dts/bcm-ns.dtsi +21
-0@@ -182,6 +182,10 @@ pcie1: pcie@13000 { reg = <0x00013000 0x1000>; }; + pcie2: pcie@14000 { + reg = <0x00014000 0x1000>; + }; + usb2: usb2@21000 { reg = <0x00021000 0x1000>;@@ -274,6 +278,14 @@ gmac3: ethernet@27000 { }; }; + 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 @@ ports { }; }; + uart2: serial@18008000 { + compatible = "ns16550a"; + reg = <0x18008000 0x20>; + clocks = <&iprocslow>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + status = "disabled"; + }; + dmu-bus@1800c000 { compatible = "simple-bus"; ranges = <0 0x1800c000 0x1000>;arch/arm/boot/dts/bcm5301x.dtsi +0
-24@@ -69,20 +69,6 @@ periph_clk: periph_clk { }; }; - 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 @@ usb3_dmp: syscon@18105000 { reg = <0x18105000 0x1000>; }; - uart2: serial@18008000 { - compatible = "ns16550a"; - reg = <0x18008000 0x20>; - clocks = <&iprocslow>; - interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - status = "disabled"; - }; - i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>; --2.35.3
Florian Fainelli
AppliedFrom: Florian Fainelli <[email protected]>
Quoted 9 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
Move code added by Christian to the
bcm-ns.dtsiwhich uses dual licensing. That syncs more Northstar code to be based on the same licensing schema.Cc Christian Lamparter <[email protected]>Signed-off-by Rafał Miłecki <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian