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

Configure Feed

Select the types of activity you want to include in your feed.

mips: dts: realtek: Fold rtl83xx into rtl838x

rtl83xx.dtsi was once (presumably) created as a base for both RTL838x
and RTL839x SoCs. Both SoCs have a different CPU and the peripherals
require different compatibles. Fold rtl83xx.dtsi into rtl838x.dtsi,
currently only supporting RTL838x SoCs, and create the RTL839x base
include later when required.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Sander Vanheule and committed by
Thomas Bogendoerfer 045cbcc4 652d5000

+56 -60
-1
arch/mips/boot/dts/realtek/cisco_sg220-26.dts
··· 2 2 3 3 /dts-v1/; 4 4 5 - #include "rtl83xx.dtsi" 6 5 #include "rtl838x.dtsi" 7 6 8 7 / {
+56
arch/mips/boot/dts/realtek/rtl838x.dtsi
··· 1 1 // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause 2 2 3 3 / { 4 + #address-cells = <1>; 5 + #size-cells = <1>; 6 + 7 + aliases { 8 + serial0 = &uart0; 9 + serial1 = &uart1; 10 + }; 11 + 4 12 cpus { 5 13 #address-cells = <1>; 6 14 #size-cells = <0>; ··· 25 17 compatible = "fixed-clock"; 26 18 #clock-cells = <0>; 27 19 clock-frequency = <500000000>; 20 + }; 21 + 22 + cpuintc: cpuintc { 23 + compatible = "mti,cpu-interrupt-controller"; 24 + #address-cells = <0>; 25 + #interrupt-cells = <1>; 26 + interrupt-controller; 27 + }; 28 + 29 + soc@18000000 { 30 + compatible = "simple-bus"; 31 + #address-cells = <1>; 32 + #size-cells = <1>; 33 + ranges = <0x0 0x18000000 0x10000>; 34 + 35 + uart0: serial@2000 { 36 + compatible = "ns16550a"; 37 + reg = <0x2000 0x100>; 38 + 39 + clock-frequency = <200000000>; 40 + 41 + interrupt-parent = <&cpuintc>; 42 + interrupts = <31>; 43 + 44 + reg-io-width = <1>; 45 + reg-shift = <2>; 46 + fifo-size = <1>; 47 + no-loopback-test; 48 + 49 + status = "disabled"; 50 + }; 51 + 52 + uart1: serial@2100 { 53 + compatible = "ns16550a"; 54 + reg = <0x2100 0x100>; 55 + 56 + clock-frequency = <200000000>; 57 + 58 + interrupt-parent = <&cpuintc>; 59 + interrupts = <30>; 60 + 61 + reg-io-width = <1>; 62 + reg-shift = <2>; 63 + fifo-size = <1>; 64 + no-loopback-test; 65 + 66 + status = "disabled"; 67 + }; 28 68 }; 29 69 };
-59
arch/mips/boot/dts/realtek/rtl83xx.dtsi
··· 1 - // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause 2 - 3 - / { 4 - #address-cells = <1>; 5 - #size-cells = <1>; 6 - 7 - aliases { 8 - serial0 = &uart0; 9 - serial1 = &uart1; 10 - }; 11 - 12 - cpuintc: cpuintc { 13 - compatible = "mti,cpu-interrupt-controller"; 14 - #address-cells = <0>; 15 - #interrupt-cells = <1>; 16 - interrupt-controller; 17 - }; 18 - 19 - soc@18000000 { 20 - compatible = "simple-bus"; 21 - #address-cells = <1>; 22 - #size-cells = <1>; 23 - ranges = <0x0 0x18000000 0x10000>; 24 - 25 - uart0: serial@2000 { 26 - compatible = "ns16550a"; 27 - reg = <0x2000 0x100>; 28 - 29 - clock-frequency = <200000000>; 30 - 31 - interrupt-parent = <&cpuintc>; 32 - interrupts = <31>; 33 - 34 - reg-io-width = <1>; 35 - reg-shift = <2>; 36 - fifo-size = <1>; 37 - no-loopback-test; 38 - 39 - status = "disabled"; 40 - }; 41 - 42 - uart1: serial@2100 { 43 - compatible = "ns16550a"; 44 - reg = <0x2100 0x100>; 45 - 46 - clock-frequency = <200000000>; 47 - 48 - interrupt-parent = <&cpuintc>; 49 - interrupts = <30>; 50 - 51 - reg-io-width = <1>; 52 - reg-shift = <2>; 53 - fifo-size = <1>; 54 - no-loopback-test; 55 - 56 - status = "disabled"; 57 - }; 58 - }; 59 - };