diff options
9 files changed, 15 insertions, 23 deletions
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index 932d280b80..862d20f79c 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 6a1a3bc0a7..628ba64725 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 a12d318722..2aac197464 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 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"" diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb index 0c2fa6040c..1730f8d95a 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 |