mbox

[GIT,PULL] ARM: STi: DT changes for v3.16

Message ID 5375D1A4.2040205@st.com
State New
Headers show

Pull-request

git://git.stlinux.com/devel/kernel/linux-sti.git tags/sti-dt-for-v3.16

Message

Maxime COQUELIN May 16, 2014, 8:51 a.m. UTC
Hi Olof, Kevin and Arnd,

Please consider these STi DT updates for v3.16.

Note that two reset patches are part of this pull request, in order to 
avoid compilation breakage.
Adding these two patches in this pull request has been accepted by 
Philipp Zabel.

The following changes since commit 2542f928b2131a0367e50a4390afc12084cc4cc4:

   Merge tag 'renesas-dt2-for-v3.16' of 
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt 
(2014-05-05 18:44:12 -0700)

are available in the git repository at:


   git://git.stlinux.com/devel/kernel/linux-sti.git tags/sti-dt-for-v3.16

for you to fetch changes up to 633cb1924c0ef3ceeaaa7d4c94c8c4816a6f9840:

   ARM: STi: DT: STiH41x Add clk_ignore_unused to bootargs (2014-05-15 
17:11:58 +0200)

----------------------------------------------------------------
Gabriel FERNANDEZ (15):
       driver: reset: sti: add keyscan for stih415
       driver: reset: sti: add keyscan for stih416
       ARM: STi: DT: add keyscan for stih415
       ARM: STi: DT: add keyscan for stih416
       ARM: STi: DT: add keyscan for stih41x-b2000
       ARM: STi: DT: STiH416: 416 DT Entry for clockgen A0/1/10/11/12
       ARM: STi: DT: STiH416: Remove unused CLK_S_ICN_REG_0 fixed clock
       ARM: STi: DT: STiH416: Remove unused CLK_S_GMAC0_PHY & 
CLK_S_ETH1_PHY fixed clocks
       ARM: STi: DT: STiH416: 416 DT Entry for clockgen B/C/D/E/F
       ARM: STi: DT: STiH416: 416 DT Entry for clockgen A9/DDR/GPU
       ARM: STi: DT: STiH415: 415 DT Entry for clockgen A0/1/10/11/12
       ARM: STi: DT: STiH415: Remove unused CLK_S_ICN_REG_0 fixed clock
       ARM: STi: DT: STiH415: Remove unused CLK_S_GMAC0_PHY & 
CLK_S_ETH1_PHY fixed clocks
       ARM: STi: DT: STiH415: 415 DT Entry for clockgen A9
       ARM: STi: DT: STiH41x Add clk_ignore_unused to bootargs

Maxime Coquelin (2):
       ARM: dts: Add STiH407 SoC support
       ARM: dts: STiH407: Add B2120 board support

  arch/arm/boot/dts/Makefile                         |   3 +-
  arch/arm/boot/dts/stih407-b2120.dts                |  78 +++
  arch/arm/boot/dts/stih407-clock.dtsi               |  40 ++
  arch/arm/boot/dts/stih407-pinctrl.dtsi             | 615 +++++++++++++++++
  arch/arm/boot/dts/stih407.dtsi                     | 263 ++++++++
  arch/arm/boot/dts/stih415-clock.dtsi               | 517 ++++++++++++++-
  arch/arm/boot/dts/stih415-pinctrl.dtsi             |  16 +
  arch/arm/boot/dts/stih415.dtsi                     |  22 +-
  arch/arm/boot/dts/stih416-clock.dtsi               | 732 
++++++++++++++++++++-
  arch/arm/boot/dts/stih416-pinctrl.dtsi             |  16 +
  arch/arm/boot/dts/stih416.dtsi                     |  22 +-
  arch/arm/boot/dts/stih41x-b2000.dtsi               |  25 +-
  arch/arm/boot/dts/stih41x-b2020.dtsi               |   2 +-
  drivers/reset/sti/reset-stih415.c                  |   1 +
  drivers/reset/sti/reset-stih416.c                  |   1 +
  include/dt-bindings/clock/stih415-clks.h           |  15 +
  include/dt-bindings/clock/stih416-clks.h           |  15 +
  .../dt-bindings/reset-controller/stih415-resets.h  |   1 +
  .../dt-bindings/reset-controller/stih416-resets.h  |   1 +
  19 files changed, 2339 insertions(+), 46 deletions(-)
  create mode 100644 arch/arm/boot/dts/stih407-b2120.dts
  create mode 100644 arch/arm/boot/dts/stih407-clock.dtsi
  create mode 100644 arch/arm/boot/dts/stih407-pinctrl.dtsi
  create mode 100644 arch/arm/boot/dts/stih407.dtsi
  create mode 100644 include/dt-bindings/clock/stih415-clks.h
  create mode 100644 include/dt-bindings/clock/stih416-clks.h

