Commit 13eca7d7 authored by Maximilian Luz's avatar Maximilian Luz Committed by Hans de Goede
Browse files

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: default avatarMaximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20221202223327.690880-10-luzmaximilian@gmail.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 78abf1b5

drivers/platform/surface/surface_aggregator_hub.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static const struct ssam_hub_desc kip_hub = { 


static const struct ssam_device_id ssam_hub_match[] = {

	{ SSAM_VDEV(HUB, SAM, SSAM_SSH_TC_KIP, 0x00), (unsigned long)&kip_hub  },

	{ SSAM_VDEV(HUB, KIP, SSAM_SSH_TC_BAS, 0x00), (unsigned long)&base_hub },

	{ SSAM_VDEV(HUB, SAM, SSAM_SSH_TC_BAS, 0x00), (unsigned long)&base_hub },

	{ }

};

MODULE_DEVICE_TABLE(ssam, ssam_hub_match);

drivers/platform/surface/surface_aggregator_registry.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const struct software_node ssam_node_hub_kip = { 


/* Base device hub (devices attached to Surface Book 3 base). */

static const struct software_node ssam_node_hub_base = {

	.name = "ssam:00:00:02:11:00",

	.name = "ssam:00:00:01:11:00",

	.parent = &ssam_node_root,

};