Commit 2dde2821 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-5.10a' of... 

Merge tag 'iio-fixes-for-5.10a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

First set of IIO and counter fixes for the 5.10 cycle.

IIO

cros_ec
 - Provide defauts for max and min frequency when older machines fail
   to return them correctly.
ingenic-adc
 - Fix wrong vref value for JZ4770 SoC
 - Fix AUX / VBAT readings when touchscreen in use by pausing touchscreen
   readings during a read of these channels.
kxcjk1013
 - Fix an issue with KIOX010A ACPI id using devices which need to run
   a ACPI device specific method to avoid leaving the keyboard disabled.
   Includes a minor precursor patch to make this fix easier to do.
mt6577-auxadc
 - Fix an issue with dev_comp not being set resulting in a null ptr deref.
st_lsm6dsx
 - Set a 10ms min shub slave timeout to handle fast snesors where more time
   is needed to set up the config than the cycles allowed.
stm32-adc
 - Fix an issue due to a clash between an ADC configured to use IRQs and
   a second configured to use DMA cause by some incorrect register masking.
vcnl4035
 - Kconfig missing dependency

Counter

ti-eqep
 - wrong value for max_register as one beyond the end instead of the end.

* tag 'iio-fixes-for-5.10a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: accel: kxcjk1013: Add support for KIOX010A ACPI DSM for setting tablet-mode
  iio: accel: kxcjk1013: Replace is_smo8500_device with an acpi_type enum
  iio: light: fix kconfig dependency bug for VCNL4035
  iio/adc: ingenic: Fix AUX/VBAT readings when touchscreen is used
  iio/adc: ingenic: Fix battery VREF for JZ4770 SoC
  iio: imu: st_lsm6dsx: set 10ms as min shub slave timeout
  counter/ti-eqep: Fix regmap max_register
  iio: adc: stm32-adc: fix a regression when using dma and irq
  iio: adc: mediatek: fix unset field
  iio: cros_ec: Use default frequencies when EC returns invalid information
parents 18db36a0 e5b1032a

drivers/counter/ti-eqep.c

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static const struct regmap_config ti_eqep_regmap32_config = { 
	.reg_bits = 32,

	.val_bits = 32,

	.reg_stride = 4,

	.max_register = 0x24,

	.max_register = QUPRD,

};