Comments

Srinivas Kandagatla May 16, 2014, 9:47 a.m. UTC | #1
On 16/05/14 09:51, Maxime Coquelin wrote:
> Hi Olof, Kevin and Arnd,
>
> Please consider these STi DT updates for v3.16.
>
> Note that two reset patches are part of this pull request, in order to
> avoid compilation breakage.
> Adding these two patches in this pull request has been accepted by
> Philipp Zabel.
>
> The following changes since commit
> 2542f928b2131a0367e50a4390afc12084cc4cc4:
>
>    Merge tag 'renesas-dt2-for-v3.16' of
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
> (2014-05-05 18:44:12 -0700)
>

renesas ??

> are available in the git repository at:
>
>
>    git://git.stlinux.com/devel/kernel/linux-sti.git tags/sti-dt-for-v3.16
Maxime COQUELIN May 16, 2014, 2:31 p.m. UTC | #2
Hi,

On 05/16/2014 11:47 AM, Srinivas Kandagatla wrote:
>
>
> On 16/05/14 09:51, Maxime Coquelin wrote:
>> Hi Olof, Kevin and Arnd,
>>
>> Please consider these STi DT updates for v3.16.
>>
>> Note that two reset patches are part of this pull request, in order to
>> avoid compilation breakage.
>> Adding these two patches in this pull request has been accepted by
>> Philipp Zabel.
>>
>> The following changes since commit
>> 2542f928b2131a0367e50a4390afc12084cc4cc4:
>>
>>    Merge tag 'renesas-dt2-for-v3.16' of
>> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
>> (2014-05-05 18:44:12 -0700)
>>
>
> renesas ??

As discussed on IRC, I have based this pull request on top of arm_soc's 
next/dt branch, whereas I should have based in top of v3.15-rc1.

Arnd, Olof, Kevin, is it fine for this time?
Or should I resend the two pull requests based on top of v3.15-rc1?
Either ways are fine to me, just let me know!

Thanks,
Maxime

>
>> are available in the git repository at:
>>
>>
>>    git://git.stlinux.com/devel/kernel/linux-sti.git tags/sti-dt-for-v3.16
Olof Johansson May 16, 2014, 5:27 p.m. UTC | #3
On Fri, May 16, 2014 at 7:31 AM, Maxime Coquelin <maxime.coquelin@st.com> wrote:
> Hi,
>
>
> On 05/16/2014 11:47 AM, Srinivas Kandagatla wrote:
>>
>>
>>
>> On 16/05/14 09:51, Maxime Coquelin wrote:
>>>
>>> Hi Olof, Kevin and Arnd,
>>>
>>> Please consider these STi DT updates for v3.16.
>>>
>>> Note that two reset patches are part of this pull request, in order to
>>> avoid compilation breakage.
>>> Adding these two patches in this pull request has been accepted by
>>> Philipp Zabel.
>>>
>>> The following changes since commit
>>> 2542f928b2131a0367e50a4390afc12084cc4cc4:
>>>
>>>    Merge tag 'renesas-dt2-for-v3.16' of
>>> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
>>> (2014-05-05 18:44:12 -0700)
>>>
>>
>> renesas ??
>
>
> As discussed on IRC, I have based this pull request on top of arm_soc's
> next/dt branch, whereas I should have based in top of v3.15-rc1.
>
> Arnd, Olof, Kevin, is it fine for this time?
> Or should I resend the two pull requests based on top of v3.15-rc1?
> Either ways are fine to me, just let me know!

No, this is unfortunately not something we can merge in. You have to
base your branch on top of an upstream -rc, not on our category
branches. Please send fresh requests.


Thanks!


-Olof