|
@@ -1280,9 +1280,9 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
|
|
|
|
|
|
/* Parse pins in each row from LSB */
|
|
/* Parse pins in each row from LSB */
|
|
while (mask) {
|
|
while (mask) {
|
|
- bit_pos = ffs(mask);
|
|
|
|
|
|
+ bit_pos = __ffs(mask);
|
|
pin_num_from_lsb = bit_pos / pcs->bits_per_pin;
|
|
pin_num_from_lsb = bit_pos / pcs->bits_per_pin;
|
|
- mask_pos = ((pcs->fmask) << (bit_pos - 1));
|
|
|
|
|
|
+ mask_pos = ((pcs->fmask) << bit_pos);
|
|
val_pos = val & mask_pos;
|
|
val_pos = val & mask_pos;
|
|
submask = mask & mask_pos;
|
|
submask = mask & mask_pos;
|
|
|
|
|
|
@@ -1852,7 +1852,7 @@ static int pcs_probe(struct platform_device *pdev)
|
|
ret = of_property_read_u32(np, "pinctrl-single,function-mask",
|
|
ret = of_property_read_u32(np, "pinctrl-single,function-mask",
|
|
&pcs->fmask);
|
|
&pcs->fmask);
|
|
if (!ret) {
|
|
if (!ret) {
|
|
- pcs->fshift = ffs(pcs->fmask) - 1;
|
|
|
|
|
|
+ pcs->fshift = __ffs(pcs->fmask);
|
|
pcs->fmax = pcs->fmask >> pcs->fshift;
|
|
pcs->fmax = pcs->fmask >> pcs->fshift;
|
|
} else {
|
|
} else {
|
|
/* If mask property doesn't exist, function mux is invalid. */
|
|
/* If mask property doesn't exist, function mux is invalid. */
|