[5.15-velinux] Intel: Backport driver fix to hide iTCO on GNR#61
Closed
x56Jason wants to merge 4 commits into5.15-velinuxfrom
Closed
[5.15-velinux] Intel: Backport driver fix to hide iTCO on GNR#61x56Jason wants to merge 4 commits into5.15-velinuxfrom
x56Jason wants to merge 4 commits into5.15-velinuxfrom
Conversation
commit 76eb4db upstream. Add PCI ID of SMBus controller on Intel Ice Lake PCH-N. The device can be found on MacBookPro16,2 [1]. [1]: https://linux-hardware.org/?probe=f1c5cf0c43 Intel-SIG: commit 76eb4db i2c: i801: Add support for Intel Ice Lake PCH-N Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Wolfram Sang <wsa@kernel.org> Signed-off-by: Jason Zeng <jason.zeng@intel.com>
commit 41acd4b upstream. Reduce source code and code size by defining the chip features statically. Intel-SIG: commit 41acd4b i2c: i801: Improve handling of chip-specific feature definitions Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Jean Delvare <jdelvare@suse.de> Tested-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Wolfram Sang <wsa@kernel.org> Conflicts: drivers/i2c/busses/i2c-i801.c [jz: resolve conflict due to BIRCH_STREAM support merged first] Signed-off-by: Jason Zeng <jason.zeng@intel.com>
commit eb9c18b upstream. Indent data field in the i801_ids table by one tab to make more space for longer device names. Intel-SIG: commit eb9c18b i2c: i801: Enlarge device name field in i801_ids table Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Wolfram Sang <wsa@kernel.org> Conflicts: drivers/i2c/busses/i2c-i801.c [jz: resolve conflicts due to BIRCH_STREAM support merged first and some client platform support not merged] Signed-off-by: Jason Zeng <jason.zeng@intel.com>
commit 664596bd98bb251dd417dfd3f9b615b661e1e44a upstream. Hide the Intel Birch Stream SoC TCO WDT feature since it was removed. On platforms with PCH TCO WDT, this redundant device might be rendering errors like this: [ 28.144542] sysfs: cannot create duplicate filename '/bus/platform/devices/iTCO_wdt' Intel-SIG: commit 664596bd98bb i2c: i801: Hide Intel Birch Stream SoC TCO WDT Fixes: 8c56f9e ("i2c: i801: Add support for Intel Birch Stream SoC") Link: https://bugzilla.kernel.org/show_bug.cgi?id=220320 Signed-off-by: Chiasheng Lee <chiasheng.lee@linux.intel.com> Cc: <stable@vger.kernel.org> # v6.7+ Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@kernel.org> Link: https://lore.kernel.org/r/20250901125943.916522-1-chiasheng.lee@linux.intel.com Conflicts: drivers/i2c/busses/i2c-i801.c [jz: resolve conflicts due to some client platform support not merged] Signed-off-by: Jason Zeng <jason.zeng@intel.com>
Collaborator
|
The MR is already merged locally. Close it here. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This is to backport some i2c-i801 driver fix to hide iTCO on GNR platform since iTCO is not supported on GNR.
Test