Skip to content

Commit 3713c15

Browse files
committed
Merge pull-request openvelinux#62 -- 'velinux-kernel-intel/gnr-hide-iTCO-66' into intel-6.6-velinux
== Description This is to backport some i2c-i801 driver fix to hide iTCO on GNR platform since iTCO is not supported on GNR. == Test Without this patchset, velinux kernel will probe out an iTCO watchdog. With this patchset, velinux kernel will not probe the iTCO watchdog. Conflicts: drivers/i2c/busses/i2c-i801.c [jz: simple context conflicts]
2 parents 4eca6ac + 56817ec commit 3713c15

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/i2c/busses/i2c-i801.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ static const struct pci_device_id i801_ids[] = {
10511051
{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10521052
{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_SOC_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10531053
{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_PCH_S_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
1054-
{ PCI_DEVICE_DATA(INTEL, BIRCH_STREAM_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
1054+
{ PCI_DEVICE_DATA(INTEL, BIRCH_STREAM_SMBUS, FEATURES_ICH5) },
10551055
{ PCI_DEVICE_DATA(INTEL, ARROW_LAKE_H_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10561056
{ PCI_DEVICE_DATA(INTEL, PANTHER_LAKE_H_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },
10571057
{ PCI_DEVICE_DATA(INTEL, PANTHER_LAKE_P_SMBUS, FEATURES_ICH5 | FEATURE_TCO_CNL) },

0 commit comments

Comments
 (0)