Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / pinctrl / pinctrl-lpc18xx.c

diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c
index e053f1fa551203cdf6e2fdeb2e3d8b78e75bdc0f..d090f37ca4a114683d69e203532b20dc653c1d35 100644 (file)
--- a/drivers/pinctrl/pinctrl-lpc18xx.c
+++ b/drivers/pinctrl/pinctrl-lpc18xx.c
@@ -904,7 +904,7 @@ static int lpc18xx_pconf_get(struct pinctrl_dev *pctldev, unsigned pin,
 
 static int lpc18xx_pconf_set_usb1(struct pinctrl_dev *pctldev,
                                  enum pin_config_param param,
-                                 u16 param_val, u32 *reg)
+                                 u32 param_val, u32 *reg)
 {
        switch (param) {
        case PIN_CONFIG_LOW_POWER_MODE:
@@ -932,7 +932,7 @@ static int lpc18xx_pconf_set_usb1(struct pinctrl_dev *pctldev,
 
 static int lpc18xx_pconf_set_i2c0(struct pinctrl_dev *pctldev,
                                  enum pin_config_param param,
-                                 u16 param_val, u32 *reg,
+                                 u32 param_val, u32 *reg,
                                  unsigned pin)
 {
        u8 shift;
@@ -982,7 +982,7 @@ static int lpc18xx_pconf_set_i2c0(struct pinctrl_dev *pctldev,
 }
 
 static int lpc18xx_pconf_set_gpio_pin_int(struct pinctrl_dev *pctldev,
-                                         u16 param_val, unsigned pin)
+                                         u32 param_val, unsigned pin)
 {
        struct lpc18xx_scu_data *scu = pinctrl_dev_get_drvdata(pctldev);
        u32 val, reg_val, reg_offset = LPC18XX_SCU_PINTSEL0;
@@ -1008,7 +1008,7 @@ static int lpc18xx_pconf_set_gpio_pin_int(struct pinctrl_dev *pctldev,
 }
 
 static int lpc18xx_pconf_set_pin(struct pinctrl_dev *pctldev, unsigned param,
-                                u16 param_val, u32 *reg, unsigned pin,
+                                u32 param_val, u32 *reg, unsigned pin,
                                 struct lpc18xx_pin_caps *pin_cap)
 {
        switch (param) {
@@ -1088,7 +1088,7 @@ static int lpc18xx_pconf_set(struct pinctrl_dev *pctldev, unsigned pin,
        struct lpc18xx_scu_data *scu = pinctrl_dev_get_drvdata(pctldev);
        struct lpc18xx_pin_caps *pin_cap;
        enum pin_config_param param;
-       u16 param_val;
+       u32 param_val;
        u32 reg;
        int ret;
        int i;