| Message ID | 1451942879-43265-1-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 latest vendor SDK contained this patch. > > Signed-off-by: John Crispin <blogic@openwrt.org> Patch applied. Had to rebase it manually for some reason. 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 05/01/2016 11:03, Linus Walleij wrote: > On Mon, Jan 4, 2016 at 10:27 PM, John Crispin <blogic@openwrt.org> wrote: > >> The latest vendor SDK contained this patch. >> >> Signed-off-by: John Crispin <blogic@openwrt.org> > > Patch applied. Had to rebase it manually for some reason. > > Yours, > Linus Walleij > weird, it was generated using git on top of v4.4-rc7 thanks and sorry for the extra hassle. John -- 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
T24gMDEvMDUvMjAxNiBhdCAxMToxMCBBTSwgSm9obiBDcmlzcGluIHdyb3RlOg0KPg0KPg0KPiBP biAwNS8wMS8yMDE2IDExOjAzLCBMaW51cyBXYWxsZWlqIHdyb3RlOg0KPiA+IE9uIE1vbiwgSmFu IDQsIDIwMTYgYXQgMTA6MjcgUE0sIEpvaG4gQ3Jpc3BpbiA8YmxvZ2ljQG9wZW53cnQub3JnPg0K PiB3cm90ZToNCj4gPg0KPiA+PiBUaGUgbGF0ZXN0IHZlbmRvciBTREsgY29udGFpbmVkIHRoaXMg cGF0Y2guDQo+ID4+DQo+ID4+IFNpZ25lZC1vZmYtYnk6IEpvaG4gQ3Jpc3BpbiA8YmxvZ2ljQG9w ZW53cnQub3JnPg0KPiA+DQo+ID4gUGF0Y2ggYXBwbGllZC4gSGFkIHRvIHJlYmFzZSBpdCBtYW51 YWxseSBmb3Igc29tZSByZWFzb24uDQo+ID4NCj4gPiBZb3VycywNCj4gPiBMaW51cyBXYWxsZWlq DQo+ID4NCj4NCj4NCj4gd2VpcmQsIGl0IHdhcyBnZW5lcmF0ZWQgdXNpbmcgZ2l0IG9uIHRvcCBv ZiB2NC40LXJjNw0KDQpJIHRoaW5rIHRoYXQncyBiZWNhdXNlIG9mIHRoZSBjaGFuZ2VzIHN1Ym1p dHRlZCBieSBtZSwgd2hpY2ggYXJlIG5vdCBpbg0KdGhlIG9mZmljaWFsIHY0LjQtcmM3IHNvIGZh cjoNCg0KaHR0cHM6Ly9naXQua2VybmVsLm9yZy9jZ2l0L2xpbnV4L2tlcm5lbC9naXQvbGludXN3 L2xpbnV4LXBpbmN0cmwuZ2l0L2NvbW1pdC9kcml2ZXJzL3BpbmN0cmwvcGluY3RybC14d2F5LmM/ aD1kZXZlbCZpZD1iZTE0ODExYzAzY2YyMGM3OTNmZDE3NmEzNDc2MjUzMzUxMTBiMGU2DQoNCj4N Cj4gdGhhbmtzIGFuZCBzb3JyeSBmb3IgdGhlIGV4dHJhIGhhc3NsZS4NCj4NCj4gSm9obg0KPiAt LQ0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJz Y3JpYmUgbGludXgtZ3BpbyINCj4gaW4NCj4gdGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9y ZG9tb0B2Z2VyLmtlcm5lbC5vcmcNCj4gTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3Zn ZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sDQoNCg0K -- 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 Tue, Jan 5, 2016 at 1:59 PM, Martin Schiller <mschiller@tdt.de> wrote: > On 01/05/2016 at 11:10 AM, John Crispin wrote: >> >> >> On 05/01/2016 11:03, Linus Walleij wrote: >> > On Mon, Jan 4, 2016 at 10:27 PM, John Crispin <blogic@openwrt.org> >> wrote: >> > >> >> The latest vendor SDK contained this patch. >> >> >> >> Signed-off-by: John Crispin <blogic@openwrt.org> >> > >> > Patch applied. Had to rebase it manually for some reason. >> > >> > Yours, >> > Linus Walleij >> > >> >> >> weird, it was generated using git on top of v4.4-rc7 > > I think that's because of the changes submitted by me, which are not in > the official v4.4-rc7 so far: > > https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-pinctrl.git/commit/drivers/pinctrl/pinctrl-xway.c?h=devel&id=be14811c03cf20c793fd176a347625335110b0e6 I found the mess, of course it's my own fault. I merged some patches into the pin control tree and some into the GPIO tree and that combined with my massive refactorings is a mess. I did some reverting and moving patches between the trees and now it should merge up in linux-next all right. 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 ae724bd..cac1fde 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c @@ -152,10 +152,10 @@ static const struct ltq_mfp_pin xway_mfp[] = { MFP_XWAY(GPIO41, GPIO, NONE, NONE, NONE), MFP_XWAY(GPIO42, GPIO, MDIO, NONE, NONE), MFP_XWAY(GPIO43, GPIO, MDIO, NONE, NONE), - MFP_XWAY(GPIO44, GPIO, NONE, GPHY, SIN), + MFP_XWAY(GPIO44, GPIO, MII, SIN, GPHY), MFP_XWAY(GPIO45, GPIO, NONE, GPHY, SIN), MFP_XWAY(GPIO46, GPIO, NONE, NONE, EXIN), - MFP_XWAY(GPIO47, GPIO, NONE, GPHY, SIN), + MFP_XWAY(GPIO47, GPIO, MII, GPHY, SIN), MFP_XWAY(GPIO48, GPIO, EBU, NONE, NONE), MFP_XWAY(GPIO49, GPIO, EBU, NONE, NONE), MFP_XWAY(GPIO50, GPIO, NONE, NONE, NONE),
The latest vendor SDK contained this patch. Signed-off-by: John Crispin <blogic@openwrt.org> --- drivers/pinctrl/pinctrl-xway.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)