diff --git a/fdts/tc.dts b/fdts/tc.dts index 6eb7d8ad3..e400f2b47 100644 --- a/fdts/tc.dts +++ b/fdts/tc.dts @@ -10,6 +10,9 @@ #include #include "platform_def.h" #include "tc_vers.dtsi" +#if TARGET_FLAVOUR_FVP +#include "tc_fvp.dtsi" +#endif /* TARGET_FLAVOUR_FVP */ / { compatible = "arm,tc"; @@ -462,14 +465,6 @@ status = "okay"; }; - rtc@1c170000 { - compatible = "arm,pl031", "arm,primecell"; - reg = <0x0 0x1C170000 0x0 0x1000>; - interrupts = ; - clocks = <&soc_refclk>; - clock-names = "apb_pclk"; - }; - vencoder { compatible = "drm,virtual-encoder"; port { @@ -497,22 +492,6 @@ smsc,irq-push-pull; }; - kmi@1c060000 { - compatible = "arm,pl050", "arm,primecell"; - reg = <0x0 0x001c060000 0x0 0x1000>; - interrupts = ; - clocks = <&bp_clock24mhz>, <&bp_clock24mhz>; - clock-names = "KMIREFCLK", "apb_pclk"; - }; - - kmi@1c070000 { - compatible = "arm,pl050", "arm,primecell"; - reg = <0x0 0x001c070000 0x0 0x1000>; - interrupts = ; - clocks = <&bp_clock24mhz>, <&bp_clock24mhz>; - clock-names = "KMIREFCLK", "apb_pclk"; - }; - bp_clock24mhz: clock24mhz { compatible = "fixed-clock"; #clock-cells = <0>; @@ -520,12 +499,6 @@ clock-output-names = "bp:clock24mhz"; }; - virtio_block@1c130000 { - compatible = "virtio,mmio"; - reg = <0x0 0x1c130000 0x0 0x200>; - /* spec lists this wrong */ - interrupts = ; - }; sysreg: sysreg@1c010000 { compatible = "arm,vexpress-sysreg"; diff --git a/fdts/tc_fvp.dtsi b/fdts/tc_fvp.dtsi new file mode 100644 index 000000000..42f38180e --- /dev/null +++ b/fdts/tc_fvp.dtsi @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023-2024, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/ { + rtc@1c170000 { + compatible = "arm,pl031", "arm,primecell"; + reg = <0x0 0x1C170000 0x0 0x1000>; + interrupts = ; + clocks = <&soc_refclk>; + clock-names = "apb_pclk"; + }; + + kmi@1c060000 { + compatible = "arm,pl050", "arm,primecell"; + reg = <0x0 0x001c060000 0x0 0x1000>; + interrupts = ; + clocks = <&bp_clock24mhz>, <&bp_clock24mhz>; + clock-names = "KMIREFCLK", "apb_pclk"; + }; + + kmi@1c070000 { + compatible = "arm,pl050", "arm,primecell"; + reg = <0x0 0x001c070000 0x0 0x1000>; + interrupts = ; + clocks = <&bp_clock24mhz>, <&bp_clock24mhz>; + clock-names = "KMIREFCLK", "apb_pclk"; + }; + + virtio_block@1c130000 { + compatible = "virtio,mmio"; + reg = <0x0 0x1c130000 0x0 0x200>; + /* spec lists this wrong */ + interrupts = ; + }; +};