ARM: STi: DT changes for v3.18

GIT PULL Maxime Coquelin 2 participants 5 messages Sep 23, 2014 – Oct 1, 2014

Share & tools

Maxime Coquelin

author

2014-09-23 11:29 UTC #0 lore raw

Hi Olof, Kevin and Arnd,

Please consider these STi DT updates for v3.18.
This pull request contains a merge from Philipp Zabel's reset tag that will not be rebased. (See https://lkml.org/lkml/2014/9/9/856)

The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:

Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)

are available in the git repository at:

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

for you to fetch changes up to 487eebe358ab131ccb20280bb75ea14c02751c2d:

ARM: STi: DT: STiH407: Fix: clk-tmds-hdmi clock is missing (2014-09-23 09:46:11 +0200)

----------------------------------------------------------------
STi DT uptades for v3.18.

Highlights:
-----------
- Add SDHCI support for STiH41x B2020 boards
- Add reset controllers to STiH407 SoC
- Add MiPHY & SATA support to STiH416
- Add Thermal supportto STiH416
- Add Clock support to STiH407 SoC

Note that this pull request contains merge from Philipp Zabel's reset tree for STiH407 reset DT bindings includes.

----------------------------------------------------------------
Gabriel FERNANDEZ (6):
ARM: STi: DT: STiH407: 407 DT Entry for clockgen A0
ARM: STi: DT: STiH407: 407 DT Entry for clockgen C0
ARM: STi: DT: STiH407: 407 DT Entry for clockgen D0/D2/D3
ARM: STi: DT: STiH407: 407 DT Entry for clockgenA9
ARM: STi: DT: STiH407: Add all defines for STiH407 DT clocks
ARM: STi: DT: STiH407: Fix: clk-tmds-hdmi clock is missing

Lee Jones (4):
ARM: STi: DT: STiH41x: Convert all uppercase non-defines to lowercase
ARM: STi: DT: STiH416: Supply Thermal Controller Device Tree nodes
ARM: DT: STi: STiH416: Add DT node for MiPHY365x
ARM: DT: STi: STiH416: Add DT node for ST's SATA device

Maxime Coquelin (1):
Merge tag 'reset-for-sti-3.18' from git://git.pengutronix.de/git/pza/linux.git into sti-dt-for-v3.18

Peter Griffin (10):
reset: stih407: Add softreset, powerdown and picophy controllers
reset: sti: Document sti-picophyreset controllers bindings.
ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
ARM: sti: Add STiH407 reset controller support.
ARM: STi: DT: Add sdhci pins for stih416
ARM: STi: DT: Add sdhci controller for stih416
ARM: STi: DT: Add sdhci pin configuration for stih415
ARM: STi: DT: Add sdhci controller for stih415
ARM: STi: DT: Enable mmc0 for both stih415 and stih416 SoCs
ARM: STi: DT: Enable second sdhci controller for stih416 b2020 boards.

 .../bindings/reset/st,sti-picophyreset.txt         |  42 +++
 arch/arm/boot/dts/stih407-clock.dtsi               | 293 +++++++++++++++-
 arch/arm/boot/dts/stih407.dtsi                     |  34 +-
 arch/arm/boot/dts/stih415-pinctrl.dtsi             | 361 ++++++++++---------
 arch/arm/boot/dts/stih415.dtsi                     |  12 +
 arch/arm/boot/dts/stih416-b2020.dts                |  22 ++
 arch/arm/boot/dts/stih416-b2020e.dts               |  26 +-
 arch/arm/boot/dts/stih416-pinctrl.dtsi             | 381 ++++++++++++---------
 arch/arm/boot/dts/stih416.dtsi                     |  80 +++++
 arch/arm/boot/dts/stih41x-b2000.dtsi               |   6 +-
 arch/arm/boot/dts/stih41x-b2020.dtsi               |  10 +-
 arch/arm/boot/dts/stih41x-b2020x.dtsi              |   4 +
 arch/arm/mach-sti/Kconfig                          |  10 +
 drivers/reset/sti/Kconfig                          |   4 +
 drivers/reset/sti/Makefile                         |   1 +
 drivers/reset/sti/reset-stih407.c                  | 158 +++++++++
 include/dt-bindings/clock/stih407-clks.h           |  86 +++++
 .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++
 18 files changed, 1229 insertions(+), 362 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
 create mode 100644 drivers/reset/sti/reset-stih407.c
 create mode 100644 include/dt-bindings/clock/stih407-clks.h
 create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h

