Patchwork [v2,0/6] CLK: tegra: convert device tree files to use CLK defines

login
register
mail settings
Submitter Hiroshi Doyu
Date May 21, 2013, 9:10 a.m.
Message ID <1369127450-15203-1-git-send-email-hdoyu@nvidia.com>
Download mbox
Permalink /patch/245331/
State New
Headers show

Pull-request

git://nv-tegra.nvidia.com/user/hdoyu/linux.git dt-replace-clkid

Comments

Hiroshi Doyu - May 21, 2013, 9:10 a.m.
This patchset converts device tree files to use CLK defines. This
version was updated along with the latest DT changes.

The following changes since commit 7479d8bb5650f43053d0e82fa44db668cf968f11:

  TESTING: Build Tegra USB as a module (2013-05-20 13:11:19 -0600)

are available in the git repository at:

  git://nv-tegra.nvidia.com/user/hdoyu/linux.git dt-replace-clkid

for you to fetch changes up to cfafa8272866ecc3e8baad7f3066921b279890fe:

  ARM: tegra114: convert device tree files to use CLK defines (2013-05-21 11:16:47 +0300)

----------------------------------------------------------------
Hiroshi Doyu (6):
      ARM: tegra20: create a DT header defining CLK IDs
      ARM: tegra20: convert device tree files to use CLK defines
      ARM: tegra30: create a DT header defining CLK IDs
      ARM: tegra30: convert device tree files to use CLK defines
      ARM: tegra114: create a DT header defining CLK IDs
      ARM: tegra114: convert device tree files to use CLK defines

 .../bindings/clock/nvidia,tegra114-car.txt         | 252 +--------------
 .../bindings/clock/nvidia,tegra20-car.txt          | 154 +---------
 .../bindings/clock/nvidia,tegra30-car.txt          | 211 +------------
 arch/arm/boot/dts/tegra114-dalmore.dts             |   4 +-
 arch/arm/boot/dts/tegra114.dtsi                    |  79 ++---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi         |   4 +-
 arch/arm/boot/dts/tegra20-harmony.dts              |   4 +-
 arch/arm/boot/dts/tegra20-medcom-wide.dts          |   4 +-
 arch/arm/boot/dts/tegra20-paz00.dts                |   4 +-
 arch/arm/boot/dts/tegra20-plutux.dts               |   4 +-
 arch/arm/boot/dts/tegra20-seaboard.dts             |   4 +-
 arch/arm/boot/dts/tegra20-tec.dts                  |   4 +-
 arch/arm/boot/dts/tegra20-trimslice.dts            |   4 +-
 arch/arm/boot/dts/tegra20-ventana.dts              |   4 +-
 arch/arm/boot/dts/tegra20-whistler.dts             |   4 +-
 arch/arm/boot/dts/tegra20.dtsi                     | 116 +++----
 arch/arm/boot/dts/tegra30-beaver.dts               |   4 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi              |   4 +-
 arch/arm/boot/dts/tegra30.dtsi                     | 110 ++++---
 include/dt-bindings/clk/tegra114-car.h             | 342 +++++++++++++++++++++
 include/dt-bindings/clk/tegra20-car.h              | 158 ++++++++++
 include/dt-bindings/clk/tegra30-car.h              | 265 ++++++++++++++++
 22 files changed, 984 insertions(+), 755 deletions(-)
 create mode 100644 include/dt-bindings/clk/tegra114-car.h
 create mode 100644 include/dt-bindings/clk/tegra20-car.h
 create mode 100644 include/dt-bindings/clk/tegra30-car.h
Stephen Warren - May 21, 2013, 4:05 p.m.
On 05/21/2013 03:10 AM, Hiroshi Doyu wrote:
> This patchset converts device tree files to use CLK defines. This
> version was updated along with the latest DT changes.
> 
> The following changes since commit 7479d8bb5650f43053d0e82fa44db668cf968f11:
> 
>   TESTING: Build Tegra USB as a module (2013-05-20 13:11:19 -0600)

