Commit bc9527fb authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'intel-pinctrl-v6.15-1' of... 

Merge tag 'intel-pinctrl-v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel

 into devel

intel-pinctrl for v6.15-1

* Introduce devm_kmemdup_array() and convert Intel pin control drivers
* Update PWM handling for the cases when it's provided by Intel pin control
* Miscellaneous fixes, updates, and cleanups

The following is an automated git shortlog grouped by driver:

baytrail:
 -  copy communities using devm_kmemdup_array()
 -  Use dedicated helpers for chained IRQ handlers

cherryview:
 -  use devm_kmemdup_array()

devres:
 -  Introduce devm_kmemdup_array()

driver core:
 -  Split devres APIs to device/devres.h

err.h:
 -  move IOMEM_ERR_PTR() to err.h

iio:
 -  adc: xilinx-xadc-core: use devm_kmemdup_array()
 -  imu: st_lsm9ds0: Replace device.h with what is needed

input:
 -  ipaq-micro-keys: use devm_kmemdup_array()
 -  sparse-keymap: use devm_kmemdup_array()

intel:
 -  drop repeated config dependency
 -  copy communities using devm_kmemdup_array()
 -  Fix wrong bypass assignment in intel_pinctrl_probe_pwm()
 -  Import PWM_LPSS namespace for devm_pwm_lpss_probe()

lynxpoint:
 -  Use dedicated helpers for chained IRQ handlers

MAINTAINERS:
 -  Add pin control and GPIO to the Intel MID record

pwm:
 -  lpss: Clarify the bypass member semantics in struct pwm_lpss_boardinfo
 -  lpss: Actually use a module namespace by defining the namespace earlier

pxa2xx:
 -  use devm_kmemdup_array()

tangier:
 -  use devm_kmemdup_array()

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 7dadc4b1 0ee2261d

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -11848,12 +11848,19 @@ S: Supported 
F:	arch/x86/include/asm/intel-mid.h

F:	arch/x86/pci/intel_mid_pci.c

F:	arch/x86/platform/intel-mid/

F:	drivers/dma/hsu/

F:	drivers/extcon/extcon-intel-mrfld.c

F:	drivers/gpio/gpio-merrifield.c

F:	drivers/gpio/gpio-tangier.*

F:	drivers/iio/adc/intel_mrfld_adc.c

F:	drivers/mfd/intel_soc_pmic_mrfld.c

F:	drivers/pinctrl/intel/pinctrl-merrifield.c

F:	drivers/pinctrl/intel/pinctrl-moorefield.c

F:	drivers/pinctrl/intel/pinctrl-tangier.*

F:	drivers/platform/x86/intel/mrfld_pwrbtn.c

F:	drivers/platform/x86/intel_scu_*

F:	drivers/staging/media/atomisp/

F:	drivers/tty/serial/8250/8250_mid.c

F:	drivers/watchdog/intel-mid_wdt.c

F:	include/linux/mfd/intel_soc_pmic_mrfld.h

F:	include/linux/platform_data/x86/intel-mid_wdt.h

drivers/iio/adc/xilinx-xadc-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1245,8 +1245,8 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, unsigned int *conf, int irq) 
		channel_templates = xadc_us_channels;

		max_channels = ARRAY_SIZE(xadc_us_channels);

	}

	channels = devm_kmemdup(dev, channel_templates,

				sizeof(channels[0]) * max_channels, GFP_KERNEL);

	channels = devm_kmemdup_array(dev, channel_templates, max_channels,

				      sizeof(*channel_templates), GFP_KERNEL);

	if (!channels)

		return -ENOMEM;

drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

 */



#include <linux/device.h>

#include <linux/device/devres.h>

#include <linux/err.h>

#include <linux/gfp_types.h>

#include <linux/i2c.h>

drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

 */



#include <linux/device.h>

#include <linux/device/devres.h>

#include <linux/err.h>

#include <linux/gfp_types.h>

#include <linux/module.h>

drivers/input/keyboard/ipaq-micro-keys.c

+2 −3
Original line number Diff line number Diff line
@@ -102,9 +102,8 @@ static int micro_key_probe(struct platform_device *pdev) 


	keys->input->keycodesize = sizeof(micro_keycodes[0]);

	keys->input->keycodemax = ARRAY_SIZE(micro_keycodes);

	keys->codes = devm_kmemdup(&pdev->dev, micro_keycodes,

			   keys->input->keycodesize * keys->input->keycodemax,

			   GFP_KERNEL);

	keys->codes = devm_kmemdup_array(&pdev->dev, micro_keycodes, keys->input->keycodemax,

					 keys->input->keycodesize, GFP_KERNEL);

	if (!keys->codes)

		return -ENOMEM;