Maxime Coquelin

author

2014-10-01 11:58 UTC #1 lore raw

Hi Olof, Kevin and Arnd,

This is a gentle reminder for this pull request I sent early last week.

I hope it is not too late for the merge window?

Thanks,
Maxime

Quoted 85 lines · Maxime Coquelin

Hi Olof, Kevin and Arnd,
Please consider these STi DT updates for v3.18.
This pull request contains a merge from Philipp Zabel's reset tag that will not be rebased. (See https://lkml.org/lkml/2014/9/9/856)
The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
   Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
   git://git.stlinux.com/devel/kernel/linux-sti.git tags/sti-dt-for-v3.18-1
for you to fetch changes up to 487eebe358ab131ccb20280bb75ea14c02751c2d:
   ARM: STi: DT: STiH407: Fix: clk-tmds-hdmi clock is missing (2014-09-23 09:46:11 +0200)
----------------------------------------------------------------
STi DT uptades for v3.18.
Highlights:
-----------
- Add SDHCI support for STiH41x B2020 boards
- Add reset controllers to STiH407 SoC
- Add MiPHY & SATA support to STiH416
- Add Thermal supportto STiH416
- Add Clock support to STiH407 SoC
Note that this pull request contains merge from Philipp Zabel's reset tree for STiH407 reset DT bindings includes.
----------------------------------------------------------------
Gabriel FERNANDEZ (6):
ARM: STi: DT: STiH407: 407 DT Entry for clockgen A0
ARM: STi: DT: STiH407: 407 DT Entry for clockgen C0
ARM: STi: DT: STiH407: 407 DT Entry for clockgen D0/D2/D3
ARM: STi: DT: STiH407: 407 DT Entry for clockgenA9
ARM: STi: DT: STiH407: Add all defines for STiH407 DT clocks
ARM: STi: DT: STiH407: Fix: clk-tmds-hdmi clock is missing
Lee Jones (4):
ARM: STi: DT: STiH41x: Convert all uppercase non-defines to lowercase
ARM: STi: DT: STiH416: Supply Thermal Controller Device Tree nodes
ARM: DT: STi: STiH416: Add DT node for MiPHY365x
ARM: DT: STi: STiH416: Add DT node for ST's SATA device
Maxime Coquelin (1):
Merge tag 'reset-for-sti-3.18' from git://git.pengutronix.de/git/pza/linux.git into sti-dt-for-v3.18
Peter Griffin (10):
reset: stih407: Add softreset, powerdown and picophy controllers
reset: sti: Document sti-picophyreset controllers bindings.
ARM: sti: Add STiH407 Kconfig entry to select STIH407_RESET
ARM: sti: Add STiH407 reset controller support.
ARM: STi: DT: Add sdhci pins for stih416
ARM: STi: DT: Add sdhci controller for stih416
ARM: STi: DT: Add sdhci pin configuration for stih415
ARM: STi: DT: Add sdhci controller for stih415
ARM: STi: DT: Enable mmc0 for both stih415 and stih416 SoCs
ARM: STi: DT: Enable second sdhci controller for stih416 b2020 boards.
  .../bindings/reset/st,sti-picophyreset.txt         |  42 +++
  arch/arm/boot/dts/stih407-clock.dtsi               | 293 +++++++++++++++-
  arch/arm/boot/dts/stih407.dtsi                     |  34 +-
  arch/arm/boot/dts/stih415-pinctrl.dtsi             | 361 ++++++++++---------
  arch/arm/boot/dts/stih415.dtsi                     |  12 +
  arch/arm/boot/dts/stih416-b2020.dts                |  22 ++
  arch/arm/boot/dts/stih416-b2020e.dts               |  26 +-
  arch/arm/boot/dts/stih416-pinctrl.dtsi             | 381 ++++++++++++---------
  arch/arm/boot/dts/stih416.dtsi                     |  80 +++++
  arch/arm/boot/dts/stih41x-b2000.dtsi               |   6 +-
  arch/arm/boot/dts/stih41x-b2020.dtsi               |  10 +-
  arch/arm/boot/dts/stih41x-b2020x.dtsi              |   4 +
  arch/arm/mach-sti/Kconfig                          |  10 +
  drivers/reset/sti/Kconfig                          |   4 +
  drivers/reset/sti/Makefile                         |   1 +
  drivers/reset/sti/reset-stih407.c                  | 158 +++++++++
  include/dt-bindings/clock/stih407-clks.h           |  86 +++++
  .../dt-bindings/reset-controller/stih407-resets.h  |  61 ++++
  18 files changed, 1229 insertions(+), 362 deletions(-)
create mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt create mode 100644 drivers/reset/sti/reset-stih407.c
create mode 100644 include/dt-bindings/clock/stih407-clks.h
create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h

Arnd Bergmann

2014-10-01 15:07 UTC #2 lore raw

In reply to Maxime Coquelin

Quoted 9 lines · Maxime Coquelin

Highlights:
-----------
- Add SDHCI support for STiH41x B2020 boards
- Add reset controllers to STiH407 SoC
- Add MiPHY & SATA support to STiH416
- Add Thermal supportto STiH416
- Add Clock support to STiH407 SoC
Note that this pull request contains merge from Philipp Zabel's reset tree for STiH407 reset DT bindings includes.

Pulled into the next/late branch. If we end up sending a pull request for the late stuff this time, that also gives Philipp time to go first with his branches.

Unfortunately, your submission came a bit late, so no guarantee this is going to make it into 3.18. If we see too many regressions with the earlier branches, we'll defer it for 3.19.

Arnd

Maxime Coquelin

author

2014-10-01 16:12 UTC #3 lore raw

Quoted 9 lines · Arnd Bergmann

Quoted 8 lines · Maxime Coquelin
Highlights:
-----------
- Add SDHCI support for STiH41x B2020 boards
- Add reset controllers to STiH407 SoC
- Add MiPHY & SATA support to STiH416
- Add Thermal supportto STiH416
- Add Clock support to STiH407 SoC

Quoted 6 lines

Quoted 1 line
Note that this pull request contains merge from Philipp Zabel's reset tree for STiH407 reset DT bindings includes.
Pulled into the next/late branch. If we end up sending a pull request for the late stuff this time, that also gives Philipp time to go first with his branches.

Ok, Philipp only has the STi patches in his branch for v3.18.
I think he didn't planned to send a pull request for it, expecting it would go through mine.

Quoted 4 lines

Unfortunately, your submission came a bit late, so no guarantee this is going to make it into 3.18. If we see too many regressions with the earlier branches, we'll defer it for 3.19.

Yes, I have been busy these days with other topics, but I thought it wasn't too late, since it was two weeks before the opening of the merge window.

For next time, could tell me starting which -rc you consider it is too late?

Regards,
Maxime

Quoted 3 lines

Arnd

Arnd Bergmann

2014-10-01 16:40 UTC #4 lore raw

Quoted 9 lines · On Wednesday 01 October 2014 18:12:20 Maxime Coquelin wrote:

Quoted 5 lines
Unfortunately, your submission came a bit late, so no guarantee this is going to make it into 3.18. If we see too many regressions with the earlier branches, we'll defer it for 3.19.
Yes, I have been busy these days with other topics, but I thought it wasn't too late, since it was two weeks before the opening of the merge window.
For next time, could tell me starting which -rc you consider it is too late?

Linus said last week that he would probably not do an -rc7, in which case it would have been too late. We don't have a hard rule like "before -rc5". In general, we like to see the majority of patches sent as early as possible, and then followed up with smaller changes as we get closer to the merge window.

We're more likely to merge a 20-patch series late in the cycle when we already have 100 patches from the same maintainer than for the case where haven't seen anything for that platform at all.

Arnd