refactor(tc): append properties in DT bindings
This patch appends properties in DT bindings to differentiate between
FVP and FPGA. The related macros are no longer used, so they are
removed.
This patch contains minor improvement for adding labels in device nodes.
Change-Id: I8d708bb7a8a9a0ed32b806abcb4e7651daadf5e6
Signed-off-by: Leo Yan <leo.yan@arm.com>
diff --git a/fdts/tc-base.dtsi b/fdts/tc-base.dtsi
index 15e4a00..79f2666 100644
--- a/fdts/tc-base.dtsi
+++ b/fdts/tc-base.dtsi
@@ -47,7 +47,6 @@
};
chosen {
- stdout-path = STDOUT_PATH;
/*
* Add some dummy entropy for Linux so it
* doesn't delay the boot waiting for it.
@@ -417,13 +416,10 @@
};
- ethernet@18000000 {
- compatible = ETH_COMPATIBLE;
+ ethernet: ethernet@18000000 {
reg = <0x0 0x18000000 0x0 0x10000>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
- /* FPGA only but will work on FVP. Keep for simplicity */
- phy-mode = "mii";
reg-io-width = <2>;
smsc,irq-push-pull;
};
@@ -451,12 +447,11 @@
regulator-always-on;
};
- mmci@1c050000 {
+ mmci: mmci@1c050000 {
compatible = "arm,pl180", "arm,primecell";
reg = <0x0 0x001c050000 0x0 0x1000>;
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
- MMC_REMOVABLE;
wp-gpios = <&sysreg 1 0>;
bus-width = <4>;
max-frequency = <25000000>;
diff --git a/fdts/tc-fpga.dtsi b/fdts/tc-fpga.dtsi
index f5bda29..73f4743 100644
--- a/fdts/tc-fpga.dtsi
+++ b/fdts/tc-fpga.dtsi
@@ -4,7 +4,6 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#define STDOUT_PATH "serial0:38400n8"
#define GIC_CTRL_ADDR 30000000
#define GIC_GICR_OFFSET 0x1000000
#define UART_OFFSET 0x10000
@@ -20,5 +19,18 @@
vfront-porch = <3>; \
vback-porch = <217>; \
vsync-len = <10>
-#define ETH_COMPATIBLE "smsc,lan9115"
-#define MMC_REMOVABLE non-removable
+
+/ {
+ chosen {
+ stdout-path = "serial0:38400n8";
+ };
+
+ ethernet: ethernet@18000000 {
+ compatible = "smsc,lan9115";
+ phy-mode = "mii";
+ };
+
+ mmci: mmci@1c050000 {
+ non-removable;
+ };
+};
diff --git a/fdts/tc-fvp.dtsi b/fdts/tc-fvp.dtsi
index 22a4f53..46b0e81 100644
--- a/fdts/tc-fvp.dtsi
+++ b/fdts/tc-fvp.dtsi
@@ -4,7 +4,6 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#define STDOUT_PATH "serial0:115200n8"
#define GIC_CTRL_ADDR 2c010000
#define GIC_GICR_OFFSET 0x200000
#define UART_OFFSET 0x1000
@@ -19,10 +18,20 @@
vfront-porch = <10>; \
vback-porch = <33>; \
vsync-len = <2>
-#define ETH_COMPATIBLE "smsc,lan91c111"
-#define MMC_REMOVABLE cd-gpios = <&sysreg 0 0>
/ {
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ ethernet: ethernet@18000000 {
+ compatible = "smsc,lan91c111";
+ };
+
+ mmci: mmci@1c050000 {
+ cd-gpios = <&sysreg 0 0>;
+ };
+
rtc@1c170000 {
compatible = "arm,pl031", "arm,primecell";
reg = <0x0 0x1C170000 0x0 0x1000>;