On Sat, Aug 19, 2017 at 4:07 AM, Ben Hutchings <ben@xxxxxxxxxxxxxxx> wrote: > On Mon, 2017-08-14 at 18:19 -0700, Greg Kroah-Hartman wrote: >> 4.12-stable review patch. If anyone has any objections, please let me know. >> >> ------------------ >> >> From: Icenowy Zheng <icenowy@xxxxxxx> >> >> commit d81ece747d8727bb8b1cfc9a20dbe62f09a4e35a upstream. >> >> The PH16 pin has a function with mux id 0x5, which is the DET pin of the >> "sim" (smart card reader) IP block. >> >> This function is missing in old versions of A10/A20 SoCs' datasheets and >> user manuals, so it's also missing in the old drivers. The newest A10 >> Datasheet V1.70 and A20 Datasheet V1.41 contain this pin function, and >> it's discovered during implementing R40 pinctrl driver. >> >> Add it to the driver. As we now merged A20 pinctrl driver to the A10 >> one, we need to only fix the A10 driver now. > > That happened after 4.12, so I think for stable the same change should > be applied in drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c. Indeed. Should we send a backported patch? Thanks ChenYu > > Ben. > >> Fixes: f2821b1ca3a2 ("pinctrl: sunxi: Move Allwinner A10 pinctrl >> driver to a driver of its own") >> >> Signed-off-by: Icenowy Zheng <icenowy@xxxxxxx> >> Reviewed-by: Chen-Yu Tsai <wens@xxxxxxxx> >> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> >> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> >> >> --- >> drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 + >> 1 file changed, 1 insertion(+) >> >> --- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c >> +++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c >> @@ -811,6 +811,7 @@ static const struct sunxi_desc_pin sun4i >> SUNXI_FUNCTION(0x2, "lcd1"), /* D16 */ >> SUNXI_FUNCTION(0x3, "pata"), /* ATAD12 */ >> SUNXI_FUNCTION(0x4, "keypad"), /* IN6 */ >> + SUNXI_FUNCTION(0x5, "sim"), /* DET */ >> SUNXI_FUNCTION_IRQ(0x6, 16), /* EINT16 */ >> SUNXI_FUNCTION(0x7, "csi1")), /* D16 */ >> SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 17), >> >> > -- > Ben Hutchings > Reality is just a crutch for people who can't handle science fiction. >