Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 766f905

Browse files
committedJun 14, 2023
platform/surface: aggregator_registry: Fix target-ID of base-hub
The target ID of the base hub is currently set to KIP (keyboard/ peripherals). However, even though it manages such devices with the KIP target ID, the base hub itself is actually accessed via the SAM target ID. So set it accordingly. Note that the target ID of the hub can be chosen arbitrarily and does not directly correspond to any physical or virtual component of the EC. This change is only a code improvement intended for consistency and clarity, it does not fix an actual bug. Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com> Link: https://lore.kernel.org/r/20221202223327.690880-10-luzmaximilian@gmail.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Patchset: surface-sam
1 parent 67338b7 commit 766f905

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎drivers/platform/surface/surface_aggregator_hub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ static const struct ssam_hub_desc kip_hub = {
349349

350350
static const struct ssam_device_id ssam_hub_match[] = {
351351
{ SSAM_VDEV(HUB, SAM, SSAM_SSH_TC_KIP, 0x00), (unsigned long)&kip_hub },
352-
{ SSAM_VDEV(HUB, KIP, SSAM_SSH_TC_BAS, 0x00), (unsigned long)&base_hub },
352+
{ SSAM_VDEV(HUB, SAM, SSAM_SSH_TC_BAS, 0x00), (unsigned long)&base_hub },
353353
{ }
354354
};
355355
MODULE_DEVICE_TABLE(ssam, ssam_hub_match);

‎drivers/platform/surface/surface_aggregator_registry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static const struct software_node ssam_node_hub_kip = {
4646

4747
/* Base device hub (devices attached to Surface Book 3 base). */
4848
static const struct software_node ssam_node_hub_base = {
49-
.name = "ssam:00:00:02:11:00",
49+
.name = "ssam:00:00:01:11:00",
5050
.parent = &ssam_node_root,
5151
};
5252

0 commit comments

Comments
 (0)
Please sign in to comment.