From 361bb53aa2bb6314bf22690f5436af7c096d0e0a Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 15 Jun 2021 20:57:04 +0200 Subject: soc/amd/picasso: introduce and use devicetree aliases for UART0-3 Since the default state of the MMIO UART devices in the chipset devicetree is off, the mainboard devicetree entries that disable MMIO UART devices are removed. Signed-off-by: Felix Held Change-Id: I913a587802020ce4e182b48632cdde1104c2a6e6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55545 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb | 5 +---- src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb | 5 +---- src/mainboard/google/zork/variants/berknip/overridetree.cb | 2 +- src/mainboard/google/zork/variants/morphius/overridetree.cb | 2 +- src/mainboard/google/zork/variants/trembyle/overridetree.cb | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) (limited to 'src/mainboard/google/zork') diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index f17eca77ca..0cf969cf6a 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -395,9 +395,6 @@ chip soc/amd/picasso end end - device mmio 0xfedc9000 on end # console on UART0 - device mmio 0xfedca000 off end # UART1 - device mmio 0xfedce000 off end # UART2 - device mmio 0xfedcf000 off end # UART3 + device ref uart_0 on end # console end # chip soc/amd/picasso diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 88fa360743..637299b43d 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -437,9 +437,6 @@ chip soc/amd/picasso end end - device mmio 0xfedc9000 on end # console on UART0 - device mmio 0xfedca000 off end # UART1 - device mmio 0xfedce000 off end # UART2 - device mmio 0xfedcf000 off end # UART3 + device ref uart_0 on end # console end # chip soc/amd/picasso diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb index 04b966bc6b..fe2eadea61 100644 --- a/src/mainboard/google/zork/variants/berknip/overridetree.cb +++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb @@ -158,7 +158,7 @@ chip soc/amd/picasso end end - device mmio 0xfedca000 on + device ref uart_1 on chip drivers/uart/acpi register "name" = ""CRFP"" register "desc" = ""Fingerprint Reader"" diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb index 66e49f4db6..cfc9cb3320 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -123,7 +123,7 @@ chip soc/amd/picasso end end - device mmio 0xfedca000 on + device ref uart_1 on chip drivers/uart/acpi register "name" = ""CRFP"" register "desc" = ""Fingerprint Reader"" diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb index a34d3166c9..a558aca00e 100644 --- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb +++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb @@ -91,7 +91,7 @@ chip soc/amd/picasso end end - device mmio 0xfedca000 on + device ref uart_1 on chip drivers/uart/acpi register "name" = ""CRFP"" register "desc" = ""Fingerprint Reader"" -- cgit v1.2.3