| Message ID | 3fb58758-a67f-3a0f-72d2-abbfd71b6ae0@st.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] STM32 DT changes for v4.21 #1 | expand |
On Mon, Dec 03, 2018 at 12:18:17PM +0100, Alexandre Torgue wrote: > Hi Arnd, Olof and Kevin, > > Please consider this first round of STM32 DT updates for v4.21. > > Thanks. > Alex > > The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a: > > Linux 4.20-rc1 (2018-11-04 15:37:52 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git > stm32-dt-for-v4.21-1 > > for you to fetch changes up to 8914b63bab3c43a529316ba2858137bc57b74fa1: > > ARM: dts: stm32: add thermal sensor support on STM32MP157c (2018-12-03 > 10:43:26 +0100) I think you might have missed pushing the tag to the remote? -Olof
Hi guys On 12/3/18 12:18 PM, Alexandre Torgue wrote: > Hi Arnd, Olof and Kevin, > > Please consider this first round of STM32 DT updates for v4.21. > > Thanks. > Alex > This PR has not been merged in 5.0-rc1. Is there an issue (except than v4.21 doesn't exist :)) ? If not, is it possible to get it in next 5.0 rc ? Thanks in advance Alex > The following changes since commit > 651022382c7f8da46cb4872a545ee1da6d097d2a: > > Linux 4.20-rc1 (2018-11-04 15:37:52 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git > stm32-dt-for-v4.21-1 > > for you to fetch changes up to 8914b63bab3c43a529316ba2858137bc57b74fa1: > > ARM: dts: stm32: add thermal sensor support on STM32MP157c > (2018-12-03 10:43:26 +0100) > > ---------------------------------------------------------------- > STM32 DT updates for v4.21, round 1 > > Highlights: > ---------- > > -MPU STM32MP157 platform update: > -Declare DMAs for timers > -Add sleep support for CAN > -Split CAN RAM mapping between the 2 FDCAN instances > -Add support of thermal sensor (DTS) > > ---------------------------------------------------------------- > Bich HEMON (3): > ARM: dts: stm32: change CAN RAM mapping on stm32mp157c > ARM: dts: stm32: add can1 sleep pins muxing > ARM: dts: stm32: add can1 sleep pins muxing on stm32mp157c-ev1 board > > David Hernandez Sanchez (1): > ARM: dts: stm32: add thermal sensor support on STM32MP157c > > Fabrice Gasnier (3): > ARM: dts: stm32: Add dmas to timer on stm32mp157c > ARM: dts: stm32: don't use timers dmas on stm32mp157c-ed1 > ARM: dts: stm32: don't use timers dmas on stm32mp157c-ev1 > > arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 7 +++ > arch/arm/boot/dts/stm32mp157c-ed1.dts | 3 + > arch/arm/boot/dts/stm32mp157c-ev1.dts | 10 +++- > arch/arm/boot/dts/stm32mp157c.dtsi | 97 > ++++++++++++++++++++++++++++++- > 4 files changed, 114 insertions(+), 3 deletions(-)
Hi On 1/8/19 8:29 AM, Alexandre Torgue wrote: > Hi guys > > On 12/3/18 12:18 PM, Alexandre Torgue wrote: >> Hi Arnd, Olof and Kevin, >> >> Please consider this first round of STM32 DT updates for v4.21. >> >> Thanks. >> Alex >> > > This PR has not been merged in 5.0-rc1. Is there an issue (except than > v4.21 doesn't exist :)) ? > If not, is it possible to get it in next 5.0 rc ? > Sorry for the last post. I completely missed Olof answer: "I think you might have missed pushing the tag to the remote? -Olof " My tag is now pushed. Is there a chance to get it in next RC ? Sorry for inconvenience. Alex > Thanks in advance > Alex > > >> The following changes since commit >> 651022382c7f8da46cb4872a545ee1da6d097d2a: >> >> Linux 4.20-rc1 (2018-11-04 15:37:52 -0800) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git >> stm32-dt-for-v4.21-1 >> >> for you to fetch changes up to 8914b63bab3c43a529316ba2858137bc57b74fa1: >> >> ARM: dts: stm32: add thermal sensor support on STM32MP157c >> (2018-12-03 10:43:26 +0100) >> >> ---------------------------------------------------------------- >> STM32 DT updates for v4.21, round 1 >> >> Highlights: >> ---------- >> >> -MPU STM32MP157 platform update: >> -Declare DMAs for timers >> -Add sleep support for CAN >> -Split CAN RAM mapping between the 2 FDCAN instances >> -Add support of thermal sensor (DTS) >> >> ---------------------------------------------------------------- >> Bich HEMON (3): >> ARM: dts: stm32: change CAN RAM mapping on stm32mp157c >> ARM: dts: stm32: add can1 sleep pins muxing >> ARM: dts: stm32: add can1 sleep pins muxing on stm32mp157c-ev1 >> board >> >> David Hernandez Sanchez (1): >> ARM: dts: stm32: add thermal sensor support on STM32MP157c >> >> Fabrice Gasnier (3): >> ARM: dts: stm32: Add dmas to timer on stm32mp157c >> ARM: dts: stm32: don't use timers dmas on stm32mp157c-ed1 >> ARM: dts: stm32: don't use timers dmas on stm32mp157c-ev1 >> >> arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 7 +++ >> arch/arm/boot/dts/stm32mp157c-ed1.dts | 3 + >> arch/arm/boot/dts/stm32mp157c-ev1.dts | 10 +++- >> arch/arm/boot/dts/stm32mp157c.dtsi | 97 >> ++++++++++++++++++++++++++++++- >> 4 files changed, 114 insertions(+), 3 deletions(-)
On Tue, Jan 8, 2019 at 9:42 AM Alexandre Torgue <alexandre.torgue@st.com> wrote: > On 1/8/19 8:29 AM, Alexandre Torgue wrote: > > On 12/3/18 12:18 PM, Alexandre Torgue wrote: > >> Hi Arnd, Olof and Kevin, > >> > >> Please consider this first round of STM32 DT updates for v4.21. > >> > >> Thanks. > >> Alex > >> > > > > This PR has not been merged in 5.0-rc1. Is there an issue (except than > > v4.21 doesn't exist :)) ? > > If not, is it possible to get it in next 5.0 rc ? > > > > Sorry for the last post. I completely missed Olof answer: > > "I think you might have missed pushing the tag to the remote? > -Olof > " > > My tag is now pushed. Is there a chance to get it in next RC ? I noticed this we were still missing this one, but it's clearly too late now for 5.0 now, so I've pulled it into arm/dt for 5.1 now. Arnd
On 1/30/19 5:29 PM, Arnd Bergmann wrote: > On Tue, Jan 8, 2019 at 9:42 AM Alexandre Torgue <alexandre.torgue@st.com> wrote: >> On 1/8/19 8:29 AM, Alexandre Torgue wrote: >>> On 12/3/18 12:18 PM, Alexandre Torgue wrote: >>>> Hi Arnd, Olof and Kevin, >>>> >>>> Please consider this first round of STM32 DT updates for v4.21. >>>> >>>> Thanks. >>>> Alex >>>> >>> >>> This PR has not been merged in 5.0-rc1. Is there an issue (except than >>> v4.21 doesn't exist :)) ? >>> If not, is it possible to get it in next 5.0 rc ? >>> >> >> Sorry for the last post. I completely missed Olof answer: >> >> "I think you might have missed pushing the tag to the remote? >> -Olof >> " >> >> My tag is now pushed. Is there a chance to get it in next RC ? > > I noticed this we were still missing this one, but it's clearly too > late now for 5.0 now, so I've pulled it into arm/dt for 5.1 now. Sure it's too late :) and no pb. I planned to resend it for 5.1 so thanks to have already taken it. One question, I have a (small) PR to send for 5.1 this week. what is the best for you: base it on top of arm/dt ? or rebase the one for 5.0 on 5.1 and make my PR on top of it ? Regard Alex > > Arnd >
On Wed, Jan 30, 2019 at 5:45 PM Alexandre Torgue <alexandre.torgue@st.com> wrote: > On 1/30/19 5:29 PM, Arnd Bergmann wrote: > > On Tue, Jan 8, 2019 at 9:42 AM Alexandre Torgue <alexandre.torgue@st.com> wrote: > >> On 1/8/19 8:29 AM, Alexandre Torgue wrote: > >>> On 12/3/18 12:18 PM, Alexandre Torgue wrote: > >>>> Hi Arnd, Olof and Kevin, > >>>> > >>>> Please consider this first round of STM32 DT updates for v4.21. > >>>> > >>>> Thanks. > >>>> Alex > >>>> > >>> > >>> This PR has not been merged in 5.0-rc1. Is there an issue (except than > >>> v4.21 doesn't exist :)) ? > >>> If not, is it possible to get it in next 5.0 rc ? > >>> > >> > >> Sorry for the last post. I completely missed Olof answer: > >> > >> "I think you might have missed pushing the tag to the remote? > >> -Olof > >> " > >> > >> My tag is now pushed. Is there a chance to get it in next RC ? > > > > I noticed this we were still missing this one, but it's clearly too > > late now for 5.0 now, so I've pulled it into arm/dt for 5.1 now. > > Sure it's too late :) and no pb. I planned to resend it for 5.1 so > thanks to have already taken it. One question, I have a (small) PR to > send for 5.1 this week. what is the best for you: base it on top of > arm/dt ? or rebase the one for 5.0 on 5.1 and make my PR on top of it ? You should never rebase a branch that was already merged somewhere, and I also wouldn't base one of your branches on top of mine. What I'd recommend instead is to base your new work on top of the branch I just pulled. If you also need stuff from 5.0-rc1, then start with that and merge stm32-dt-for-v4.21-1 into that, followed by your new work on top (note: don't merge 5.0-rc1 into stm32-dt-for-v4.21-1 though, that would lead to a confusing git history). Arnd
On 1/30/19 10:01 PM, Arnd Bergmann wrote: > On Wed, Jan 30, 2019 at 5:45 PM Alexandre Torgue > <alexandre.torgue@st.com> wrote: >> On 1/30/19 5:29 PM, Arnd Bergmann wrote: >>> On Tue, Jan 8, 2019 at 9:42 AM Alexandre Torgue <alexandre.torgue@st.com> wrote: >>>> On 1/8/19 8:29 AM, Alexandre Torgue wrote: >>>>> On 12/3/18 12:18 PM, Alexandre Torgue wrote: >>>>>> Hi Arnd, Olof and Kevin, >>>>>> >>>>>> Please consider this first round of STM32 DT updates for v4.21. >>>>>> >>>>>> Thanks. >>>>>> Alex >>>>>> >>>>> >>>>> This PR has not been merged in 5.0-rc1. Is there an issue (except than >>>>> v4.21 doesn't exist :)) ? >>>>> If not, is it possible to get it in next 5.0 rc ? >>>>> >>>> >>>> Sorry for the last post. I completely missed Olof answer: >>>> >>>> "I think you might have missed pushing the tag to the remote? >>>> -Olof >>>> " >>>> >>>> My tag is now pushed. Is there a chance to get it in next RC ? >>> >>> I noticed this we were still missing this one, but it's clearly too >>> late now for 5.0 now, so I've pulled it into arm/dt for 5.1 now. >> >> Sure it's too late :) and no pb. I planned to resend it for 5.1 so >> thanks to have already taken it. One question, I have a (small) PR to >> send for 5.1 this week. what is the best for you: base it on top of >> arm/dt ? or rebase the one for 5.0 on 5.1 and make my PR on top of it ? > > You should never rebase a branch that was already merged somewhere, > and I also wouldn't base one of your branches on top of mine. > > What I'd recommend instead is to base your new work on top of > the branch I just pulled. If you also need stuff from 5.0-rc1, then > start with that and merge stm32-dt-for-v4.21-1 into that, followed > by your new work on top (note: don't merge 5.0-rc1 into > stm32-dt-for-v4.21-1 though, that would lead to a confusing > git history). Ok. Thanks Arnd. > > Arnd >
Hi Arnd, Olof and Kevin, Please consider this first round of STM32 DT updates for v4.21. Thanks. Alex The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a: Linux 4.20-rc1 (2018-11-04 15:37:52 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-dt-for-v4.21-1 for you to fetch changes up to 8914b63bab3c43a529316ba2858137bc57b74fa1: ARM: dts: stm32: add thermal sensor support on STM32MP157c (2018-12-03 10:43:26 +0100) ---------------------------------------------------------------- STM32 DT updates for v4.21, round 1 Highlights: ---------- -MPU STM32MP157 platform update: -Declare DMAs for timers -Add sleep support for CAN -Split CAN RAM mapping between the 2 FDCAN instances -Add support of thermal sensor (DTS) ---------------------------------------------------------------- Bich HEMON (3): ARM: dts: stm32: change CAN RAM mapping on stm32mp157c ARM: dts: stm32: add can1 sleep pins muxing ARM: dts: stm32: add can1 sleep pins muxing on stm32mp157c-ev1 board David Hernandez Sanchez (1): ARM: dts: stm32: add thermal sensor support on STM32MP157c Fabrice Gasnier (3): ARM: dts: stm32: Add dmas to timer on stm32mp157c ARM: dts: stm32: don't use timers dmas on stm32mp157c-ed1 ARM: dts: stm32: don't use timers dmas on stm32mp157c-ev1 arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 7 +++ arch/arm/boot/dts/stm32mp157c-ed1.dts | 3 + arch/arm/boot/dts/stm32mp157c-ev1.dts | 10 +++- arch/arm/boot/dts/stm32mp157c.dtsi | 97 ++++++++++++++++++++++++++++++- 4 files changed, 114 insertions(+), 3 deletions(-)