| Message ID | 1480020320-28354-2-git-send-email-peda@axentia.se |
|---|---|
| State | New |
| Headers | show |
On Thu, Nov 24, 2016 at 9:45 PM, Peter Rosin <peda@axentia.se> wrote: > All other registers on these chips are 8-bit, but reg_sense is 16-bits > and therefore needs to be moved down one notch. > This was apparently overlooked in the conversion to regmap, which only > updated the register locations for the 16-bit chips. > > Fixes: 6489677f86c3 ("pinctrl-sx150x: Replace sx150x_*_cfg by means of regmap API") > Signed-off-by: Peter Rosin <peda@axentia.se> Patch applied. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2016-11-25 14:40, Linus Walleij wrote: > On Thu, Nov 24, 2016 at 9:45 PM, Peter Rosin <peda@axentia.se> wrote: > >> All other registers on these chips are 8-bit, but reg_sense is 16-bits >> and therefore needs to be moved down one notch. >> This was apparently overlooked in the conversion to regmap, which only >> updated the register locations for the 16-bit chips. >> >> Fixes: 6489677f86c3 ("pinctrl-sx150x: Replace sx150x_*_cfg by means of regmap API") >> Signed-off-by: Peter Rosin <peda@axentia.se> > > Patch applied. Hi! I'm just dubble-checking that the intention is to get this patch all the way upstream in time for v4.10-rc1? Because right now there is a regression regarding irq handling on sx1502/sx1508 in linux-next. I see the patch in your devel branch, but it's not yet in the for-next branch, which happened pretty quickly for my other pair of patches for the sx150x driver. So, I worry that there might have been some for-next deadline? No rush, it's only been a week, I'm just asking... Cheers, Peter -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c index f9e559e22537..a19c814843aa 100644 --- a/drivers/pinctrl/pinctrl-sx150x.c +++ b/drivers/pinctrl/pinctrl-sx150x.c @@ -156,7 +156,7 @@ static const struct sx150x_device_data sx1508q_device_data = { .reg_data = 0x08, .reg_irq_mask = 0x09, .reg_irq_src = 0x0c, - .reg_sense = 0x0b, + .reg_sense = 0x0a, .pri.x789 = { .reg_drain = 0x05, .reg_polarity = 0x06, @@ -221,7 +221,7 @@ static const struct sx150x_device_data sx1502q_device_data = { .reg_data = 0x00, .reg_irq_mask = 0x05, .reg_irq_src = 0x08, - .reg_sense = 0x07, + .reg_sense = 0x06, .pri.x123 = { .reg_pld_mode = 0x10, .reg_pld_table0 = 0x11,
All other registers on these chips are 8-bit, but reg_sense is 16-bits and therefore needs to be moved down one notch. This was apparently overlooked in the conversion to regmap, which only updated the register locations for the 16-bit chips. Fixes: 6489677f86c3 ("pinctrl-sx150x: Replace sx150x_*_cfg by means of regmap API") Signed-off-by: Peter Rosin <peda@axentia.se> --- drivers/pinctrl/pinctrl-sx150x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)