| Message ID | e36f6aca-120c-b2a5-52da-06e12e5cfb9f@st.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Jan 16, 2017 at 04:49:29PM +0100, Alexandre Torgue wrote: > Hi Olof, Arnd and Kevin, > > Please consider this first round of STM32 DT updates for v4.11: > > The following changes since commit 7ce7d89f48834cefece7804d38fc5d85382edf77: > > Linux 4.10-rc1 (2016-12-25 16:13:08 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git > tags/stm32-dt-for-v4.11-1 > > for you to fetch changes up to d99c66406a846748e26989759caa7e966c1804dd: > > ARM: dts: stm32: enable RTC on stm32429i-eval (2017-01-16 14:38:14 +0100) > > ---------------------------------------------------------------- > STM32 DT updates for v4.11, round 1. > > Highlights: > ---------- > > - ADD RTC support on STM32F429 MCU > - Enable RTC on STM32F469and STM32F429 boards > - ADD ADC support on STM32F429 MCU > - Enable ADC on STM32F429 Eval board > - Add I2S external clock > - Fix memory size for STM32F429 Disco > > Note: > ----- > First patch "clk: stm32f4: Update DT bindings documentation") > has already been merged in clock tree. Ugh. That patch doesn't just update documentation. It also updates the dt-include file. So, if it's already been merged into the clock tree, then we can't merge a separate copy here. By now, easiest is to hold off making use of it until it's on a shared branch, i.e. next release. Use the numerical values until then. > ---------------------------------------------------------------- > Amelie Delaunay (5): > ARM: dts: stm32: set HSE_RTC clock frequency to 1 MHz on stm32f429 > ARM: dts: stm32: Add RTC support for STM32F429 MCU > ARM: dts: stm32: enable RTC on stm32f429-disco > ARM: dts: stm32: enable RTC on stm32f469-disco > ARM: dts: stm32: enable RTC on stm32429i-eval > > Bruno Herrera (1): > ARM: dts: stm32: Fix memory size from 8MB to 16MB on stm32f469-disco > board > > Bruno Meirelles Herrera (1): > ARM: dts: stm32: Add missing USART3 pin config to stm32f469-disco > board > > Fabrice GASNIER (2): > ARM: dts: stm32: Add ADC support to stm32f429 > ARM: dts: stm32: enable ADC on stm32f429i-eval board > > Gabriel Fernandez (3): > clk: stm32f4: Update DT bindings documentation > ARM: dts: stm32: Add external I2S clock on stm32f429 MCU > ARM: dts: stm32: Include auxiliary stm32fx clock definition How did you generate this pull request? You didn't include a diffstat with it, which is useful for us to make sure that what we merged is what you expected us to merge. Not merging, please revisit based on the above. -Olof
Hi Olof On 01/17/2017 07:53 AM, Olof Johansson wrote: > On Mon, Jan 16, 2017 at 04:49:29PM +0100, Alexandre Torgue wrote: >> Hi Olof, Arnd and Kevin, >> >> Please consider this first round of STM32 DT updates for v4.11: >> >> The following changes since commit 7ce7d89f48834cefece7804d38fc5d85382edf77: >> >> Linux 4.10-rc1 (2016-12-25 16:13:08 -0800) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git >> tags/stm32-dt-for-v4.11-1 >> >> for you to fetch changes up to d99c66406a846748e26989759caa7e966c1804dd: >> >> ARM: dts: stm32: enable RTC on stm32429i-eval (2017-01-16 14:38:14 +0100) >> >> ---------------------------------------------------------------- >> STM32 DT updates for v4.11, round 1. >> >> Highlights: >> ---------- >> >> - ADD RTC support on STM32F429 MCU >> - Enable RTC on STM32F469and STM32F429 boards >> - ADD ADC support on STM32F429 MCU >> - Enable ADC on STM32F429 Eval board >> - Add I2S external clock >> - Fix memory size for STM32F429 Disco >> >> Note: >> ----- >> First patch "clk: stm32f4: Update DT bindings documentation") >> has already been merged in clock tree. > > Ugh. That patch doesn't just update documentation. It also updates the > dt-include file. > > So, if it's already been merged into the clock tree, then we can't merge > a separate copy here. > > By now, easiest is to hold off making use of it until it's on a shared > branch, i.e. next release. Use the numerical values until then. I know it is not a comfortable situation. I discussed this point with Arnd last week. The result of the discussion was to start from 4.10-rc1 + "patch include/dt-bindings..." and to add my patches then create pull request. Maybe I miss something. > >> ---------------------------------------------------------------- >> Amelie Delaunay (5): >> ARM: dts: stm32: set HSE_RTC clock frequency to 1 MHz on stm32f429 >> ARM: dts: stm32: Add RTC support for STM32F429 MCU >> ARM: dts: stm32: enable RTC on stm32f429-disco >> ARM: dts: stm32: enable RTC on stm32f469-disco >> ARM: dts: stm32: enable RTC on stm32429i-eval >> >> Bruno Herrera (1): >> ARM: dts: stm32: Fix memory size from 8MB to 16MB on stm32f469-disco >> board >> >> Bruno Meirelles Herrera (1): >> ARM: dts: stm32: Add missing USART3 pin config to stm32f469-disco >> board >> >> Fabrice GASNIER (2): >> ARM: dts: stm32: Add ADC support to stm32f429 >> ARM: dts: stm32: enable ADC on stm32f429i-eval board >> >> Gabriel Fernandez (3): >> clk: stm32f4: Update DT bindings documentation >> ARM: dts: stm32: Add external I2S clock on stm32f429 MCU >> ARM: dts: stm32: Include auxiliary stm32fx clock definition > > How did you generate this pull request? You didn't include a diffstat with it, > which is useful for us to make sure that what we merged is what you expected us > to merge. Sorry!! A bad copy/paste. regards Alex > > Not merging, please revisit based on the above. > > > -Olof >
On Tue, Jan 17, 2017 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote: > On Mon, Jan 16, 2017 at 04:49:29PM +0100, Alexandre Torgue wrote: >> ----- >> First patch "clk: stm32f4: Update DT bindings documentation") >> has already been merged in clock tree. > > Ugh. That patch doesn't just update documentation. It also updates the > dt-include file. > > So, if it's already been merged into the clock tree, then we can't merge > a separate copy here. > > By now, easiest is to hold off making use of it until it's on a shared > branch, i.e. next release. Use the numerical values until then. I suggested doing it this way if the same commit ID could be used rather than having two identical commits with different IDs in the two branches, which would be bad practice. Alexandre, can you clarify whether this is the same commit ID on both branches, and whether the tree it was merged into is one that does not get rebased? Arnd
On 01/20/2017 11:30 AM, Arnd Bergmann wrote: > On Tue, Jan 17, 2017 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote: >> On Mon, Jan 16, 2017 at 04:49:29PM +0100, Alexandre Torgue wrote: >>> ----- >>> First patch "clk: stm32f4: Update DT bindings documentation") >>> has already been merged in clock tree. >> >> Ugh. That patch doesn't just update documentation. It also updates the >> dt-include file. >> >> So, if it's already been merged into the clock tree, then we can't merge >> a separate copy here. >> >> By now, easiest is to hold off making use of it until it's on a shared >> branch, i.e. next release. Use the numerical values until then. > > I suggested doing it this way if the same commit ID could be used rather > than having two identical commits with different IDs in the two branches, > which would be bad practice. > > Alexandre, can you clarify whether this is the same commit ID on both > branches, and whether the tree it was merged into is one that does > not get rebased? Actually, commit SHA1 are different in clk tree and stm32-dt tree. Do I need to "re-build" my branch based on 4.10-rc1 + "dt bindings patch with clk (with the same sha1 than in clock tree) " ? Alex > > Arnd >
On Fri, Jan 20, 2017 at 12:06 PM, Alexandre Torgue <alexandre.torgue@st.com> wrote: > On 01/20/2017 11:30 AM, Arnd Bergmann wrote: >> On Tue, Jan 17, 2017 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote: >>> On Mon, Jan 16, 2017 at 04:49:29PM +0100, Alexandre Torgue wrote: >> Alexandre, can you clarify whether this is the same commit ID on both >> branches, and whether the tree it was merged into is one that does >> not get rebased? > > > Actually, commit SHA1 are different in clk tree and stm32-dt tree. > Do I need to "re-build" my branch based on 4.10-rc1 + "dt bindings patch > with clk (with the same sha1 than in clock tree) " ? Yes, that is the right way to do it. I think you should start with -rc1 and then do a 'git merge' of the commit that you need, as for some reason that ended up not being on an -rc but on top of the older clk-fixes branch that was merged into v4.9. Arnd
Hi Olof, Arnd and Kevin, Please consider this first round of STM32 DT updates for v4.11: The following changes since commit 7ce7d89f48834cefece7804d38fc5d85382edf77: Linux 4.10-rc1 (2016-12-25 16:13:08 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git tags/stm32-dt-for-v4.11-1 for you to fetch changes up to d99c66406a846748e26989759caa7e966c1804dd: ARM: dts: stm32: enable RTC on stm32429i-eval (2017-01-16 14:38:14 +0100) ---------------------------------------------------------------- STM32 DT updates for v4.11, round 1. Highlights: ---------- - ADD RTC support on STM32F429 MCU - Enable RTC on STM32F469and STM32F429 boards - ADD ADC support on STM32F429 MCU - Enable ADC on STM32F429 Eval board - Add I2S external clock - Fix memory size for STM32F429 Disco Note: ----- First patch "clk: stm32f4: Update DT bindings documentation") has already been merged in clock tree. ---------------------------------------------------------------- Amelie Delaunay (5): ARM: dts: stm32: set HSE_RTC clock frequency to 1 MHz on stm32f429 ARM: dts: stm32: Add RTC support for STM32F429 MCU ARM: dts: stm32: enable RTC on stm32f429-disco ARM: dts: stm32: enable RTC on stm32f469-disco ARM: dts: stm32: enable RTC on stm32429i-eval Bruno Herrera (1): ARM: dts: stm32: Fix memory size from 8MB to 16MB on stm32f469-disco board Bruno Meirelles Herrera (1): ARM: dts: stm32: Add missing USART3 pin config to stm32f469-disco board Fabrice GASNIER (2): ARM: dts: stm32: Add ADC support to stm32f429 ARM: dts: stm32: enable ADC on stm32f429i-eval board Gabriel Fernandez (3): clk: stm32f4: Update DT bindings documentation ARM: dts: stm32: Add external I2S clock on stm32f429 MCU ARM: dts: stm32: Include auxiliary stm32fx clock definition