| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <8d5f5d4b-4b70-405f-9111-edcd28ee0395@alliedtelesis.co.nz>
Date: Mon, 20 Jan 2025 14:23:26 +1300
From: Chris Packham <chris.packham@...iedtelesis.co.nz>
To: Sander Vanheule <sander@...nheule.net>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley
<conor+dt@...nel.org>, Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
devicetree@...r.kernel.org, linux-mips@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
Subject: Re: [PATCH 4/9] mips: dts: realtek: Fold rtl83xx into rtl838x
On 20/01/2025 07:34, Sander Vanheule wrote:
> 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@...nheule.net>
Reviewed-by: Chris Packham <chris.packham@...iedtelesis.co.nz>
> ---
> arch/mips/boot/dts/realtek/cisco_sg220-26.dts | 1 -
> arch/mips/boot/dts/realtek/rtl838x.dtsi | 56 ++++++++++++++++++
> arch/mips/boot/dts/realtek/rtl83xx.dtsi | 59 -------------------
> 3 files changed, 56 insertions(+), 60 deletions(-)
> delete mode 100644 arch/mips/boot/dts/realtek/rtl83xx.dtsi
>
> diff --git a/arch/mips/boot/dts/realtek/cisco_sg220-26.dts b/arch/mips/boot/dts/realtek/cisco_sg220-26.dts
> index 1cdbb09297ef..cb85d172a1d3 100644
> --- a/arch/mips/boot/dts/realtek/cisco_sg220-26.dts
> +++ b/arch/mips/boot/dts/realtek/cisco_sg220-26.dts
> @@ -2,7 +2,6 @@
>
> /dts-v1/;
>
> -#include "rtl83xx.dtsi"
> #include "rtl838x.dtsi"
>
> / {
> diff --git a/arch/mips/boot/dts/realtek/rtl838x.dtsi b/arch/mips/boot/dts/realtek/rtl838x.dtsi
> index d2c6baabb38c..907449094536 100644
> --- a/arch/mips/boot/dts/realtek/rtl838x.dtsi
> +++ b/arch/mips/boot/dts/realtek/rtl838x.dtsi
> @@ -1,6 +1,14 @@
> // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
>
> / {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + aliases {
> + serial0 = &uart0;
> + serial1 = &uart1;
> + };
> +
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -18,4 +26,52 @@ baseclk: baseclk {
> #clock-cells = <0>;
> clock-frequency = <500000000>;
> };
> +
> + cpuintc: cpuintc {
> + compatible = "mti,cpu-interrupt-controller";
> + #address-cells = <0>;
> + #interrupt-cells = <1>;
> + interrupt-controller;
> + };
> +
> + soc@...00000 {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0x0 0x18000000 0x10000>;
> +
> + uart0: serial@...0 {
> + compatible = "ns16550a";
> + reg = <0x2000 0x100>;
> +
> + clock-frequency = <200000000>;
> +
> + interrupt-parent = <&cpuintc>;
> + interrupts = <31>;
> +
> + reg-io-width = <1>;
> + reg-shift = <2>;
> + fifo-size = <1>;
> + no-loopback-test;
> +
> + status = "disabled";
> + };
> +
> + uart1: serial@...0 {
> + compatible = "ns16550a";
> + reg = <0x2100 0x100>;
> +
> + clock-frequency = <200000000>;
> +
> + interrupt-parent = <&cpuintc>;
> + interrupts = <30>;
> +
> + reg-io-width = <1>;
> + reg-shift = <2>;
> + fifo-size = <1>;
> + no-loopback-test;
> +
> + status = "disabled";
> + };
> + };
> };
> diff --git a/arch/mips/boot/dts/realtek/rtl83xx.dtsi b/arch/mips/boot/dts/realtek/rtl83xx.dtsi
> deleted file mode 100644
> index 1039cb50c7da..000000000000
> --- a/arch/mips/boot/dts/realtek/rtl83xx.dtsi
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
> -
> -/ {
> - #address-cells = <1>;
> - #size-cells = <1>;
> -
> - aliases {
> - serial0 = &uart0;
> - serial1 = &uart1;
> - };
> -
> - cpuintc: cpuintc {
> - compatible = "mti,cpu-interrupt-controller";
> - #address-cells = <0>;
> - #interrupt-cells = <1>;
> - interrupt-controller;
> - };
> -
> - soc@...00000 {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges = <0x0 0x18000000 0x10000>;
> -
> - uart0: serial@...0 {
> - compatible = "ns16550a";
> - reg = <0x2000 0x100>;
> -
> - clock-frequency = <200000000>;
> -
> - interrupt-parent = <&cpuintc>;
> - interrupts = <31>;
> -
> - reg-io-width = <1>;
> - reg-shift = <2>;
> - fifo-size = <1>;
> - no-loopback-test;
> -
> - status = "disabled";
> - };
> -
> - uart1: serial@...0 {
> - compatible = "ns16550a";
> - reg = <0x2100 0x100>;
> -
> - clock-frequency = <200000000>;
> -
> - interrupt-parent = <&cpuintc>;
> - interrupts = <30>;
> -
> - reg-io-width = <1>;
> - reg-shift = <2>;
> - fifo-size = <1>;
> - no-loopback-test;
> -
> - status = "disabled";
> - };
> - };
> -};
Powered by blists - more mailing lists