Merge tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the large set of char and misc and other driver subsystem patches for 5.9-rc1. Lots of new driver submissions in here, and cleanups and features for existing drivers. Highlights are: - habanalabs driver updates - coresight driver updates - nvmem driver updates - huge number of "W=1" build warning cleanups from Lee Jones - dyndbg updates - virtbox driver fixes and updates - soundwire driver updates - mei driver updates - phy driver updates - fpga driver updates - lots of smaller individual misc/char driver cleanups and fixes Full details are in the shortlog. All of these have been in linux-next with no reported issues" * tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (322 commits) habanalabs: remove unused but set variable 'ctx_asid' nvmem: qcom-spmi-sdam: Enable multiple devices dt-bindings: nvmem: SID: add binding for A100's SID controller nvmem: update Kconfig description nvmem: qfprom: Add fuse blowing support dt-bindings: nvmem: Add properties needed for blowing fuses dt-bindings: nvmem: qfprom: Convert to yaml nvmem: qfprom: use NVMEM_DEVID_AUTO for multiple instances nvmem: core: add support to auto devid nvmem: core: Add nvmem_cell_read_u8() nvmem: core: Grammar fixes for help text nvmem: sc27xx: add sc2730 efuse support nvmem: Enforce nvmem stride in the sysfs interface MAINTAINERS: Add git tree for NVMEM FRAMEWORK nvmem: sprd: Fix return value of sprd_efuse_probe() drivers: android: Fix the SPDX comment style drivers: android: Fix a variable declaration coding style issue drivers: android: Remove braces for a single statement if-else block drivers: android: Remove the use of else after return drivers: android: Fix a variable declaration coding style issue ...
This commit is contained in:
@@ -216,6 +216,8 @@ int main(void)
|
||||
DEVID(sdw_device_id);
|
||||
DEVID_FIELD(sdw_device_id, mfg_id);
|
||||
DEVID_FIELD(sdw_device_id, part_id);
|
||||
DEVID_FIELD(sdw_device_id, sdw_version);
|
||||
DEVID_FIELD(sdw_device_id, class_id);
|
||||
|
||||
DEVID(fsl_mc_device_id);
|
||||
DEVID_FIELD(fsl_mc_device_id, vendor);
|
||||
|
@@ -1258,15 +1258,19 @@ static int do_hda_entry(const char *filename, void *symval, char *alias)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Looks like: sdw:mNpN */
|
||||
/* Looks like: sdw:mNpNvNcN */
|
||||
static int do_sdw_entry(const char *filename, void *symval, char *alias)
|
||||
{
|
||||
DEF_FIELD(symval, sdw_device_id, mfg_id);
|
||||
DEF_FIELD(symval, sdw_device_id, part_id);
|
||||
DEF_FIELD(symval, sdw_device_id, sdw_version);
|
||||
DEF_FIELD(symval, sdw_device_id, class_id);
|
||||
|
||||
strcpy(alias, "sdw:");
|
||||
ADD(alias, "m", mfg_id != 0, mfg_id);
|
||||
ADD(alias, "p", part_id != 0, part_id);
|
||||
ADD(alias, "v", sdw_version != 0, sdw_version);
|
||||
ADD(alias, "c", class_id != 0, class_id);
|
||||
|
||||
add_wildcard(alias);
|
||||
return 1;
|
||||
|
Reference in New Issue
Block a user