| Message ID | 1451942879-43265-3-git-send-email-blogic@openwrt.org |
|---|---|
| State | New |
| Headers | show |
On Mon, Jan 4, 2016 at 10:27 PM, John Crispin <blogic@openwrt.org> wrote: > The callback is missing so lets add it. > > Signed-off-by: John Crispin <blogic@openwrt.org> Thanks! > + return -1; > +} I changed this to return 0 because of this: http://lwn.net/Articles/470820/ Patch applied with the above change. 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 01/05/2016 at 11:10 AM, Linus Walleij wrote: > On Mon, Jan 4, 2016 at 10:27 PM, John Crispin <blogic@openwrt.org> > wrote: > > > The callback is missing so lets add it. > > > > Signed-off-by: John Crispin <blogic@openwrt.org> > > Thanks! > > > + return -1; > > +} > > I changed this to return 0 because of this: > http://lwn.net/Articles/470820/ > > Patch applied with the above change. > > Yours, > Linus Walleij @Linus: As I submitted this change a few weeks ago, you already applied this in the linux-gpio tree here: https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git/commit/drivers/pinctrl/pinctrl-xway.c?h=devel&id=3e640743fee6e6a82ead1f163737755b2a965712
On Tue, Jan 5, 2016 at 1:59 PM, Martin Schiller <mschiller@tdt.de> wrote: > As I submitted this change a few weeks ago, you already applied this in the linux-gpio tree here: > https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git/commit/drivers/pinctrl/pinctrl-xway.c?h=devel&id=3e640743fee6e6a82ead1f163737755b2a965712 Yeah I noticed.... hehe it blew up in my face when I tried to merge the pin control and GPIO trees to see what happens in Linux-next. I think I figured it out now... 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
SGkgTGludXMsDQoNCk9uIDAxLzA1LzIwMTYgYXQgMzoxOSBQTSwgTGludXMgV2FsbGVpaiB3cm90 ZToNCj4gT24gVHVlLCBKYW4gNSwgMjAxNiBhdCAxOjU5IFBNLCBNYXJ0aW4gU2NoaWxsZXIgPG1z Y2hpbGxlckB0ZHQuZGU+IHdyb3RlOg0KPg0KPiA+IEFzIEkgc3VibWl0dGVkIHRoaXMgY2hhbmdl IGEgZmV3IHdlZWtzIGFnbywgeW91IGFscmVhZHkgYXBwbGllZCB0aGlzIGluIHRoZQ0KPiBsaW51 eC1ncGlvIHRyZWUgaGVyZToNCj4gPiBodHRwczovL2dpdC5rZXJuZWwub3JnL2NnaXQvbGludXgv a2VybmVsL2dpdC9saW51c3cvbGludXgtDQo+IGdwaW8uZ2l0L2NvbW1pdC9kcml2ZXJzL3BpbmN0 cmwvcGluY3RybC0NCj4geHdheS5jP2g9ZGV2ZWwmaWQ9M2U2NDA3NDNmZWU2ZTZhODJlYWQxZjE2 MzczNzc1NWIyYTk2NTcxMg0KPg0KPiBZZWFoIEkgbm90aWNlZC4uLi4gaGVoZSBpdCBibGV3IHVw IGluIG15IGZhY2Ugd2hlbiBJIHRyaWVkIHRvIG1lcmdlDQo+IHRoZSBwaW4gY29udHJvbCBhbmQg R1BJTyB0cmVlcyB0byBzZWUgd2hhdCBoYXBwZW5zIGluIExpbnV4LW5leHQuDQo+IEkgdGhpbmsg SSBmaWd1cmVkIGl0IG91dCBub3cuLi4NCg0KSSB0aGluayB0aGVyZSBzdGlsbCB3ZW50IHNvbWV0 aGluZyB3cm9uZyB3aXRoIHRoaXMgY29tbWl0Og0KDQpJbiB0aGUgY29tbWl0IGxvZyB5b3UgY2Fu IHNlZSB0aGF0IHRoaXMgY2hhbmdlcyBhcmUgYWRkZWQgb24gMjAxNS0xMi0xMCBhbmQNCnRoZW4g cmV2ZXJ0ZWQgb24gMjAxNi0wMS0wNS4NCg0KLSBNYXJ0aW4NCg0K -- 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 Thu, Mar 31, 2016 at 6:44 AM, Martin Schiller <mschiller@tdt.de> wrote: > I think there still went something wrong with this commit: > > In the commit log you can see that this changes are added on 2015-12-10 and > then reverted on 2016-01-05. You're right, I just screw everything up, sorry :( I have reverted the revert for pin control fixes so it goes into v4.6 as a fix. 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
diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c index 434567b..3777f2d 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c @@ -686,6 +686,18 @@ static int xway_gpio_dir_out(struct gpio_chip *chip, unsigned int pin, int val) return 0; } +static int xway_gpio_to_irq(struct gpio_chip *chip, unsigned offset) +{ + struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev); + int i; + + for (i = 0; i < info->num_exin; i++) + if (info->exin[i] == offset) + return ltq_eiu_get_irq(i); + + return -1; +} + static struct gpio_chip xway_chip = { .label = "gpio-xway", .direction_input = xway_gpio_dir_in, @@ -694,6 +706,7 @@ static struct gpio_chip xway_chip = { .set = xway_gpio_set, .request = gpiochip_generic_request, .free = gpiochip_generic_free, + .to_irq = xway_gpio_to_irq, .base = -1, };
The callback is missing so lets add it. Signed-off-by: John Crispin <blogic@openwrt.org> --- drivers/pinctrl/pinctrl-xway.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)