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

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

Pull staging and IIO fixes from Greg KH:
 "Here are some small Staging and IIO driver fixes for 5.10-rc5. They
  include:

   - IIO fixes for reported regressions and problems

   - new device ids for IIO drivers

   - new device id for rtl8723bs driver

   - staging ralink driver Kconfig dependency fix

   - staging mt7621-pci bus resource fix

  All of these have been in linux-next all week with no reported issues"

* tag 'staging-5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  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
  docs: ABI: testing: iio: stm32: remove re-introduced unsupported ABI
  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
  staging: rtl8723bs: Add 024c:0627 to the list of SDIO device-ids
  staging: ralink-gdma: fix kconfig dependency bug for DMA_RALINK
  staging: mt7621-pci: avoid to request pci bus resources
  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 de758035 2dde2821

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

+0 −24
Original line number Diff line number Diff line
@@ -109,30 +109,6 @@ Description: 
		When counting down the counter start from preset value

		and fire event when reach 0.



What:		/sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the list possible quadrature modes.



What:		/sys/bus/iio/devices/iio:deviceX/in_count0_quadrature_mode

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Configure the device counter quadrature modes:



		channel_A:

			Encoder A input servers as the count input and B as

			the UP/DOWN direction control input.



		channel_B:

			Encoder B input serves as the count input and A as

			the UP/DOWN direction control input.



		quadrature:

			Encoder A and B inputs are mixed to get direction

			and count with a scale of 0.25.



What:		/sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE