Commit e3572dff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes for 5.15-rc6 for reported
  issues that include:

   - habanalabs driver fixes

   - mei driver fixes and new ids

   - fpga new device ids

   - MAINTAINER file updates for fpga subsystem

   - spi module id table additions and fixes

   - fastrpc locking fixes

   - nvmem driver fix

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  eeprom: 93xx46: fix MODULE_DEVICE_TABLE
  nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells
  mei: hbm: drop hbm responses on early shutdown
  mei: me: add Ice Lake-N device id.
  eeprom: 93xx46: Add SPI device ID table
  eeprom: at25: Add SPI ID table
  misc: HI6421V600_IRQ should depend on HAS_IOMEM
  misc: fastrpc: Add missing lock before accessing find_vma()
  cb710: avoid NULL pointer subtraction
  misc: gehc: Add SPI ID table
  MAINTAINERS: Drop outdated FPGA Manager website
  MAINTAINERS: Add Hao and Yilun as maintainers
  habanalabs: fix resetting args in wait for CS IOCTL
  fpga: ice40-spi: Add SPI device ID table
parents a563ae0f f4275272

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7343,10 +7343,11 @@ F: include/uapi/linux/fpga-dfl.h 








FPGA MANAGER FRAMEWORK









M:	Moritz Fischer <mdf@kernel.org>









M:	Wu Hao <hao.wu@intel.com>









M:	Xu Yilun <yilun.xu@intel.com>









R:	Tom Rix <trix@redhat.com>









L:	linux-fpga@vger.kernel.org









S:	Maintained









W:	http://www.rocketboards.org









Q:	http://patchwork.kernel.org/project/linux-fpga/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git









F:	Documentation/devicetree/bindings/fpga/
































drivers/fpga/ice40-spi.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -192,12 +192,19 @@ static const struct of_device_id ice40_fpga_of_match[] = {







};









MODULE_DEVICE_TABLE(of, ice40_fpga_of_match);



















static const struct spi_device_id ice40_fpga_spi_ids[] = {









	{ .name = "ice40-fpga-mgr", },









	{},









};









MODULE_DEVICE_TABLE(spi, ice40_fpga_spi_ids);



















static struct spi_driver ice40_fpga_driver = {









	.probe = ice40_fpga_probe,









	.driver = {









		.name = "ice40spi",









		.of_match_table = of_match_ptr(ice40_fpga_of_match),









	},









	.id_table = ice40_fpga_spi_ids,









};



















module_spi_driver(ice40_fpga_driver);
































drivers/misc/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -224,6 +224,7 @@ config HI6421V600_IRQ







	tristate "HiSilicon Hi6421v600 IRQ and powerkey"









	depends on OF









	depends on SPMI









	depends on HAS_IOMEM









	select MFD_CORE









	select REGMAP_SPMI









	help
































drivers/misc/cb710/sgbuf2.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -47,7 +47,7 @@ static inline bool needs_unaligned_copy(const void *ptr)







#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS









	return false;









#else









	return ((ptr - NULL) & 3) != 0;









	return ((uintptr_t)ptr & 3) != 0;









#endif









}










































drivers/misc/eeprom/at25.c



+8
−0






























Original line number
Diff line number
Diff line







@@ -366,6 +366,13 @@ static const struct of_device_id at25_of_match[] = {







};









MODULE_DEVICE_TABLE(of, at25_of_match);



















static const struct spi_device_id at25_spi_ids[] = {









	{ .name = "at25",},









	{ .name = "fm25",},









	{ }









};









MODULE_DEVICE_TABLE(spi, at25_spi_ids);



















static int at25_probe(struct spi_device *spi)









{









	struct at25_data	*at25 = NULL;








@@ -491,6 +498,7 @@ static struct spi_driver at25_driver = {







		.dev_groups	= sernum_groups,









	},









	.probe		= at25_probe,









	.id_table	= at25_spi_ids,









};



















module_spi_driver(at25_driver);