Skip to content

Commit

Permalink
[media] siano: Change GPIO voltage setting names
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Mar 21, 2013
1 parent 0ea21a5 commit f82757d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/media/common/siano/sms-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/common/siano/smscoreapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/common/siano/smscoreapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down

0 comments on commit f82757d

Please sign in to comment.