leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] siano: Change GPIO voltage setting names

Browse Source 
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: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2013-03-06 07:09:54 -03:00
parent 0ea21a5240
commit f82757d912
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/common/siano/sms-cards.c
View File

@@ -183,7 +183,7 @@ static int sms_set_gpio(struct smscore_device_t *coredev, int pin, int enable)
.pullupdown = SMS_GPIO_PULLUPDOWN_NONE, .pullupdown = SMS_GPIO_PULLUPDOWN_NONE,
.inputcharacteristics = SMS_GPIO_INPUTCHARACTERISTICS_NORMAL, .inputcharacteristics = SMS_GPIO_INPUTCHARACTERISTICS_NORMAL,
.outputslewrate = SMS_GPIO_OUTPUTSLEWRATE_FAST, .outputslewrate = SMS_GPIO_OUTPUTSLEWRATE_FAST,
.outputdriving = SMS_GPIO_OUTPUTDRIVING_4mA, .outputdriving = SMS_GPIO_OUTPUTDRIVING_S_4mA,
}; };
if (pin == 0) if (pin == 0)

8
drivers/media/common/siano/smscoreapi.c
View File

@@ -1305,16 +1305,16 @@ int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
msg.data[2] = pinconfig->outputslewrate == 0 ? 3 : 0; msg.data[2] = pinconfig->outputslewrate == 0 ? 3 : 0;
switch (pinconfig->outputdriving) { switch (pinconfig->outputdriving) {
case SMS_GPIO_OUTPUTDRIVING_16mA: case SMS_GPIO_OUTPUTDRIVING_S_16mA:
msg.data[3] = 7; /* Nova - 16mA */ msg.data[3] = 7; /* Nova - 16mA */
break; break;
case SMS_GPIO_OUTPUTDRIVING_12mA: case SMS_GPIO_OUTPUTDRIVING_S_12mA:
msg.data[3] = 5; /* Nova - 11mA */ msg.data[3] = 5; /* Nova - 11mA */
break; break;
case SMS_GPIO_OUTPUTDRIVING_8mA: case SMS_GPIO_OUTPUTDRIVING_S_8mA:
msg.data[3] = 3; /* Nova - 7mA */ msg.data[3] = 3; /* Nova - 7mA */
break; break;
case SMS_GPIO_OUTPUTDRIVING_4mA: case SMS_GPIO_OUTPUTDRIVING_S_4mA:
default: default:
msg.data[3] = 2; /* Nova - 4mA */ msg.data[3] = 2; /* Nova - 4mA */
break; break;

8
drivers/media/common/siano/smscoreapi.h
View File

@@ -642,10 +642,10 @@ struct smscore_config_gpio {
#define SMS_GPIO_OUTPUTSLEWRATE_SLOW 1 #define SMS_GPIO_OUTPUTSLEWRATE_SLOW 1
u8 outputslewrate; u8 outputslewrate;
#define SMS_GPIO_OUTPUTDRIVING_4mA 0 #define SMS_GPIO_OUTPUTDRIVING_S_4mA 0
#define SMS_GPIO_OUTPUTDRIVING_8mA 1 #define SMS_GPIO_OUTPUTDRIVING_S_8mA 1
#define SMS_GPIO_OUTPUTDRIVING_12mA 2 #define SMS_GPIO_OUTPUTDRIVING_S_12mA 2
#define SMS_GPIO_OUTPUTDRIVING_16mA 3 #define SMS_GPIO_OUTPUTDRIVING_S_16mA 3
u8 outputdriving; u8 outputdriving;
}; };