[GIT PULL 0/2] rockchip dts changes for 3.17

[GIT PULL 0/2] rockchip dts changes for 3.17

[Heiko Stübner]

Hi Arnd and Olof,

in [0] and its follow ups it was suggested to use the branch carrying
the main clock controller code as dependency for the dts changes going
through arm-soc, so could you please pull in as a dependency

	git://git.linaro.org/people/mike.turquette/linux.git clk-rockchip

for the following two pull requests?


Thanks
Heiko


[0] http://www.spinics.net/lists/arm-kernel/msg347053.html

[GIT PULL 1/2] ARM: dts: support for Rockchip RK3288

[Heiko Stübner]

The following changes since commit 1fe69496cf463b654d2d6e1a9a10fb8d99f10831:

  ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER (2014-07-13 12:17:11 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v3.17-rockchip-rk3288

for you to fetch changes up to b1db66b818a4cb1a654ae51a5ca32a09d1ccd825:

  ARM: dts: Build dtbs for Rockchip boards (2014-07-26 13:07:27 +0200)

----------------------------------------------------------------
Initial support for Rockchip RK3288 SoCs.

----------------------------------------------------------------
Doug Anderson (1):
      ARM: dts: Build dtbs for Rockchip boards

Heiko Stuebner (7):
      dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible properties
      ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll options
      ARM: rockchip: add debug uart used by rk3288
      ARM: Kconfig: set default gpio number for rockchip SoCs
      ARM: rockchip: enable support for RK3288 SoCs
      ARM: dts: rockchip: add core rk3288 dtsi
      ARM: dts: add rk3288 evaluation board

 Documentation/devicetree/bindings/arm/cpus.txt |   2 +
 arch/arm/Kconfig                               |   1 +
 arch/arm/Kconfig.debug                         |  20 +-
 arch/arm/boot/dts/Makefile                     |   5 +
 arch/arm/boot/dts/rk3288-evb-act8846.dts       | 134 ++++++
 arch/arm/boot/dts/rk3288-evb-rk808.dts         |  18 +
 arch/arm/boot/dts/rk3288-evb.dtsi              |  74 ++++
 arch/arm/boot/dts/rk3288.dtsi                  | 575 +++++++++++++++++++++++++
 arch/arm/mach-rockchip/Kconfig                 |   1 +
 arch/arm/mach-rockchip/rockchip.c              |   1 +
 10 files changed, 826 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3288-evb-act8846.dts
 create mode 100644 arch/arm/boot/dts/rk3288-evb-rk808.dts
 create mode 100644 arch/arm/boot/dts/rk3288-evb.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288.dtsi

[GIT PULL 2/2] ARM: dts: changes for existing boards

[Heiko Stübner]

The following changes since commit 1fe69496cf463b654d2d6e1a9a10fb8d99f10831:

  ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER (2014-07-13 12:17:11 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v3.17-rockchip-rk3xxx-dts

for you to fetch changes up to 08567053f5cc4255ab53b75277b6102a3202bd75:

  ARM: dts: rk3188-radxarock: add GPIO IR receiver node (2014-07-27 00:25:59 +0200)

----------------------------------------------------------------
Collected changes for existing Rockchip boards
- convert to new clock driver
- bring structure in line with recent rk3288 comments
  (no soc-nodes, using phandles when adding changes, sorted by address)
- i2c, board-pmic and pwm nodes nodes
- sd card slot and ir receiver on radxa rock

----------------------------------------------------------------
Beniamino Galvani (3):
      ARM: dts: add i2c and regulator nodes to rk3188-radxarock
      ARM: dts: rockchip: add pwm nodes
      ARM: dts: rk3188-radxarock: add GPIO IR receiver node

Heiko Stuebner (12):
      ARM: dts: rockchip: add cru nodes and update device clocks to use it
      ARM: dts: rockchip: move oscillator input clock into main dtsi
      arm: dts: rockchip: remove obsolete clock gate definitions
      ARM: dts: rockchip: remove soc subnodes
      ARM: dts: rockchip: add handles for shared nodes that don't have one yet
      ARM: dts: uses handles to reference nodes for changes
      ARM: dts: rockchip: remove address from pinctrl nodes
      ARM: dts: rockchip: oder nodes by register address
      ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settings
      ARM: dts: rockchip: add tps65910 regulator for bqcurie2
      ARM: dts: rk3188-radxarock: enable sd-card slot
      ARM: dts: rockchip: add both clocks to uart nodes

 arch/arm/boot/dts/rk3066a-bqcurie2.dts | 210 +++++++++-----
 arch/arm/boot/dts/rk3066a-clocks.dtsi  | 299 -------------------
 arch/arm/boot/dts/rk3066a.dtsi         | 515 +++++++++++++++++++++------------
 arch/arm/boot/dts/rk3188-clocks.dtsi   | 289 ------------------
 arch/arm/boot/dts/rk3188-radxarock.dts | 216 +++++++++++---
 arch/arm/boot/dts/rk3188.dtsi          | 442 ++++++++++++++++++----------
 arch/arm/boot/dts/rk3xxx.dtsi          | 348 ++++++++++++++--------
 7 files changed, 1176 insertions(+), 1143 deletions(-)
 delete mode 100644 arch/arm/boot/dts/rk3066a-clocks.dtsi
 delete mode 100644 arch/arm/boot/dts/rk3188-clocks.dtsi

[GIT PULL 1/2] ARM: dts: support for Rockchip RK3288

[Arnd Bergmann]

On Monday 28 July 2014 13:48:45 Heiko St?bner wrote:
> The following changes since commit 1fe69496cf463b654d2d6e1a9a10fb8d99f10831:
> 
>   ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER (2014-07-13 12:17:11 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v3.17-rockchip-rk3288
> 
> for you to fetch changes up to b1db66b818a4cb1a654ae51a5ca32a09d1ccd825:
> 
>   ARM: dts: Build dtbs for Rockchip boards (2014-07-26 13:07:27 +0200)
> 

Hi Heiko,

I don't seem to have 1fe69496cf463b654 ("ARM: rockchip: Select
ARCH_HAS_RESET_CONTROLLER") in arm-soc. Any idea what is going
on?

Did I miss another pull request, or did you rebased your patches
on the wrong branch?

	Arnd

[GIT PULL 1/2] ARM: dts: support for Rockchip RK3288

[Heiko Stübner]

Am Montag, 28. Juli 2014, 13:55:38 schrieb Arnd Bergmann:
> On Monday 28 July 2014 13:48:45 Heiko St?bner wrote:
> > The following changes since commit 
1fe69496cf463b654d2d6e1a9a10fb8d99f10831:
> >   ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER (2014-07-13 12:17:11
> >   -0700)
> > 
> > are available in the git repository at:
> >   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
> >   tags/v3.17-rockchip-rk3288> 
> > for you to fetch changes up to b1db66b818a4cb1a654ae51a5ca32a09d1ccd825:
> >   ARM: dts: Build dtbs for Rockchip boards (2014-07-26 13:07:27 +0200)
> 
> Hi Heiko,
> 
> I don't seem to have 1fe69496cf463b654 ("ARM: rockchip: Select
> ARCH_HAS_RESET_CONTROLLER") in arm-soc. Any idea what is going
> on?
> 
> Did I miss another pull request, or did you rebased your patches
> on the wrong branch?

hmm, the cover-letter was meant to explain this :-)

aka both requests need

 git://git.linaro.org/people/mike.turquette/linux.git clk-rockchip

as dependency


Heiko

[GIT PULL 1/2] ARM: dts: support for Rockchip RK3288

[Arnd Bergmann]

On Monday 28 July 2014 13:59:41 Heiko St?bner wrote:
> Am Montag, 28. Juli 2014, 13:55:38 schrieb Arnd Bergmann:
> > On Monday 28 July 2014 13:48:45 Heiko St?bner wrote:
> > > The following changes since commit 
> 1fe69496cf463b654d2d6e1a9a10fb8d99f10831:
> > >   ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER (2014-07-13 12:17:11
> > >   -0700)
> > > 
> > > are available in the git repository at:
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
> > >   tags/v3.17-rockchip-rk3288> 
> > > for you to fetch changes up to b1db66b818a4cb1a654ae51a5ca32a09d1ccd825:
> > >   ARM: dts: Build dtbs for Rockchip boards (2014-07-26 13:07:27 +0200)
> > 
> > Hi Heiko,
> > 
> > I don't seem to have 1fe69496cf463b654 ("ARM: rockchip: Select
> > ARCH_HAS_RESET_CONTROLLER") in arm-soc. Any idea what is going
> > on?
> > 
> > Did I miss another pull request, or did you rebased your patches
> > on the wrong branch?
> 
> hmm, the cover-letter was meant to explain this 
> 
> aka both requests need
> 
>  git://git.linaro.org/people/mike.turquette/linux.git clk-rockchip
> 
> as dependency
> 

Ok, got it. Thanks for the quick reply. Everything pulled.

The way I dealt with the dependency on our end was to merge the
clk-rockchip branch into both next/soc and next/dt, and merge
both your branches on top, in next/dt.

This way, the clk changes end up in the soc branch if we are
sending our stuff before Mike sends his tree, and the next/dt
branch is for DT-changes only.

Olof, watch out for this in case it confuses your scripts.

	Arnd