Commit 1d4345eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging and IIO driver fixes from Greg KH:
 "Some small staging and IIO driver fixes:

   - MAINTAINERS changes for the move of the staging mailing list

   - comedi driver fixes to get request_irq() to work correctly

   - counter driver fixes for reported issues with iio devices

   - tiny iio driver fixes for reported issues.

  All of these have been in linux-next with no reported problems"

* tag 'staging-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vt665x: fix alignment constraints
  staging: comedi: cb_pcidas64: fix request_irq() warn
  staging: comedi: cb_pcidas: fix request_irq() warn
  MAINTAINERS: move the staging subsystem to lists.linux.dev
  MAINTAINERS: move some real subsystems off of the staging mailing list
  iio: gyro: mpu3050: Fix error handling in mpu3050_trigger_handler
  iio: hid-sensor-temperature: Fix issues of timestamp channel
  iio: hid-sensor-humidity: Fix alignment issue of timestamp channel
  counter: stm32-timer-cnt: fix ceiling miss-alignment with reload register
  counter: stm32-timer-cnt: fix ceiling write max value
  counter: stm32-timer-cnt: Report count function when SLAVE_MODE_DISABLED
  iio: adc: ab8500-gpadc: Fix off by 10 to 3
  iio:adc:stm32-adc: Add HAS_IOMEM dependency
  iio: adis16400: Fix an error code in adis16400_initial_setup()
  iio: adc: adi-axi-adc: add proper Kconfig dependencies
  iio: adc: ad7949: fix wrong ADC result due to incorrect bit mask
  iio: hid-sensor-prox: Fix scale not correct issue
  iio:adc:qcom-spmi-vadc: add default scale to LR_MUX2_BAT_ID channel
parents 3001c355 2cafd46a

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ M: Joel Fernandes <joel@joelfernandes.org> 
M:	Christian Brauner <christian@brauner.io>

M:	Hridya Valsaraju <hridya@google.com>

M:	Suren Baghdasaryan <surenb@google.com>

L:	devel@driverdev.osuosl.org

L:	linux-kernel@vger.kernel.org

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

F:	drivers/android/
@@ -8116,7 +8116,6 @@ F: drivers/crypto/hisilicon/sec2/sec_main.c 








HISILICON STAGING DRIVERS FOR HIKEY 960/970









M:	Mauro Carvalho Chehab <mchehab+huawei@kernel.org>









L:	devel@driverdev.osuosl.org









S:	Maintained









F:	drivers/staging/hikey9xx/
















@@ -17040,7 +17039,7 @@ F:	drivers/staging/vt665?/















STAGING SUBSYSTEM









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









L:	devel@driverdev.osuosl.org









L:	linux-staging@lists.linux.dev









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git









F:	drivers/staging/








@@ -19135,7 +19134,7 @@ VME SUBSYSTEM







M:	Martyn Welch <martyn@welchs.me.uk>









M:	Manohar Vanga <manohar.vanga@gmail.com>









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









L:	devel@driverdev.osuosl.org









L:	linux-kernel@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git









F:	Documentation/driver-api/vme.rst

























drivers/counter/stm32-timer-cnt.c



+33
−22






























Original line number
Diff line number
Diff line







@@ -31,7 +31,7 @@ struct stm32_timer_cnt {







	struct counter_device counter;









	struct regmap *regmap;









	struct clk *clk;









	u32 ceiling;









	u32 max_arr;









	bool enabled;









	struct stm32_timer_regs bak;









};








