[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: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/siano/sms-cards.c b/drivers/media/common/siano/sms-cards.c
index 680c781c8dd61edae199e3bbf572a0f2c97d90ef..8ee2e92b9b1acf7d7ab2114f5fb441a56201e3f7 100644 (file)
--- a/drivers/media/common/siano/sms-cards.c
+++ b/drivers/media/common/siano/sms-cards.c
@@ -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)

diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index 9565dcc8381fd9369d2367fd365a1dde73ae510b..3b2fc872ca0bd2cd3c9e70f0c64f0209b29eb572 100644 (file)
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -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;

diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h
index c592ae090397932f24168267bb937261248a71ac..a6d29a2426a120554e7d711135703f3c83b8acb4 100644 (file)
--- a/drivers/media/common/siano/smscoreapi.h
+++ b/drivers/media/common/siano/smscoreapi.h
@@ -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;
 };