Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e8df09 authored by Peter Rosin's avatar Peter Rosin Committed by Linus Walleij
Browse files

gpio: sx150x: Add support for sx1502 



Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9ae48210

Documentation/devicetree/bindings/gpio/gpio-sx150x.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ Required properties: 


- compatible: should be "semtech,sx1506q",

			"semtech,sx1508q",

			"semtech,sx1509q".

			"semtech,sx1509q",

			"semtech,sx1502q".



- reg: The I2C slave address for this device.

drivers/gpio/gpio-sx150x.c

+49 −4
Original line number Diff line number Diff line
@@ -32,8 +32,19 @@ 
#define NO_UPDATE_PENDING	-1



/* The chip models of sx150x */

#define SX150X_456 0

#define SX150X_789 1

#define SX150X_123 0

#define SX150X_456 1

#define SX150X_789 2



struct sx150x_123_pri {

	u8 reg_pld_mode;

	u8 reg_pld_table0;

	u8 reg_pld_table1;

	u8 reg_pld_table2;

	u8 reg_pld_table3;

	u8 reg_pld_table4;

	u8 reg_advance;

};



struct sx150x_456_pri {

	u8 reg_pld_mode;
@@ -65,6 +76,7 @@ struct sx150x_device_data { 
	u8 reg_sense;

	u8 ngpios;

	union {

		struct sx150x_123_pri x123;

		struct sx150x_456_pri x456;

		struct sx150x_789_pri x789;

	} pri;
@@ -142,12 +154,33 @@ static const struct sx150x_device_data sx150x_devices[] = { 
		},

		.ngpios	= 16

	},

	[3] = { /* sx1502q */

		.model = SX150X_123,

		.reg_pullup	= 0x02,

		.reg_pulldn	= 0x03,

		.reg_dir	= 0x01,

		.reg_data	= 0x00,

		.reg_irq_mask	= 0x05,

		.reg_irq_src	= 0x08,

		.reg_sense	= 0x07,

		.pri.x123 = {

			.reg_pld_mode	= 0x10,

			.reg_pld_table0	= 0x11,

			.reg_pld_table1	= 0x12,

			.reg_pld_table2	= 0x13,

			.reg_pld_table3	= 0x14,

			.reg_pld_table4	= 0x15,

			.reg_advance	= 0xad,

		},

		.ngpios	= 8,

	},

};



static const struct i2c_device_id sx150x_id[] = {

	{"sx1508q", 0},

	{"sx1509q", 1},

	{"sx1506q", 2},

	{"sx1502q", 3},

	{}

};

MODULE_DEVICE_TABLE(i2c, sx150x_id);
@@ -156,6 +189,7 @@ static const struct of_device_id sx150x_of_match[] = { 
	{ .compatible = "semtech,sx1508q" },

	{ .compatible = "semtech,sx1509q" },

	{ .compatible = "semtech,sx1506q" },

	{ .compatible = "semtech,sx1502q" },

	{},

};

MODULE_DEVICE_TABLE(of, sx150x_of_match);
@@ -545,10 +579,14 @@ static int sx150x_init_hw(struct sx150x_chip *chip, 
		err = sx150x_i2c_write(chip->client,

				chip->dev_cfg->pri.x789.reg_misc,

				0x01);

	else

	else if (chip->dev_cfg->model == SX150X_456)

		err = sx150x_i2c_write(chip->client,

				chip->dev_cfg->pri.x456.reg_advance,

				0x04);

	else

		err = sx150x_i2c_write(chip->client,

				chip->dev_cfg->pri.x123.reg_advance,

				0x00);

	if (err < 0)

		return err;
@@ -574,13 +612,20 @@ static int sx150x_init_hw(struct sx150x_chip *chip, 
				pdata->io_polarity);

		if (err < 0)

			return err;

	} else {

	} else if (chip->dev_cfg->model == SX150X_456) {

		/* Set all pins to work in normal mode */

		err = sx150x_init_io(chip,

				chip->dev_cfg->pri.x456.reg_pld_mode,

				0);

		if (err < 0)

			return err;

	} else {

		/* Set all pins to work in normal mode */

		err = sx150x_init_io(chip,

				chip->dev_cfg->pri.x123.reg_pld_mode,

				0);

		if (err < 0)

			return err;

	}