diff options
author | Felix Held <felix-coreboot@felixheld.de> | 2021-06-15 20:57:04 +0200 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2021-06-17 14:21:58 +0000 |
commit | 361bb53aa2bb6314bf22690f5436af7c096d0e0a (patch) | |
tree | d0e4682ef6d9c644a4ab80de4a2ceb1eb3b7503c | |
parent | ddbc771524a2a127dd51f711b6d88b13884c2164 (diff) | |
download | coreboot-361bb53aa2bb6314bf22690f5436af7c096d0e0a.tar.gz coreboot-361bb53aa2bb6314bf22690f5436af7c096d0e0a.tar.bz2 coreboot-361bb53aa2bb6314bf22690f5436af7c096d0e0a.zip |
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 <felix-coreboot@felixheld.de>
Change-Id: I913a587802020ce4e182b48632cdde1104c2a6e6
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55545
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
9 files changed, 15 insertions, 23 deletions
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index 932d280b8081..862d20f79cec 100644 --- a/src/mainboard/amd/bilby/devicetree.cb +++ b/src/mainboard/amd/bilby/devicetree.cb @@ -165,9 +165,7 @@ chip soc/amd/picasso end end # domain - device mmio 0xfedc9000 on end # UART0 - device mmio 0xfedca000 on end # UART1 - device mmio 0xfedce000 off end # UART2 - device mmio 0xfedcf000 off end # UART3 + device ref uart_0 on end # console + device ref uart_1 on end end # chip soc/amd/picasso diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb index 6a1a3bc0a764..628ba64725c1 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -163,9 +163,7 @@ chip soc/amd/picasso end end # domain - device mmio 0xfedc9000 on end # UART0 - device mmio 0xfedca000 on end # UART1 - device mmio 0xfedce000 off end # UART2 - device mmio 0xfedcf000 off end # UART3 + device ref uart_0 on end # console + device ref uart_1 on end end # chip soc/amd/picasso diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb index a12d31872214..2aac1974648b 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -163,9 +163,7 @@ chip soc/amd/picasso end end # domain - device mmio 0xfedc9000 on end # UART0 - device mmio 0xfedca000 on end # UART1 - device mmio 0xfedce000 off end # UART2 - device mmio 0xfedcf000 off end # UART3 + device ref uart_0 on end # console + device ref uart_1 on end end # chip soc/amd/picasso diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index f17eca77ca1e..0cf969cf6a82 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 88fa36074366..637299b43dc4 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 04b966bc6b0e..fe2eadea615b 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 66e49f4db623..cfc9cb332048 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 a34d3166c915..a558aca00ecf 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"" diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb index 0c2fa6040c4a..1730f8d95a87 100644 --- a/src/soc/amd/picasso/chipset.cb +++ b/src/soc/amd/picasso/chipset.cb @@ -46,4 +46,8 @@ chip soc/amd/picasso device mmio 0xfedc4000 alias i2c_2 off end device mmio 0xfedc5000 alias i2c_3 off end + device mmio 0xfedc9000 alias uart_0 off end + device mmio 0xfedca000 alias uart_1 off end + device mmio 0xfedce000 alias uart_2 off end + device mmio 0xfedcf000 alias uart_3 off end end |