Unverified Commit f236c07e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15292 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.56-6.6.57 LTS Conflicts Patches 

Merge Pull Request from: @koishimind 
 
Submit after modification(1):
HID: mcp2200: added driver for GPIOs of MCP2200

Analyze these commit,but not merged(10):
1.scsi: Remove scsi device no_start_on_resume flag
2.scsi: sd: Do not repeat the starting disk message
3.ext4: don't set SB_RDONLY after filesystem errors
4.scsi: Revert "scsi: sd: Do not repeat the starting disk message"
[2] depend of [1], but [2] revert by [4],
so no need to merge 1/2/4.
[3] is reverted and analyze in the Link:
https://gitee.com/openeuler/kernel/issues/IBEQJ3

Not merged because KABI break:
5.phonet: Handle error of rtnl_register_module().
6.phonet: no longer hold RTNL in route_dumpit()
7.mpls: Handle error of rtnl_register_module().
8.mpls: no longer hold RTNL in mpls_netconf_dump_devconf()
9.rtnetlink: add RTNL_FLAG_DUMP_UNLOCKED flag
10.rtnetlink: change nlk->cb_mutex role
KABI not reserved in netlink_sock.
Is worth to use KABI_REPLACE macro to merge?

 
 
Link:https://gitee.com/openeuler/kernel/pulls/15292

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 4e9f5801 211f9e74

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -5769,6 +5769,7 @@ CONFIG_HID_ZYDACRON=m 
CONFIG_HID_SENSOR_HUB=m

CONFIG_HID_SENSOR_HUB=m

# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set

# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set

# CONFIG_HID_ALPS is not set

# CONFIG_HID_ALPS is not set

# CONFIG_HID_MCP2200 is not set

# CONFIG_HID_MCP2221 is not set

# CONFIG_HID_MCP2221 is not set

# end of Special HID drivers

# end of Special HID drivers

arch/powerpc/configs/openeuler_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -5228,6 +5228,7 @@ CONFIG_HID_ZEROPLUS=m 
CONFIG_HID_ZYDACRON=m

CONFIG_HID_ZYDACRON=m

# CONFIG_HID_SENSOR_HUB is not set

# CONFIG_HID_SENSOR_HUB is not set

CONFIG_HID_ALPS=m

CONFIG_HID_ALPS=m

# CONFIG_HID_MCP2200 is not set

# CONFIG_HID_MCP2221 is not set

# CONFIG_HID_MCP2221 is not set

# end of Special HID drivers

# end of Special HID drivers

arch/riscv/configs/openeuler_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -5243,6 +5243,7 @@ CONFIG_HID_ZYDACRON=m 
CONFIG_HID_SENSOR_HUB=m

CONFIG_HID_SENSOR_HUB=m

# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set

# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set

# CONFIG_HID_ALPS is not set

# CONFIG_HID_ALPS is not set

# CONFIG_HID_MCP2200 is not set

# CONFIG_HID_MCP2221 is not set

# CONFIG_HID_MCP2221 is not set

# end of Special HID drivers

# end of Special HID drivers

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -6472,6 +6472,7 @@ CONFIG_HID_ZYDACRON=m 
CONFIG_HID_SENSOR_HUB=y

CONFIG_HID_SENSOR_HUB=y

CONFIG_HID_SENSOR_CUSTOM_SENSOR=m

CONFIG_HID_SENSOR_CUSTOM_SENSOR=m

CONFIG_HID_ALPS=m

CONFIG_HID_ALPS=m

# CONFIG_HID_MCP2200 is not set

# CONFIG_HID_MCP2221 is not set

# CONFIG_HID_MCP2221 is not set

# end of Special HID drivers

# end of Special HID drivers

drivers/hid/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -1300,6 +1300,15 @@ config HID_ALPS 
	Say Y here if you have a Alps touchpads over i2c-hid or usbhid

	Say Y here if you have a Alps touchpads over i2c-hid or usbhid

	and want support for its special functionalities.

	and want support for its special functionalities.





config HID_MCP2200

	tristate "Microchip MCP2200 HID USB-to-GPIO bridge"

	depends on USB_HID && GPIOLIB

	help

	  Provides GPIO functionality over USB-HID through MCP2200 device.



	  To compile this driver as a module, choose M here: the module

	  will be called hid-mcp2200.ko.



config HID_MCP2221

config HID_MCP2221

	tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"

	tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"

	depends on USB_HID && I2C

	depends on USB_HID && I2C