Skip to content

Commit 1d5682c

Browse files
Rafał Miłeckiffainelli
authored andcommitted
ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT
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 <chunkeey@gmail.com> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Christian Lamparter <chunkeey@gmail.com> Link: https://lore.kernel.org/r/20230605061049.16136-1-zajec5@gmail.com Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
1 parent 676bf7d commit 1d5682c

2 files changed

Lines changed: 21 additions & 23 deletions

File tree

arch/arm/boot/dts/bcm-ns.dtsi

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@
182182
reg = <0x00013000 0x1000>;
183183
};
184184

185+
pcie2: pcie@14000 {
186+
reg = <0x00014000 0x1000>;
187+
};
188+
185189
usb2: usb2@21000 {
186190
reg = <0x00021000 0x1000>;
187191

@@ -274,6 +278,14 @@
274278
};
275279
};
276280

281+
pwm: pwm@18002000 {
282+
compatible = "brcm,iproc-pwm";
283+
reg = <0x18002000 0x28>;
284+
clocks = <&osc>;
285+
#pwm-cells = <3>;
286+
status = "disabled";
287+
};
288+
277289
mdio: mdio@18003000 {
278290
compatible = "brcm,iproc-mdio";
279291
reg = <0x18003000 0x8>;
@@ -299,6 +311,15 @@
299311
};
300312
};
301313

314+
uart2: serial@18008000 {
315+
compatible = "ns16550a";
316+
reg = <0x18008000 0x20>;
317+
clocks = <&iprocslow>;
318+
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
319+
reg-shift = <2>;
320+
status = "disabled";
321+
};
322+
302323
dmu-bus@1800c000 {
303324
compatible = "simple-bus";
304325
ranges = <0 0x1800c000 0x1000>;

arch/arm/boot/dts/bcm5301x.dtsi

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,6 @@
6969
};
7070
};
7171

72-
axi@18000000 {
73-
pcie2: pcie@14000 {
74-
reg = <0x00014000 0x1000>;
75-
};
76-
};
77-
78-
pwm: pwm@18002000 {
79-
compatible = "brcm,iproc-pwm";
80-
reg = <0x18002000 0x28>;
81-
clocks = <&osc>;
82-
#pwm-cells = <3>;
83-
status = "disabled";
84-
};
85-
8672
mdio-mux@18003000 {
8773
compatible = "mdio-mux-mmioreg", "mdio-mux";
8874
mdio-parent-bus = <&mdio>;
@@ -110,15 +96,6 @@
11096
reg = <0x18105000 0x1000>;
11197
};
11298

113-
uart2: serial@18008000 {
114-
compatible = "ns16550a";
115-
reg = <0x18008000 0x20>;
116-
clocks = <&iprocslow>;
117-
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
118-
reg-shift = <2>;
119-
status = "disabled";
120-
};
121-
12299
i2c0: i2c@18009000 {
123100
compatible = "brcm,iproc-i2c";
124101
reg = <0x18009000 0x50>;

0 commit comments

Comments
 (0)