static const struct regmap_config ti_eqep_regmap16_config = {
@@ -376,7 +376,7 @@ static const struct regmap_config ti_eqep_regmap16_config = { 
	.reg_bits = 16,

	.val_bits = 16,

	.reg_stride = 2,

	.max_register = 0x1e,

	.max_register = QCPRDLAT,

};



static int ti_eqep_probe(struct platform_device *pdev)

drivers/iio/accel/kxcjk-1013.c

+46 −5
Original line number Diff line number Diff line
@@ -126,6 +126,12 @@ enum kx_chipset { 
	KX_MAX_CHIPS /* this must be last */

};



enum kx_acpi_type {

	ACPI_GENERIC,

	ACPI_SMO8500,

	ACPI_KIOX010A,

};



struct kxcjk1013_data {

	struct i2c_client *client;

	struct iio_trigger *dready_trig;
@@ -143,7 +149,7 @@ struct kxcjk1013_data { 
	bool motion_trigger_on;

	int64_t timestamp;

	enum kx_chipset chipset;

	bool is_smo8500_device;

	enum kx_acpi_type acpi_type;

};



enum kxcjk1013_axis {
@@ -270,6 +276,32 @@ static const struct { 
			      {19163, 1, 0},

			      {38326, 0, 1} };



#ifdef CONFIG_ACPI

enum kiox010a_fn_index {

	KIOX010A_SET_LAPTOP_MODE = 1,

	KIOX010A_SET_TABLET_MODE = 2,

};



static int kiox010a_dsm(struct device *dev, int fn_index)

{

	acpi_handle handle = ACPI_HANDLE(dev);

	guid_t kiox010a_dsm_guid;

	union acpi_object *obj;



	if (!handle)

		return -ENODEV;



	guid_parse("1f339696-d475-4e26-8cad-2e9f8e6d7a91", &kiox010a_dsm_guid);



	obj = acpi_evaluate_dsm(handle, &kiox010a_dsm_guid, 1, fn_index, NULL);

	if (!obj)

		return -EIO;



	ACPI_FREE(obj);

	return 0;

}

#endif



static int kxcjk1013_set_mode(struct kxcjk1013_data *data,

			      enum kxcjk1013_mode mode)

{
@@ -347,6 +379,13 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data) 
{

	int ret;



#ifdef CONFIG_ACPI

	if (data->acpi_type == ACPI_KIOX010A) {

		/* Make sure the kbd and touchpad on 2-in-1s using 2 KXCJ91008-s work */

		kiox010a_dsm(&data->client->dev, KIOX010A_SET_LAPTOP_MODE);

	}

#endif



	ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_WHO_AM_I);

	if (ret < 0) {

		dev_err(&data->client->dev, "Error reading who_am_i\n");
@@ -1247,7 +1286,7 @@ static irqreturn_t kxcjk1013_data_rdy_trig_poll(int irq, void *private) 


static const char *kxcjk1013_match_acpi_device(struct device *dev,

					       enum kx_chipset *chipset,

					       bool *is_smo8500_device)

					       enum kx_acpi_type *acpi_type)

{

	const struct acpi_device_id *id;
@@ -1256,7 +1295,9 @@ static const char *kxcjk1013_match_acpi_device(struct device *dev, 
		return NULL;



	if (strcmp(id->id, "SMO8500") == 0)

		*is_smo8500_device = true;

		*acpi_type = ACPI_SMO8500;

	else if (strcmp(id->id, "KIOX010A") == 0)

		*acpi_type = ACPI_KIOX010A;



	*chipset = (enum kx_chipset)id->driver_data;
@@ -1299,7 +1340,7 @@ static int kxcjk1013_probe(struct i2c_client *client, 
	} else if (ACPI_HANDLE(&client->dev)) {

		name = kxcjk1013_match_acpi_device(&client->dev,

						   &data->chipset,

						   &data->is_smo8500_device);

						   &data->acpi_type);

	} else

		return -ENODEV;
@@ -1316,7 +1357,7 @@ static int kxcjk1013_probe(struct i2c_client *client, 
	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->info = &kxcjk1013_info;



	if (client->irq > 0 && !data->is_smo8500_device) {

	if (client->irq > 0 && data->acpi_type != ACPI_SMO8500) {

		ret = devm_request_threaded_irq(&client->dev, client->irq,

						kxcjk1013_data_rdy_trig_poll,

						kxcjk1013_event_handler,

drivers/iio/adc/ingenic-adc.c

+27 −7
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
#define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS	10

#define JZ4740_ADC_BATTERY_HIGH_VREF		(7500 * 0.986)

#define JZ4740_ADC_BATTERY_HIGH_VREF_BITS	12

#define JZ4770_ADC_BATTERY_VREF			6600

#define JZ4770_ADC_BATTERY_VREF			1200

#define JZ4770_ADC_BATTERY_VREF_BITS		12



#define JZ_ADC_IRQ_AUX			BIT(0)
@@ -177,13 +177,12 @@ static void ingenic_adc_set_config(struct ingenic_adc *adc, 
	mutex_unlock(&adc->lock);

}



static void ingenic_adc_enable(struct ingenic_adc *adc,

static void ingenic_adc_enable_unlocked(struct ingenic_adc *adc,

					int engine,

					bool enabled)

{

	u8 val;



	mutex_lock(&adc->lock);

	val = readb(adc->base + JZ_ADC_REG_ENABLE);



	if (enabled)
@@ -192,20 +191,41 @@ static void ingenic_adc_enable(struct ingenic_adc *adc, 
		val &= ~BIT(engine);



	writeb(val, adc->base + JZ_ADC_REG_ENABLE);

}



static void ingenic_adc_enable(struct ingenic_adc *adc,

			       int engine,

			       bool enabled)

{

	mutex_lock(&adc->lock);

	ingenic_adc_enable_unlocked(adc, engine, enabled);

	mutex_unlock(&adc->lock);

}



static int ingenic_adc_capture(struct ingenic_adc *adc,

			       int engine)

{

	u32 cfg;

	u8 val;

	int ret;



	ingenic_adc_enable(adc, engine, true);

	/*

	 * Disable CMD_SEL temporarily, because it causes wrong VBAT readings,

	 * probably due to the switch of VREF. We must keep the lock here to

	 * avoid races with the buffer enable/disable functions.

	 */

	mutex_lock(&adc->lock);

	cfg = readl(adc->base + JZ_ADC_REG_CFG);

	writel(cfg & ~JZ_ADC_REG_CFG_CMD_SEL, adc->base + JZ_ADC_REG_CFG);



	ingenic_adc_enable_unlocked(adc, engine, true);

	ret = readb_poll_timeout(adc->base + JZ_ADC_REG_ENABLE, val,

				 !(val & BIT(engine)), 250, 1000);

	if (ret)

		ingenic_adc_enable(adc, engine, false);

		ingenic_adc_enable_unlocked(adc, engine, false);



	writel(cfg, adc->base + JZ_ADC_REG_CFG);

	mutex_unlock(&adc->lock);



	return ret;

}

drivers/iio/adc/mt6577_auxadc.c

+4 −2
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 
#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/iopoll.h>

#include <linux/io.h>

#include <linux/iio/iio.h>
@@ -276,6 +276,8 @@ static int mt6577_auxadc_probe(struct platform_device *pdev) 
		goto err_disable_clk;

	}



	adc_dev->dev_comp = device_get_match_data(&pdev->dev);



	mutex_init(&adc_dev->lock);



	mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,

drivers/iio/adc/stm32-adc-core.c

+17 −24
Original line number Diff line number Diff line
@@ -41,18 +41,16 @@ 
 * struct stm32_adc_common_regs - stm32 common registers

 * @csr:	common status register offset

 * @ccr:	common control register offset

 * @eoc1_msk:	adc1 end of conversion flag in @csr

 * @eoc2_msk:	adc2 end of conversion flag in @csr

 * @eoc3_msk:	adc3 end of conversion flag in @csr

 * @eoc_msk:    array of eoc (end of conversion flag) masks in csr for adc1..n

 * @ovr_msk:    array of ovr (overrun flag) masks in csr for adc1..n

 * @ier:	interrupt enable register offset for each adc

 * @eocie_msk:	end of conversion interrupt enable mask in @ier

 */

struct stm32_adc_common_regs {

	u32 csr;

	u32 ccr;

	u32 eoc1_msk;

	u32 eoc2_msk;

	u32 eoc3_msk;

	u32 eoc_msk[STM32_ADC_MAX_ADCS];

	u32 ovr_msk[STM32_ADC_MAX_ADCS];

	u32 ier;

	u32 eocie_msk;

};
@@ -282,21 +280,20 @@ out: 
static const struct stm32_adc_common_regs stm32f4_adc_common_regs = {

	.csr = STM32F4_ADC_CSR,

	.ccr = STM32F4_ADC_CCR,

	.eoc1_msk = STM32F4_EOC1 | STM32F4_OVR1,

	.eoc2_msk = STM32F4_EOC2 | STM32F4_OVR2,

	.eoc3_msk = STM32F4_EOC3 | STM32F4_OVR3,

	.eoc_msk = { STM32F4_EOC1, STM32F4_EOC2, STM32F4_EOC3},

	.ovr_msk = { STM32F4_OVR1, STM32F4_OVR2, STM32F4_OVR3},

	.ier = STM32F4_ADC_CR1,

	.eocie_msk = STM32F4_EOCIE | STM32F4_OVRIE,

	.eocie_msk = STM32F4_EOCIE,

};



/* STM32H7 common registers definitions */

static const struct stm32_adc_common_regs stm32h7_adc_common_regs = {

	.csr = STM32H7_ADC_CSR,

	.ccr = STM32H7_ADC_CCR,

	.eoc1_msk = STM32H7_EOC_MST | STM32H7_OVR_MST,

	.eoc2_msk = STM32H7_EOC_SLV | STM32H7_OVR_SLV,

	.eoc_msk = { STM32H7_EOC_MST, STM32H7_EOC_SLV},

	.ovr_msk = { STM32H7_OVR_MST, STM32H7_OVR_SLV},

	.ier = STM32H7_ADC_IER,

	.eocie_msk = STM32H7_EOCIE | STM32H7_OVRIE,

	.eocie_msk = STM32H7_EOCIE,

};



static const unsigned int stm32_adc_offset[STM32_ADC_MAX_ADCS] = {
@@ -318,6 +315,7 @@ static void stm32_adc_irq_handler(struct irq_desc *desc) 
{

	struct stm32_adc_priv *priv = irq_desc_get_handler_data(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	int i;

	u32 status;



	chained_irq_enter(chip, desc);
@@ -335,17 +333,12 @@ static void stm32_adc_irq_handler(struct irq_desc *desc) 
	 * before invoking the interrupt handler (e.g. call ISR only for

	 * IRQ-enabled ADCs).

	 */

	if (status & priv->cfg->regs->eoc1_msk &&

	    stm32_adc_eoc_enabled(priv, 0))

		generic_handle_irq(irq_find_mapping(priv->domain, 0));



	if (status & priv->cfg->regs->eoc2_msk &&

	    stm32_adc_eoc_enabled(priv, 1))

		generic_handle_irq(irq_find_mapping(priv->domain, 1));



	if (status & priv->cfg->regs->eoc3_msk &&

	    stm32_adc_eoc_enabled(priv, 2))

		generic_handle_irq(irq_find_mapping(priv->domain, 2));

	for (i = 0; i < priv->cfg->num_irqs; i++) {

		if ((status & priv->cfg->regs->eoc_msk[i] &&

		     stm32_adc_eoc_enabled(priv, i)) ||

		     (status & priv->cfg->regs->ovr_msk[i]))

			generic_handle_irq(irq_find_mapping(priv->domain, i));

	}



	chained_irq_exit(chip, desc);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE