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

Commit f82757d9 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] siano: Change GPIO voltage setting names 



Siano changed the namespace on more recent API, and re-used some
of the old names. In order to be able to update the API to support
newer chips, the better is to follow this change.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0ea21a52

drivers/media/common/siano/sms-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int sms_set_gpio(struct smscore_device_t *coredev, int pin, int enable) 
		.pullupdown           = SMS_GPIO_PULLUPDOWN_NONE,

		.inputcharacteristics = SMS_GPIO_INPUTCHARACTERISTICS_NORMAL,

		.outputslewrate       = SMS_GPIO_OUTPUTSLEWRATE_FAST,

		.outputdriving        = SMS_GPIO_OUTPUTDRIVING_4mA,

		.outputdriving        = SMS_GPIO_OUTPUTDRIVING_S_4mA,

	};



	if (pin == 0)

drivers/media/common/siano/smscoreapi.c

+4 −4
Original line number Diff line number Diff line
@@ -1305,16 +1305,16 @@ int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, 
		msg.data[2] = pinconfig->outputslewrate == 0 ? 3 : 0;



		switch (pinconfig->outputdriving) {

		case SMS_GPIO_OUTPUTDRIVING_16mA:

		case SMS_GPIO_OUTPUTDRIVING_S_16mA:

			msg.data[3] = 7; /* Nova - 16mA */

			break;

		case SMS_GPIO_OUTPUTDRIVING_12mA:

		case SMS_GPIO_OUTPUTDRIVING_S_12mA:

			msg.data[3] = 5; /* Nova - 11mA */

			break;

		case SMS_GPIO_OUTPUTDRIVING_8mA:

		case SMS_GPIO_OUTPUTDRIVING_S_8mA:

			msg.data[3] = 3; /* Nova - 7mA */

			break;

		case SMS_GPIO_OUTPUTDRIVING_4mA:

		case SMS_GPIO_OUTPUTDRIVING_S_4mA:

		default:

			msg.data[3] = 2; /* Nova - 4mA */

			break;

drivers/media/common/siano/smscoreapi.h

+4 −4
Original line number Diff line number Diff line
@@ -642,10 +642,10 @@ struct smscore_config_gpio { 
#define SMS_GPIO_OUTPUTSLEWRATE_SLOW 1

	u8 outputslewrate;



#define SMS_GPIO_OUTPUTDRIVING_4mA  0

#define SMS_GPIO_OUTPUTDRIVING_8mA  1

#define SMS_GPIO_OUTPUTDRIVING_12mA 2

#define SMS_GPIO_OUTPUTDRIVING_16mA 3

#define SMS_GPIO_OUTPUTDRIVING_S_4mA  0

#define SMS_GPIO_OUTPUTDRIVING_S_8mA  1

#define SMS_GPIO_OUTPUTDRIVING_S_12mA 2

#define SMS_GPIO_OUTPUTDRIVING_S_16mA 3

	u8 outputdriving;

};