| Message ID | 1400471241-21456-1-git-send-email-dinguyen@altera.com |
|---|---|
| State | New |
| Headers | show |
On Sun, May 18, 2014 at 10:47:21PM -0500, dinguyen@altera.com wrote: > Hi Arnd, Kevin and Olof, > > Please consider pulling in this patch for 3.16. This patch adds the DTS > entries for the GPIOs on the SOCFPGA platform. > > Olof had a question regarding how the GPIO node needed 2-layer approach. > > http://thread.gmane.org/gmane.linux.kernel/1671569/focus=1702208 > > I hope that Alan Tull was able to answer Olof's question. > > Thanks, > > The following changes since commit 2bfac3a551978c4953f659e1bd18d58c3c249f64: > > Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt (2014-05-16 16:07:37 -0700) You can't base your branch on top of our next/dt. You should have based this on top of your previous branch, and not pulled down our contents for it. Please send a new pull request, or let me know if you prefer me to just cherry-pick over the one patch -- your choice. -Olof
On 5/22/14 12:15 AM, Olof Johansson wrote: > On Sun, May 18, 2014 at 10:47:21PM -0500, dinguyen@altera.com wrote: >> Hi Arnd, Kevin and Olof, >> >> Please consider pulling in this patch for 3.16. This patch adds the DTS >> entries for the GPIOs on the SOCFPGA platform. >> >> Olof had a question regarding how the GPIO node needed 2-layer approach. >> >> http://thread.gmane.org/gmane.linux.kernel/1671569/focus=1702208 >> >> I hope that Alan Tull was able to answer Olof's question. >> >> Thanks, >> >> The following changes since commit 2bfac3a551978c4953f659e1bd18d58c3c249f64: >> >> Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt (2014-05-16 16:07:37 -0700) > You can't base your branch on top of our next/dt. You should have based > this on top of your previous branch, and not pulled down our contents > for it. Ah thanks, and sorry about that. So should my pull request start from v3.15-rc1(was the last rc in my branch) or the last commit that you pulled in? > > Please send a new pull request, or let me know if you prefer me to just > cherry-pick over the one patch -- your choice. Let me send you a new pull request as there is another that just came in. Thanks, Dinh > > -Olof
On Thu, May 22, 2014 at 09:26:24AM -0500, Dinh Nguyen wrote: > > On 5/22/14 12:15 AM, Olof Johansson wrote: > > On Sun, May 18, 2014 at 10:47:21PM -0500, dinguyen@altera.com wrote: > >> Hi Arnd, Kevin and Olof, > >> > >> Please consider pulling in this patch for 3.16. This patch adds the DTS > >> entries for the GPIOs on the SOCFPGA platform. > >> > >> Olof had a question regarding how the GPIO node needed 2-layer approach. > >> > >> http://thread.gmane.org/gmane.linux.kernel/1671569/focus=1702208 > >> > >> I hope that Alan Tull was able to answer Olof's question. > >> > >> Thanks, > >> > >> The following changes since commit 2bfac3a551978c4953f659e1bd18d58c3c249f64: > >> > >> Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt (2014-05-16 16:07:37 -0700) > > You can't base your branch on top of our next/dt. You should have based > > this on top of your previous branch, and not pulled down our contents > > for it. > Ah thanks, and sorry about that. So should my pull request start from > v3.15-rc1(was the > last rc in my branch) or the last commit that you pulled in? Going through old unread email, and didn't see an answer (nor did I answer myself). You can base it on the last previous commit, that's fine. > > > > Please send a new pull request, or let me know if you prefer me to just > > cherry-pick over the one patch -- your choice. > Let me send you a new pull request as there is another that just came in. Ok, np. Arnd might already have taken care of them, I haven't gotten that far in this folder yet. :) -Olof
Hi Arnd, Kevin and Olof, Please consider pulling in this patch for 3.16. This patch adds the DTS entries for the GPIOs on the SOCFPGA platform. Olof had a question regarding how the GPIO node needed 2-layer approach. http://thread.gmane.org/gmane.linux.kernel/1671569/focus=1702208 I hope that Alan Tull was able to answer Olof's question. Thanks, The following changes since commit 2bfac3a551978c4953f659e1bd18d58c3c249f64: Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt (2014-05-16 16:07:37 -0700) are available in the git repository at: git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga_dt_updates-for-3.16_take_2 for you to fetch changes up to 45e3e6316ba45980c756189fdcd79f11e5984501: ARM: dts: socfpga: add gpio pieces (2014-05-18 21:39:59 -0500) ---------------------------------------------------------------- Add the gpio dts entry for the SOCFPGA platform. ---------------------------------------------------------------- Sebastian Andrzej Siewior (1): ARM: dts: socfpga: add gpio pieces arch/arm/boot/dts/socfpga.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)