From 97fc054979d709bd84861e046b451cf2abc97fbc Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 15 Jun 2021 20:02:27 +0200 Subject: soc/amd/picasso: introduce and use devicetree aliases for I2C2&I2C3 Signed-off-by: Felix Held Change-Id: I06102f4fcc3bf9de332c71a52c632241b95cde19 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55543 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb | 2 +- src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb | 2 +- src/mainboard/google/zork/variants/berknip/overridetree.cb | 2 +- src/mainboard/google/zork/variants/dalboz/overridetree.cb | 2 +- src/mainboard/google/zork/variants/dirinboz/overridetree.cb | 2 +- src/mainboard/google/zork/variants/ezkinil/overridetree.cb | 2 +- src/mainboard/google/zork/variants/gumboz/overridetree.cb | 2 +- src/mainboard/google/zork/variants/morphius/overridetree.cb | 2 +- src/mainboard/google/zork/variants/shuboz/overridetree.cb | 2 +- src/mainboard/google/zork/variants/trembyle/overridetree.cb | 2 +- src/mainboard/google/zork/variants/vilboz/overridetree.cb | 2 +- src/mainboard/google/zork/variants/woomax/overridetree.cb | 2 +- src/soc/amd/picasso/chipset.cb | 3 +++ 13 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index f3ad3295f3fd..aa70616a9418 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -386,7 +386,7 @@ chip soc/amd/picasso end end # domain - device mmio 0xfedc5000 on + device ref i2c_3 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" register "desc" = ""Cr50 TPM"" diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 364458b2e4fb..3bf6fbc4290e 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -428,7 +428,7 @@ chip soc/amd/picasso device generic 0.1 on end end - device mmio 0xfedc5000 on + device ref i2c_3 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" register "desc" = ""Cr50 TPM"" diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb index 0df7bcf6a71e..04b966bc6b0e 100644 --- a/src/mainboard/google/zork/variants/berknip/overridetree.cb +++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb @@ -98,7 +98,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/mainboard/google/zork/variants/dalboz/overridetree.cb b/src/mainboard/google/zork/variants/dalboz/overridetree.cb index c28131043008..c2f0baf24b0e 100644 --- a/src/mainboard/google/zork/variants/dalboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/dalboz/overridetree.cb @@ -42,7 +42,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on # APU_I2C2_BASE + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""RAYD0001"" register "desc" = ""Raydium Touchscreen"" diff --git a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb index 5675487c709b..d496de278eb4 100644 --- a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb @@ -107,7 +107,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on # APU_I2C2_BASE + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb index 2545e5b5916e..51e26c8051da 100644 --- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb +++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb @@ -80,7 +80,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/mainboard/google/zork/variants/gumboz/overridetree.cb b/src/mainboard/google/zork/variants/gumboz/overridetree.cb index 5675487c709b..d496de278eb4 100644 --- a/src/mainboard/google/zork/variants/gumboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/gumboz/overridetree.cb @@ -107,7 +107,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on # APU_I2C2_BASE + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb index 8d4053990567..66e49f4db623 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -74,7 +74,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/mainboard/google/zork/variants/shuboz/overridetree.cb b/src/mainboard/google/zork/variants/shuboz/overridetree.cb index 704706241d92..459b3ce54109 100644 --- a/src/mainboard/google/zork/variants/shuboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/shuboz/overridetree.cb @@ -53,7 +53,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on # APU_I2C2_BASE + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb index b9121eb824d2..a34d3166c915 100644 --- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb +++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb @@ -46,7 +46,7 @@ chip soc/amd/picasso subsystemid 0x1022 0x1510 inherit end # domain - device mmio 0xfedc4000 on + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb index 5469b32c673c..44ad0a44edd1 100644 --- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb @@ -229,7 +229,7 @@ chip soc/amd/picasso end end # domain - device mmio 0xfedc4000 on # APU_I2C2_BASE + device ref i2c_2 on chip drivers/i2c/hid register "generic.hid" = ""GDIX0000"" register "generic.desc" = ""Goodix Touchscreen"" diff --git a/src/mainboard/google/zork/variants/woomax/overridetree.cb b/src/mainboard/google/zork/variants/woomax/overridetree.cb index 3cab541498ba..20d4783a9b9b 100644 --- a/src/mainboard/google/zork/variants/woomax/overridetree.cb +++ b/src/mainboard/google/zork/variants/woomax/overridetree.cb @@ -82,7 +82,7 @@ chip soc/amd/picasso end end # domain - device mmio 0xfedc4000 on + device ref i2c_2 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb index 906b18d0aa53..0c2fa6040c4a 100644 --- a/src/soc/amd/picasso/chipset.cb +++ b/src/soc/amd/picasso/chipset.cb @@ -43,4 +43,7 @@ chip soc/amd/picasso device pci 18.6 alias data_fabric_6 on end device pci 18.7 alias data_fabric_7 on end end + + device mmio 0xfedc4000 alias i2c_2 off end + device mmio 0xfedc5000 alias i2c_3 off end end -- cgit v1.2.3