@@ -44,13 +44,14 @@ struct stm32_timer_cnt {







 * @STM32_COUNT_ENCODER_MODE_3: counts on both TI1FP1 and TI2FP2 edges









 */









enum stm32_count_function {









	STM32_COUNT_SLAVE_MODE_DISABLED = -1,









	STM32_COUNT_SLAVE_MODE_DISABLED,









	STM32_COUNT_ENCODER_MODE_1,









	STM32_COUNT_ENCODER_MODE_2,









	STM32_COUNT_ENCODER_MODE_3,









};



















static enum counter_count_function stm32_count_functions[] = {









	[STM32_COUNT_SLAVE_MODE_DISABLED] = COUNTER_COUNT_FUNCTION_INCREASE,









	[STM32_COUNT_ENCODER_MODE_1] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A,









	[STM32_COUNT_ENCODER_MODE_2] = COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B,









	[STM32_COUNT_ENCODER_MODE_3] = COUNTER_COUNT_FUNCTION_QUADRATURE_X4,








@@ -73,8 +74,10 @@ static int stm32_count_write(struct counter_device *counter,







			     const unsigned long val)









{









	struct stm32_timer_cnt *const priv = counter->priv;









	u32 ceiling;



















	if (val > priv->ceiling)









	regmap_read(priv->regmap, TIM_ARR, &ceiling);









	if (val > ceiling)









		return -EINVAL;



















	return regmap_write(priv->regmap, TIM_CNT, val);








@@ -90,6 +93,9 @@ static int stm32_count_function_get(struct counter_device *counter,







	regmap_read(priv->regmap, TIM_SMCR, &smcr);



















	switch (smcr & TIM_SMCR_SMS) {









	case 0:









		*function = STM32_COUNT_SLAVE_MODE_DISABLED;









		return 0;









	case 1:









		*function = STM32_COUNT_ENCODER_MODE_1;









		return 0;








@@ -99,10 +105,10 @@ static int stm32_count_function_get(struct counter_device *counter,







	case 3:









		*function = STM32_COUNT_ENCODER_MODE_3;









		return 0;









	}



















	default:









		return -EINVAL;









	}









}



















static int stm32_count_function_set(struct counter_device *counter,









				    struct counter_count *count,








@@ -112,6 +118,9 @@ static int stm32_count_function_set(struct counter_device *counter,







	u32 cr1, sms;



















	switch (function) {









	case STM32_COUNT_SLAVE_MODE_DISABLED:









		sms = 0;









		break;









	case STM32_COUNT_ENCODER_MODE_1:









		sms = 1;









		break;








@@ -122,8 +131,7 @@ static int stm32_count_function_set(struct counter_device *counter,







		sms = 3;









		break;









	default:









		sms = 0;









		break;









		return -EINVAL;









	}



















	/* Store enable status */








@@ -131,10 +139,6 @@ static int stm32_count_function_set(struct counter_device *counter,

















	regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN, 0);



















	/* TIMx_ARR register shouldn't be buffered (ARPE=0) */









	regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE, 0);









	regmap_write(priv->regmap, TIM_ARR, priv->ceiling);



















	regmap_update_bits(priv->regmap, TIM_SMCR, TIM_SMCR_SMS, sms);



















	/* Make sure that registers are updated */








@@ -185,11 +189,13 @@ static ssize_t stm32_count_ceiling_write(struct counter_device *counter,







	if (ret)









		return ret;



















	if (ceiling > priv->max_arr)









		return -ERANGE;



















	/* TIMx_ARR register shouldn't be buffered (ARPE=0) */









	regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE, 0);









	regmap_write(priv->regmap, TIM_ARR, ceiling);



















	priv->ceiling = ceiling;









	return len;









}


















@@ -274,31 +280,36 @@ static int stm32_action_get(struct counter_device *counter,







	size_t function;









	int err;



















	/* Default action mode (e.g. STM32_COUNT_SLAVE_MODE_DISABLED) */









	*action = STM32_SYNAPSE_ACTION_NONE;



















	err = stm32_count_function_get(counter, count, &function);









	if (err)









		return 0;









		return err;



















	switch (function) {









	case STM32_COUNT_SLAVE_MODE_DISABLED:









		/* counts on internal clock when CEN=1 */









		*action = STM32_SYNAPSE_ACTION_NONE;









		return 0;









	case STM32_COUNT_ENCODER_MODE_1:









		/* counts up/down on TI1FP1 edge depending on TI2FP2 level */









		if (synapse->signal->id == count->synapses[0].signal->id)









			*action = STM32_SYNAPSE_ACTION_BOTH_EDGES;









		break;









		else









			*action = STM32_SYNAPSE_ACTION_NONE;









		return 0;









	case STM32_COUNT_ENCODER_MODE_2:









		/* counts up/down on TI2FP2 edge depending on TI1FP1 level */









		if (synapse->signal->id == count->synapses[1].signal->id)









			*action = STM32_SYNAPSE_ACTION_BOTH_EDGES;









		break;









		else









			*action = STM32_SYNAPSE_ACTION_NONE;









		return 0;









	case STM32_COUNT_ENCODER_MODE_3:









		/* counts up/down on both TI1FP1 and TI2FP2 edges */









		*action = STM32_SYNAPSE_ACTION_BOTH_EDGES;









		break;









	}



















		return 0;









	default:









		return -EINVAL;









	}









}



















static const struct counter_ops stm32_timer_cnt_ops = {








@@ -359,7 +370,7 @@ static int stm32_timer_cnt_probe(struct platform_device *pdev)

















	priv->regmap = ddata->regmap;









	priv->clk = ddata->clk;









	priv->ceiling = ddata->max_arr;









	priv->max_arr = ddata->max_arr;



















	priv->counter.name = dev_name(dev);









	priv->counter.parent = dev;
































drivers/iio/adc/Kconfig



+3
−0






























Original line number
Diff line number
Diff line







@@ -266,6 +266,8 @@ config ADI_AXI_ADC







	select IIO_BUFFER









	select IIO_BUFFER_HW_CONSUMER









	select IIO_BUFFER_DMAENGINE









	depends on HAS_IOMEM









	depends on OF









	help









	  Say yes here to build support for Analog Devices Generic









	  AXI ADC IP core. The IP core is used for interfacing with








@@ -923,6 +925,7 @@ config STM32_ADC_CORE







	depends on ARCH_STM32 || COMPILE_TEST









	depends on OF









	depends on REGULATOR









	depends on HAS_IOMEM









	select IIO_BUFFER









	select MFD_STM32_TIMERS









	select IIO_STM32_TIMER_TRIGGER
































drivers/iio/adc/ab8500-gpadc.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -918,7 +918,7 @@ static int ab8500_gpadc_read_raw(struct iio_dev *indio_dev,







			return processed;



















		/* Return millivolt or milliamps or millicentigrades */









		*val = processed * 1000;









		*val = processed;









		return IIO_VAL_INT;









	}










































drivers/iio/adc/ad7949.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -91,7 +91,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val,







	int ret;









	int i;









	int bits_per_word = ad7949_adc->resolution;









	int mask = GENMASK(ad7949_adc->resolution, 0);









	int mask = GENMASK(ad7949_adc->resolution - 1, 0);









	struct spi_message msg;









	struct spi_transfer tx[] = {









		{