From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrzej Hajda Subject: Re: [PATCH v2] pinctrl: samsung: Fix memory mapping code Date: Tue, 14 Mar 2017 15:28:14 +0100 Message-ID: References: <20170222170202.heu35anyoziwv23n@kozik-lap> <1487844760-26272-1-git-send-email-a.hajda@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-reply-to: Sender: linux-samsung-soc-owner@vger.kernel.org To: Linus Walleij , Marek Szyprowski Cc: Tomasz Figa , Krzysztof Kozlowski , Sylwester Nawrocki , linux-samsung-soc , "linux-gpio@vger.kernel.org" , Bartlomiej Zolnierkiewicz List-Id: linux-gpio@vger.kernel.org Hi Linus, On 14.03.2017 14:35, Linus Walleij wrote: > On Thu, Feb 23, 2017 at 11:12 AM, Andrzej Hajda wrote: > >> Some pinctrls share memory regions, and devm_ioremap_resource does not >> allow to share resources, in opposition to devm_ioremap. >> This patch restores back usage of devm_ioremap function, but with proper >> error handling and logging. >> >> Fixes: baafaca ("pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data()") >> Signed-off-by: Andrzej Hajda >> --- >> v2: >> - added platform_get_resource error check (thanks to Krzysztof) > This conflicts with the revert that Marek urged me to do for the > fixes branch. > > Please check the resulting tree on my fixes branch and rebase on > that. I do not see your revert on fixes branch of [1]. The most recent patch is: 96e1ce8 pinctrl: uniphier: change pin names of aio/xirq for LD11 And on this branch my patch applies cleanly :) Regards Andrzej [1]: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git > > Yours, > Linus Walleij > > >