Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: BCM5301X: Relicense Hauke's code to the GPL 2.0+ / MIT

Move code added by Hauke to the bcm-ns.dtsi which uses dual licensing.
That syncs more Northstar code to be based on the same licensing schema.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Link: https://lore.kernel.org/r/20230515151921.25021-1-zajec5@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

authored by

Rafał Miłecki and committed by
Florian Fainelli
b3b3cd88 4eaa40bd

+90 -85
+90
arch/arm/boot/dts/bcm-ns.dtsi
··· 1 1 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT 2 + /* 3 + * Copyright 2013-2014 Hauke Mehrtens <hauke@hauke-m.de> 4 + */ 2 5 3 6 #include <dt-bindings/clock/bcm-nsp.h> 4 7 #include <dt-bindings/gpio/gpio.h> ··· 10 7 #include <dt-bindings/interrupt-controller/arm-gic.h> 11 8 12 9 / { 10 + interrupt-parent = <&gic>; 11 + #address-cells = <1>; 12 + #size-cells = <1>; 13 + 14 + chipcommon-a-bus@18000000 { 15 + compatible = "simple-bus"; 16 + ranges = <0x00000000 0x18000000 0x00001000>; 17 + #address-cells = <1>; 18 + #size-cells = <1>; 19 + 20 + uart0: serial@300 { 21 + compatible = "ns16550"; 22 + reg = <0x0300 0x100>; 23 + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; 24 + clocks = <&iprocslow>; 25 + status = "disabled"; 26 + }; 27 + 28 + uart1: serial@400 { 29 + compatible = "ns16550"; 30 + reg = <0x0400 0x100>; 31 + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; 32 + clocks = <&iprocslow>; 33 + pinctrl-names = "default"; 34 + pinctrl-0 = <&pinmux_uart1>; 35 + status = "disabled"; 36 + }; 37 + }; 38 + 39 + mpcore-bus@19000000 { 40 + compatible = "simple-bus"; 41 + ranges = <0x00000000 0x19000000 0x00023000>; 42 + #address-cells = <1>; 43 + #size-cells = <1>; 44 + 45 + scu@20000 { 46 + compatible = "arm,cortex-a9-scu"; 47 + reg = <0x20000 0x100>; 48 + }; 49 + 50 + timer@20200 { 51 + compatible = "arm,cortex-a9-global-timer"; 52 + reg = <0x20200 0x100>; 53 + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>; 54 + clocks = <&periph_clk>; 55 + }; 56 + 57 + timer@20600 { 58 + compatible = "arm,cortex-a9-twd-timer"; 59 + reg = <0x20600 0x20>; 60 + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | 61 + IRQ_TYPE_EDGE_RISING)>; 62 + clocks = <&periph_clk>; 63 + }; 64 + 65 + gic: interrupt-controller@21000 { 66 + compatible = "arm,cortex-a9-gic"; 67 + #interrupt-cells = <3>; 68 + #address-cells = <0>; 69 + interrupt-controller; 70 + reg = <0x21000 0x1000>, 71 + <0x20100 0x100>; 72 + }; 73 + 74 + L2: cache-controller@22000 { 75 + compatible = "arm,pl310-cache"; 76 + reg = <0x22000 0x1000>; 77 + cache-unified; 78 + arm,shared-override; 79 + prefetch-data = <1>; 80 + prefetch-instr = <1>; 81 + cache-level = <2>; 82 + }; 83 + }; 84 + 13 85 axi@18000000 { 14 86 compatible = "brcm,bus-axi"; 15 87 reg = <0x18000000 0x1000>; ··· 292 214 #thermal-sensor-cells = <0>; 293 215 }; 294 216 }; 217 + }; 218 + 219 + nand_controller: nand-controller@18028000 { 220 + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; 221 + reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; 222 + reg-names = "nand", "iproc-idm", "iproc-ext"; 223 + interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; 224 + 225 + #address-cells = <1>; 226 + #size-cells = <0>; 227 + 228 + brcm,nand-has-wp; 295 229 }; 296 230 297 231 thermal-zones {
-85
arch/arm/boot/dts/bcm5301x.dtsi
··· 11 11 #include "bcm-ns.dtsi" 12 12 13 13 / { 14 - #address-cells = <1>; 15 - #size-cells = <1>; 16 - interrupt-parent = <&gic>; 17 - 18 - chipcommon-a-bus@18000000 { 19 - compatible = "simple-bus"; 20 - ranges = <0x00000000 0x18000000 0x00001000>; 21 - #address-cells = <1>; 22 - #size-cells = <1>; 23 - 24 - uart0: serial@300 { 25 - compatible = "ns16550"; 26 - reg = <0x0300 0x100>; 27 - interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; 28 - clocks = <&iprocslow>; 29 - status = "disabled"; 30 - }; 31 - 32 - uart1: serial@400 { 33 - compatible = "ns16550"; 34 - reg = <0x0400 0x100>; 35 - interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; 36 - clocks = <&iprocslow>; 37 - pinctrl-names = "default"; 38 - pinctrl-0 = <&pinmux_uart1>; 39 - status = "disabled"; 40 - }; 41 - }; 42 - 43 14 mpcore-bus@19000000 { 44 - compatible = "simple-bus"; 45 - ranges = <0x00000000 0x19000000 0x00023000>; 46 - #address-cells = <1>; 47 - #size-cells = <1>; 48 - 49 15 a9pll: arm_clk@0 { 50 16 #clock-cells = <0>; 51 17 compatible = "brcm,nsp-armpll"; 52 18 clocks = <&osc>; 53 19 reg = <0x00000 0x1000>; 54 - }; 55 - 56 - scu@20000 { 57 - compatible = "arm,cortex-a9-scu"; 58 - reg = <0x20000 0x100>; 59 - }; 60 - 61 - timer@20200 { 62 - compatible = "arm,cortex-a9-global-timer"; 63 - reg = <0x20200 0x100>; 64 - interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>; 65 - clocks = <&periph_clk>; 66 - }; 67 - 68 - timer@20600 { 69 - compatible = "arm,cortex-a9-twd-timer"; 70 - reg = <0x20600 0x20>; 71 - interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | 72 - IRQ_TYPE_EDGE_RISING)>; 73 - clocks = <&periph_clk>; 74 20 }; 75 21 76 22 watchdog@20620 { ··· 25 79 interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | 26 80 IRQ_TYPE_EDGE_RISING)>; 27 81 clocks = <&periph_clk>; 28 - }; 29 - 30 - gic: interrupt-controller@21000 { 31 - compatible = "arm,cortex-a9-gic"; 32 - #interrupt-cells = <3>; 33 - #address-cells = <0>; 34 - interrupt-controller; 35 - reg = <0x21000 0x1000>, 36 - <0x20100 0x100>; 37 - }; 38 - 39 - L2: cache-controller@22000 { 40 - compatible = "arm,pl310-cache"; 41 - reg = <0x22000 0x1000>; 42 - cache-unified; 43 - arm,shared-override; 44 - prefetch-data = <1>; 45 - prefetch-instr = <1>; 46 - cache-level = <2>; 47 82 }; 48 83 }; 49 84 ··· 226 299 "sata1", "sata2"; 227 300 }; 228 301 }; 229 - }; 230 - 231 - nand_controller: nand-controller@18028000 { 232 - compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; 233 - reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; 234 - reg-names = "nand", "iproc-idm", "iproc-ext"; 235 - interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; 236 - 237 - #address-cells = <1>; 238 - #size-cells = <0>; 239 - 240 - brcm,nand-has-wp; 241 302 }; 242 303 243 304 spi@18029200 {