linux/kconfig.h: replace IF_ENABLED() with PTR_IF() in <linux/kernel.h>

[linux-2.6-microblaze.git] / drivers / pinctrl / pinctrl-single.c

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 7771316..2c9c983 100644 (file)
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -270,20 +270,44 @@ static void __maybe_unused pcs_writel(unsigned val, void __iomem *reg)
        writel(val, reg);
 }
 
+static unsigned int pcs_pin_reg_offset_get(struct pcs_device *pcs,
+                                          unsigned int pin)
+{
+       unsigned int mux_bytes = pcs->width / BITS_PER_BYTE;
+
+       if (pcs->bits_per_mux) {
+               unsigned int pin_offset_bytes;
+
+               pin_offset_bytes = (pcs->bits_per_pin * pin) / BITS_PER_BYTE;
+               return (pin_offset_bytes / mux_bytes) * mux_bytes;
+       }
+
+       return pin * mux_bytes;
+}
+
+static unsigned int pcs_pin_shift_reg_get(struct pcs_device *pcs,
+                                         unsigned int pin)
+{
+       return (pin % (pcs->width / pcs->bits_per_pin)) * pcs->bits_per_pin;
+}
+
 static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev,
                                        struct seq_file *s,
                                        unsigned pin)
 {
        struct pcs_device *pcs;
-       unsigned val, mux_bytes;
+       unsigned int val;
        unsigned long offset;
        size_t pa;
 
        pcs = pinctrl_dev_get_drvdata(pctldev);
 
-       mux_bytes = pcs->width / BITS_PER_BYTE;
-       offset = pin * mux_bytes;
+       offset = pcs_pin_reg_offset_get(pcs, pin);
        val = pcs->read(pcs->base + offset);
+
+       if (pcs->bits_per_mux)
+               val &= pcs->fmask << pcs_pin_shift_reg_get(pcs, pin);
+
        pa = pcs->res->start + offset;
 
        seq_printf(s, "%zx %08x %s ", pa, val, DRIVER_NAME);
@@ -384,7 +408,6 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev,
        struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev);
        struct pcs_gpiofunc_range *frange = NULL;
        struct list_head *pos, *tmp;
-       int mux_bytes = 0;
        unsigned data;
 
        /* If function mask is null, return directly. */
