Skip to content

Commit b21468e

Browse files
charleskeepaxbroonie
authored andcommitted
ASoC: SDCA: Update list of entity_0 controls
Update the list of entity_0 controls to better match version v1.0 of the SDCA specification. Remove both INTSTAT_CLEAR and INT_ENABLE as these are no longer used, and add some missing controls and bits into the enum. Also rename the SDCA_CONTROL prefix to SDCA_CTL because this better matches the macros in the sdw_registers.h header, and the names can get quite long so saving a few characters is definitely a plus. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://patch.msgid.link/20250107154408.814455-3-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 7b16e60 commit b21468e

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

include/sound/sdca_function.h

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,31 @@ enum sdca_function_type {
4242
#define SDCA_FUNCTION_TYPE_HID_NAME "HID"
4343

4444
enum sdca_entity0_controls {
45-
SDCA_CONTROL_ENTITY_0_COMMIT_GROUP_MASK = 0x01,
46-
SDCA_CONTROL_ENTITY_0_INTSTAT_CLEAR = 0x02,
47-
SDCA_CONTROL_ENTITY_0_INT_ENABLE = 0x03,
48-
SDCA_CONTROL_ENTITY_0_FUNCTION_SDCA_VERSION = 0x04,
49-
SDCA_CONTROL_ENTITY_0_FUNCTION_TOPOLOGY = 0x05,
50-
SDCA_CONTROL_ENTITY_0_FUNCTION_MANUFACTURER_ID = 0x06,
51-
SDCA_CONTROL_ENTITY_0_FUNCTION_ID = 0x07,
52-
SDCA_CONTROL_ENTITY_0_FUNCTION_VERSION = 0x08
45+
SDCA_CTL_ENTITY_0_COMMIT_GROUP_MASK = 0x01,
46+
SDCA_CTL_ENTITY_0_FUNCTION_SDCA_VERSION = 0x04,
47+
SDCA_CTL_ENTITY_0_FUNCTION_TYPE = 0x05,
48+
SDCA_CTL_ENTITY_0_FUNCTION_MANUFACTURER_ID = 0x06,
49+
SDCA_CTL_ENTITY_0_FUNCTION_ID = 0x07,
50+
SDCA_CTL_ENTITY_0_FUNCTION_VERSION = 0x08,
51+
SDCA_CTL_ENTITY_0_FUNCTION_EXTENSION_ID = 0x09,
52+
SDCA_CTL_ENTITY_0_FUNCTION_EXTENSION_VERSION = 0x0A,
53+
SDCA_CTL_ENTITY_0_FUNCTION_STATUS = 0x10,
54+
SDCA_CTL_ENTITY_0_FUNCTION_ACTION = 0x11,
55+
SDCA_CTL_ENTITY_0_MATCHING_GUID = 0x12,
56+
SDCA_CTL_ENTITY_0_DEVICE_MANUFACTURER_ID = 0x2C,
57+
SDCA_CTL_ENTITY_0_DEVICE_PART_ID = 0x2D,
58+
SDCA_CTL_ENTITY_0_DEVICE_VERSION = 0x2E,
59+
SDCA_CTL_ENTITY_0_DEVICE_SDCA_VERSION = 0x2F,
60+
61+
/* Function Status Bits */
62+
SDCA_CTL_ENTITY_0_DEVICE_NEWLY_ATTACHED = BIT(0),
63+
SDCA_CTL_ENTITY_0_INTS_DISABLED_ABNORMALLY = BIT(1),
64+
SDCA_CTL_ENTITY_0_STREAMING_STOPPED_ABNORMALLY = BIT(2),
65+
SDCA_CTL_ENTITY_0_FUNCTION_FAULT = BIT(3),
66+
SDCA_CTL_ENTITY_0_UMP_SEQUENCE_FAULT = BIT(4),
67+
SDCA_CTL_ENTITY_0_FUNCTION_NEEDS_INITIALIZATION = BIT(5),
68+
SDCA_CTL_ENTITY_0_FUNCTION_HAS_BEEN_RESET = BIT(6),
69+
SDCA_CTL_ENTITY_0_FUNCTION_BUSY = BIT(7),
5370
};
5471

5572
#endif

0 commit comments

Comments
 (0)