That commit is in my personal work-in-progress branch. This series
should be based on Tegra's for-3.11/dt branch. This will make a
difference (at least) in patch 6/6, where you've edited some DT nodes
that don't yet exist upstream (i.e. Tegra's for-3.11/dt branch) and
hence this series won't apply there.

I assume you're planning to send a series for 3.11 that converts
drivers/clk/tegra/ to use these new header files?

If so, I'll need to apply patches 1, 3, 5 to a separate branch, so it
can be pulled into the branch where the drivers/clk changes are applied,
then apply patches 2, 4, 6 to Tegra's for-3.11/dt after merging in the
branch with the header files.
Stephen Warren - May 21, 2013, 4:13 p.m.
On 05/21/2013 03:10 AM, Hiroshi Doyu wrote:
> Use the Tegra20 CAR binding header (tegra20-car.h) to replace magic
> numbers in the device tree. For example,
> 
> -               clocks = <&tegra_car 28>;
> +               clocks = <&tegra_car CLK_HOST1X>;

> diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts

> -		clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 94>;
> +		clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>, <&tegra_car TEGRA20_CLK_CDEV1>;

That's well over 80 columns. Can you wrap it and make sure there aren't
any other instances of this? I guess checkpatch doesn't actually impose
this rule on *.dts files, since it didn't complain about this.
Hiroshi Doyu - May 22, 2013, 6:12 a.m.
On Tue, 21 May 2013 18:05:49 +0200
Stephen Warren <swarren@wwwdotorg.org> wrote:

> On 05/21/2013 03:10 AM, Hiroshi Doyu wrote:
> > This patchset converts device tree files to use CLK defines. This
> > version was updated along with the latest DT changes.
> > 
> > The following changes since commit 7479d8bb5650f43053d0e82fa44db668cf968f11:
> > 
> >   TESTING: Build Tegra USB as a module (2013-05-20 13:11:19 -0600)
> 
> That commit is in my personal work-in-progress branch. This series
> should be based on Tegra's for-3.11/dt branch. This will make a
> difference (at least) in patch 6/6, where you've edited some DT nodes
> that don't yet exist upstream (i.e. Tegra's for-3.11/dt branch) and
> hence this series won't apply there.

I'll rebase.

> I assume you're planning to send a series for 3.11 that converts
> drivers/clk/tegra/ to use these new header files?

I think that I'll work on SMMU first, which diverted from the
downstream now. So the above may come a bit later.
Stephen Warren - May 22, 2013, 3:19 p.m.
On 05/22/2013 12:12 AM, Hiroshi Doyu wrote:
> On Tue, 21 May 2013 18:05:49 +0200
> Stephen Warren <swarren@wwwdotorg.org> wrote:
> 
>> On 05/21/2013 03:10 AM, Hiroshi Doyu wrote:
>>> This patchset converts device tree files to use CLK defines. This
>>> version was updated along with the latest DT changes.
>>>
>>> The following changes since commit 7479d8bb5650f43053d0e82fa44db668cf968f11:
>>>
>>>   TESTING: Build Tegra USB as a module (2013-05-20 13:11:19 -0600)
>>
>> That commit is in my personal work-in-progress branch. This series
>> should be based on Tegra's for-3.11/dt branch. This will make a
>> difference (at least) in patch 6/6, where you've edited some DT nodes
>> that don't yet exist upstream (i.e. Tegra's for-3.11/dt branch) and
>> hence this series won't apply there.
> 
> I'll rebase.
> 
>> I assume you're planning to send a series for 3.11 that converts
>> drivers/clk/tegra/ to use these new header files?
> 
> I think that I'll work on SMMU first, which diverted from the
> downstream now. So the above may come a bit later.

Really? SMMU support upstream is pretty low priority right now since we
don't use it yet, and only converting one of the two potential users of
this new binding header file means it isn't particularly useful.