@@ -392,29 +415,27 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev,
                return -ENOTSUPP;
 
        list_for_each_safe(pos, tmp, &pcs->gpiofuncs) {
+               u32 offset;
+
                frange = list_entry(pos, struct pcs_gpiofunc_range, node);
                if (pin >= frange->offset + frange->npins
                        || pin < frange->offset)
                        continue;
-               mux_bytes = pcs->width / BITS_PER_BYTE;
 
-               if (pcs->bits_per_mux) {
-                       int byte_num, offset, pin_shift;
+               offset = pcs_pin_reg_offset_get(pcs, pin);
 
-                       byte_num = (pcs->bits_per_pin * pin) / BITS_PER_BYTE;
-                       offset = (byte_num / mux_bytes) * mux_bytes;
-                       pin_shift = pin % (pcs->width / pcs->bits_per_pin) *
-                                   pcs->bits_per_pin;
+               if (pcs->bits_per_mux) {
+                       int pin_shift = pcs_pin_shift_reg_get(pcs, pin);
 
                        data = pcs->read(pcs->base + offset);
                        data &= ~(pcs->fmask << pin_shift);
                        data |= frange->gpiofunc << pin_shift;
                        pcs->write(data, pcs->base + offset);
                } else {
-                       data = pcs->read(pcs->base + pin * mux_bytes);
+                       data = pcs->read(pcs->base + offset);
                        data &= ~pcs->fmask;
                        data |= frange->gpiofunc;
-                       pcs->write(data, pcs->base + pin * mux_bytes);
+                       pcs->write(data, pcs->base + offset);
                }
                break;
        }
@@ -512,7 +533,7 @@ static int pcs_pinconf_get(struct pinctrl_dev *pctldev,
                        break;
                case PIN_CONFIG_DRIVE_STRENGTH:
                case PIN_CONFIG_SLEW_RATE:
-               case PIN_CONFIG_LOW_POWER_MODE:
+               case PIN_CONFIG_MODE_LOW_POWER:
                default:
                        *config = data;
                        break;
@@ -550,7 +571,7 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev,
                        case PIN_CONFIG_INPUT_SCHMITT:
                        case PIN_CONFIG_DRIVE_STRENGTH:
                        case PIN_CONFIG_SLEW_RATE:
-                       case PIN_CONFIG_LOW_POWER_MODE:
+                       case PIN_CONFIG_MODE_LOW_POWER:
                                shift = ffs(func->conf[i].mask) - 1;
                                data &= ~func->conf[i].mask;
                                data |= (arg << shift) & func->conf[i].mask;
@@ -656,10 +677,8 @@ static const struct pinconf_ops pcs_pinconf_ops = {
  * pcs_add_pin() - add a pin to the static per controller pin array
  * @pcs: pcs driver instance
  * @offset: register offset from base
- * @pin_pos: unused
  */
-static int pcs_add_pin(struct pcs_device *pcs, unsigned offset,
-               unsigned pin_pos)
+static int pcs_add_pin(struct pcs_device *pcs, unsigned int offset)
 {
        struct pcs_soc_data *pcs_soc = &pcs->socdata;
        struct pinctrl_pin_desc *pin;
@@ -703,14 +722,12 @@ static int pcs_add_pin(struct pcs_device *pcs, unsigned offset,
 static int pcs_allocate_pin_table(struct pcs_device *pcs)
 {
        int mux_bytes, nr_pins, i;
-       int num_pins_in_register = 0;
 
        mux_bytes = pcs->width / BITS_PER_BYTE;
 
        if (pcs->bits_per_mux) {
                pcs->bits_per_pin = fls(pcs->fmask);
                nr_pins = (pcs->size * BITS_PER_BYTE) / pcs->bits_per_pin;
-               num_pins_in_register = pcs->width / pcs->bits_per_pin;
        } else {
                nr_pins = pcs->size / mux_bytes;
        }
@@ -728,17 +745,9 @@ static int pcs_allocate_pin_table(struct pcs_device *pcs)
        for (i = 0; i < pcs->desc.npins; i++) {
                unsigned offset;
                int res;
-               int byte_num;
-               int pin_pos = 0;
 
-               if (pcs->bits_per_mux) {
-                       byte_num = (pcs->bits_per_pin * i) / BITS_PER_BYTE;
-                       offset = (byte_num / mux_bytes) * mux_bytes;
-                       pin_pos = i % num_pins_in_register;
-               } else {
-                       offset = i * mux_bytes;
-               }
-               res = pcs_add_pin(pcs, offset, pin_pos);
+               offset = pcs_pin_reg_offset_get(pcs, i);
+               res = pcs_add_pin(pcs, offset);
                if (res < 0) {
                        dev_err(pcs->dev, "error adding pins: %i\n", res);
                        return res;
@@ -910,7 +919,7 @@ static int pcs_parse_pinconf(struct pcs_device *pcs, struct device_node *np,
                { "pinctrl-single,drive-strength", PIN_CONFIG_DRIVE_STRENGTH, },
                { "pinctrl-single,slew-rate", PIN_CONFIG_SLEW_RATE, },
                { "pinctrl-single,input-schmitt", PIN_CONFIG_INPUT_SCHMITT, },
-               { "pinctrl-single,low-power-mode", PIN_CONFIG_LOW_POWER_MODE, },
+               { "pinctrl-single,low-power-mode", PIN_CONFIG_MODE_LOW_POWER, },
        };
        static const struct pcs_conf_type prop4[] = {
                { "pinctrl-single,bias-pullup", PIN_CONFIG_BIAS_PULL_UP, },