Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson. Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55545 )
Change subject: soc/amd/picasso: introduce and use devicetree aliases for UART0-3 ......................................................................
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 --- M src/mainboard/amd/bilby/devicetree.cb M src/mainboard/amd/mandolin/variants/cereme/devicetree.cb M src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb M src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb M src/mainboard/google/zork/variants/berknip/overridetree.cb M src/mainboard/google/zork/variants/morphius/overridetree.cb M src/mainboard/google/zork/variants/trembyle/overridetree.cb M src/soc/amd/picasso/chipset.cb 9 files changed, 15 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/55545/1
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index 932d280..6e76658 100644 --- a/src/mainboard/amd/bilby/devicetree.cb +++ b/src/mainboard/amd/bilby/devicetree.cb @@ -165,9 +165,7 @@ 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 # 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 6a1a3bc..628ba64 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -163,9 +163,7 @@ 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 a12d318..2aac197 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -163,9 +163,7 @@ 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 f17eca7..8d60b20 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 @@ 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 # 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 88fa360..86d7149 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 @@ 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 # 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 04b966b..fe2eade 100644 --- a/src/mainboard/google/zork/variants/berknip/overridetree.cb +++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb @@ -158,7 +158,7 @@ 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 66e49f4..cfc9cb3 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -123,7 +123,7 @@ 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 a34d316..a558aca 100644 --- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb +++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb @@ -91,7 +91,7 @@ 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 0c2fa60..1730f8d 100644 --- a/src/soc/amd/picasso/chipset.cb +++ b/src/soc/amd/picasso/chipset.cb @@ -46,4 +46,8 @@
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