Commit 5ec966db authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra
Browse files

Merge tag 'tag-ib-chrome-mfd-iio-input-5.5' into chrome-platform-5.5 



IB between mfd, iio, input and chrome platform for cros-ec-sensorhub

Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
parents c2ce4d23 99cdb247

drivers/iio/accel/cros_ec_accel_legacy.c

+0 −6
Original line number Diff line number Diff line
@@ -163,16 +163,10 @@ static const struct iio_chan_spec cros_ec_accel_legacy_channels[] = { 
static int cros_ec_accel_legacy_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct cros_ec_dev *ec = dev_get_drvdata(dev->parent);

	struct iio_dev *indio_dev;

	struct cros_ec_sensors_core_state *state;

	int ret;



	if (!ec || !ec->ec_dev) {

		dev_warn(&pdev->dev, "No EC device found.\n");

		return -EINVAL;

	}



	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*state));

	if (!indio_dev)

		return -ENOMEM;

drivers/iio/common/cros_ec_sensors/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

config IIO_CROS_EC_SENSORS_CORE

	tristate "ChromeOS EC Sensors Core"

	depends on SYSFS && CROS_EC

	depends on SYSFS && CROS_EC_SENSORHUB

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	help

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

+0 −6
Original line number Diff line number Diff line
@@ -222,17 +222,11 @@ static const struct iio_info ec_sensors_info = { 
static int cros_ec_sensors_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct cros_ec_dev *ec_dev = dev_get_drvdata(dev->parent);

	struct iio_dev *indio_dev;

	struct cros_ec_sensors_state *state;

	struct iio_chan_spec *channel;

	int ret, i;



	if (!ec_dev || !ec_dev->ec_dev) {

		dev_warn(&pdev->dev, "No CROS EC device found.\n");

		return -EINVAL;

	}



	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*state));

	if (!indio_dev)

		return -ENOMEM;

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/slab.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>

#include <linux/platform_data/cros_ec_sensorhub.h>

#include <linux/platform_device.h>



static char *cros_ec_loc[] = {
@@ -88,7 +89,8 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, 
{

	struct device *dev = &pdev->dev;

	struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);

	struct cros_ec_dev *ec = dev_get_drvdata(pdev->dev.parent);

	struct cros_ec_sensorhub *sensor_hub = dev_get_drvdata(dev->parent);

	struct cros_ec_dev *ec = sensor_hub->ec;

	struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);

	u32 ver_mask;

	int ret, i;

drivers/iio/light/cros_ec_light_prox.c

+0 −6
Original line number Diff line number Diff line
@@ -169,17 +169,11 @@ static const struct iio_info cros_ec_light_prox_info = { 
static int cros_ec_light_prox_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct cros_ec_dev *ec_dev = dev_get_drvdata(dev->parent);

	struct iio_dev *indio_dev;

	struct cros_ec_light_prox_state *state;

	struct iio_chan_spec *channel;

	int ret;



	if (!ec_dev || !ec_dev->ec_dev) {

		dev_warn(dev, "No CROS EC device found.\n");

		return -EINVAL;

	}



	indio_dev = devm_iio_device_alloc(dev, sizeof(*state));

	if (!indio_dev)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE