diff --git a/src/mainboard/system76/cml-u/Kconfig b/src/mainboard/system76/cml-u/Kconfig index 29597d6531..f63bfc579f 100644 --- a/src/mainboard/system76/cml-u/Kconfig +++ b/src/mainboard/system76/cml-u/Kconfig @@ -34,6 +34,10 @@ config VARIANT_DIR default "galp4" if BOARD_SYSTEM76_GALP4 default "darp6" if BOARD_SYSTEM76_DARP6 +config OVERRIDE_DEVICETREE + string + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + config MAINBOARD_PART_NUMBER string default "galp4" if BOARD_SYSTEM76_GALP4 diff --git a/src/mainboard/system76/cml-u/devicetree.cb b/src/mainboard/system76/cml-u/devicetree.cb index 78f0d79ab9..bbd802beb0 100644 --- a/src/mainboard/system76/cml-u/devicetree.cb +++ b/src/mainboard/system76/cml-u/devicetree.cb @@ -218,16 +218,7 @@ chip soc/intel/cannonlake device pci 14.3 on end # CNVi wifi #end device pci 14.5 off end # SDCard - device pci 15.0 on - chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" - register "generic.desc" = ""Synaptics Touchpad"" - register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" - register "generic.probed" = "1" - register "hid_desc_reg_offset" = "0x20" - device i2c 2c on end - end - end # I2C #0 + device pci 15.0 on end # I2C #0 device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 diff --git a/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb b/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb new file mode 100644 index 0000000000..6bbb67d540 --- /dev/null +++ b/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb @@ -0,0 +1,14 @@ +chip soc/intel/cannonlake + device domain 0 on + device pci 15.0 on + chip drivers/i2c/hid + register "generic.hid" = ""PNP0C50"" + register "generic.desc" = ""Synaptics Touchpad"" + register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" + register "generic.probed" = "1" + register "hid_desc_reg_offset" = "0x20" + device i2c 2c on end + end + end # I2C #0 + end +end diff --git a/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb b/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb new file mode 100644 index 0000000000..986c7b9a6d --- /dev/null +++ b/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb @@ -0,0 +1,7 @@ +chip soc/intel/cannonlake + device domain 0 on + device pci 15.0 on + # I2C HID not supported on galp4 + end # I2C #0 + end +end diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig index 5033734b9e..99a17100b6 100644 --- a/src/mainboard/system76/whl-u/Kconfig +++ b/src/mainboard/system76/whl-u/Kconfig @@ -34,6 +34,10 @@ config VARIANT_DIR default "galp3-c" if BOARD_SYSTEM76_GALP3_C default "darp5" if BOARD_SYSTEM76_DARP5 +config OVERRIDE_DEVICETREE + string + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + config MAINBOARD_PART_NUMBER string default "galp3-c" if BOARD_SYSTEM76_GALP3_C diff --git a/src/mainboard/system76/whl-u/devicetree.cb b/src/mainboard/system76/whl-u/devicetree.cb index 78f0d79ab9..bbd802beb0 100644 --- a/src/mainboard/system76/whl-u/devicetree.cb +++ b/src/mainboard/system76/whl-u/devicetree.cb @@ -218,16 +218,7 @@ chip soc/intel/cannonlake device pci 14.3 on end # CNVi wifi #end device pci 14.5 off end # SDCard - device pci 15.0 on - chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" - register "generic.desc" = ""Synaptics Touchpad"" - register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" - register "generic.probed" = "1" - register "hid_desc_reg_offset" = "0x20" - device i2c 2c on end - end - end # I2C #0 + device pci 15.0 on end # I2C #0 device pci 15.1 off end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 diff --git a/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb b/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb new file mode 100644 index 0000000000..6bbb67d540 --- /dev/null +++ b/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb @@ -0,0 +1,14 @@ +chip soc/intel/cannonlake + device domain 0 on + device pci 15.0 on + chip drivers/i2c/hid + register "generic.hid" = ""PNP0C50"" + register "generic.desc" = ""Synaptics Touchpad"" + register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_C23_IRQ)" + register "generic.probed" = "1" + register "hid_desc_reg_offset" = "0x20" + device i2c 2c on end + end + end # I2C #0 + end +end diff --git a/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb b/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb new file mode 100644 index 0000000000..a57b732a28 --- /dev/null +++ b/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb @@ -0,0 +1,7 @@ +chip soc/intel/cannonlake + device domain 0 on + device pci 15.0 on + # I2C HID not supported on galp3-c + end # I2C #0 + end +end