[GIT PULL 1/5] clk: tegra: Changes for v4.5-rc1

[GIT PULL 1/5] clk: tegra: Changes for v4.5-rc1

[Thierry Reding]

Hi Mike, Stephen,

The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-clk

for you to fetch changes up to 2d7f61f37731f635af47615a8a331ffe7f884934:

  clk: tegra: Read correct IDDQ register in PLL_SS registration (2015-12-17 13:37:58 +0100)

Note that the first commit in this set adds the device tree bindings for
Tegra210. This is a dependency for the for-4.5/dt branch because it adds
the dt-bindings include file used by the Tegra210 DTS files.

Thanks,
Thierry

----------------------------------------------------------------
clk: tegra: Changes for v4.5-rc1

This set of changes adds support for the Tegra210 SoC and contains a
couple fixes and cleanups.

----------------------------------------------------------------
Andrew Bresticker (1):
      clk: tegra: pll: Fix issues with rates for VCO PLLs

Bill Huang (8):
      clk: tegra: pll: Change misc_reg count from 3 to 6
      clk: tegra: pll: Add code to handle if resets are supported by PLL
      clk: tegra: pll: Adjust vco_min if SDM present
      clk: tegra: pll: Add Set_default logic
      clk: tegra: pll: Add logic for SS
      clk: tegra: Add Super Gen5 Logic
      clk: tegra: Fix WARN_ON in PLL_RE registration
      clk: tegra: Read correct IDDQ register in PLL_SS registration

Danny Huang (1):
      clk: tegra: pll: Update PLLM handling

Rhyland Klein (12):
      clk: tegra: periph: Add new periph clks and muxes for Tegra210
      clk: tegra: pll: Add tegra_pll_wait_for_lock to clk header
      clk: tegra: pll: Simplify clk_enable_path
      clk: tegra: pll: Update warning message
      clk: tegra: pll: Don't unconditionally set LOCK flags
      clk: tegra: pll: Add logic for handling SDM data
      clk: tegra: pll: Add logic for out-of-table rates for T210
      clk: tegra: pll: Fix _pll_ramp_calc_pll logic and _calc_dynamic_ramp_rate
      clk: tegra: pll: Add specialized logic for Tegra210
      clk: tegra: pll: Add support for PLLMB for Tegra210
      clk: tegra: pll: Add dyn_ramp callback
      clk: tegra: Add support for Tegra210 clocks

Thierry Reding (5):
      clk: tegra: Add Tegra210 device tree binding
      clk: tegra: Fix 26 MHz oscillator frequency
      clk: tegra: Miscellaneous coding style cleanups
      clk: tegra: Format tables consistently
      clk: tegra: Constify pdiv-to-hw mappings

 .../bindings/clock/nvidia,tegra210-car.txt         |   56 +
 drivers/clk/tegra/Makefile                         |    1 +
 drivers/clk/tegra/clk-id.h                         |   75 +-
 drivers/clk/tegra/clk-pll.c                        |  838 ++++--
 drivers/clk/tegra/clk-tegra-periph.c               |  371 ++-
 drivers/clk/tegra/clk-tegra-super-gen4.c           |  142 +-
 drivers/clk/tegra/clk-tegra114.c                   |  339 +--
 drivers/clk/tegra/clk-tegra124.c                   |  453 ++--
 drivers/clk/tegra/clk-tegra20.c                    |  314 ++-
 drivers/clk/tegra/clk-tegra210.c                   | 2852 ++++++++++++++++++++
 drivers/clk/tegra/clk-tegra30.c                    |  426 +--
 drivers/clk/tegra/clk.h                            |  101 +-
 include/dt-bindings/clock/tegra210-car.h           |  401 +++
 13 files changed, 5439 insertions(+), 930 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
 create mode 100644 drivers/clk/tegra/clk-tegra210.c
 create mode 100644 include/dt-bindings/clock/tegra210-car.h

[GIT PULL 2/5] memory: tegra: Changes for v4.5-rc1

[Thierry Reding]

Hi ARM SoC maintainers,

The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-memory

for you to fetch changes up to e2127ae7a5e80eb53ad431c39145767391da40cd:

  memory/tegra: Add number of TLB lines for Tegra124 (2015-12-14 16:11:35 +0100)

Thanks,
Thierry

----------------------------------------------------------------
memory: tegra: Changes for v4.5-rc1

This is a single fix to improve performance of the SMMU on Tegra124.

----------------------------------------------------------------
Vince Hsu (1):
      memory/tegra: Add number of TLB lines for Tegra124

 drivers/memory/tegra/tegra124.c | 1 +
 1 file changed, 1 insertion(+)

[GIT PULL 3/5] ARM: tegra: Core SoC changes for v4.5-rc1

[Thierry Reding]

Hi ARM SoC maintainers,

The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-soc

for you to fetch changes up to a262e87ff354f12447bb6268bd63edf7ba1c20e0:

  ARM: tegra: select USB_ULPI from EHCI rather than platform (2015-11-24 16:47:26 +0100)

Thanks,
Thierry

----------------------------------------------------------------
ARM: tegra: Core SoC changes for v4.5-rc1

The big thing here is Tegra210 support, which is really only the Kconfig
symbol. Other than that there's a few miscellaneous fixes.

----------------------------------------------------------------
Arnd Bergmann (1):
      ARM: tegra: select USB_ULPI from EHCI rather than platform

Jon Hunter (1):
      ARM: tegra: Ensure entire dcache is flushed on entering LP0/1

Thierry Reding (3):
      soc/tegra: Provide per-SoC Kconfig symbols
      soc/tegra: Add Tegra210 support
      amba: Hide TEGRA_AHB symbol

 arch/arm/mach-tegra/Kconfig         | 54 +-----------------------
 arch/arm/mach-tegra/sleep-tegra20.S |  3 ++
 arch/arm/mach-tegra/sleep-tegra30.S |  3 ++
 arch/arm64/Kconfig.platforms        | 12 ------
 drivers/amba/Kconfig                |  2 +-
 drivers/soc/Kconfig                 |  1 +
 drivers/soc/tegra/Kconfig           | 83 +++++++++++++++++++++++++++++++++++++
 drivers/usb/host/Kconfig            |  2 +
 8 files changed, 94 insertions(+), 66 deletions(-)
 create mode 100644 drivers/soc/tegra/Kconfig

[GIT PULL 4/5] ARM: tegra: Devicetree changes for v4.5-rc1

[Thierry Reding]

Hi ARM SoC maintainers,

The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-dt

for you to fetch changes up to 336f79c7b6d7d04f7dad0361b9f4c8995107c062:

  arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support (2015-11-24 16:52:25 +0100)

Note that this pulls in the device tree bindings for the Tegra210 clock
and reset controller. A separate pull request is sent to the clock tree
maintainers including this commit. I've included this patch in the diff
stat below.

Thanks,
Thierry

----------------------------------------------------------------
ARM: tegra: Devicetree changes for v4.5-rc1

This adds support for the Tegra132 Norrin and various Tegra210-based
reference designs. There is also an initial device tree for the Jetson
TX1 development kit.

----------------------------------------------------------------
Thierry Reding (15):
      clk: tegra: Add Tegra210 device tree binding
      soc/tegra: Provide per-SoC Kconfig symbols
      soc/tegra: Add Tegra210 support
      Merge branch 'for-4.5/clk' into for-4.5/dt
      Merge branch 'for-4.5/soc' into for-4.5/dt
      arm64: tegra: Add Tegra132 support
      arm64: tegra: Add NVIDIA Tegra132 Norrin support
      arm64: tegra: Add Tegra210 support
      arm64: tegra: Add NVIDIA P2530 main board support
      arm64: tegra: Add NVIDIA P2595 I/O board support
      arm64: tegra: Add NVIDIA P2371 board support
      arm64: tegra: Add NVIDIA P2571 board support
      arm64: tegra: Add NVIDIA Jetson TX1 support
      arm64: tegra: Add NVIDIA P2597 I/O board support
      arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support

 .../bindings/clock/nvidia,tegra210-car.txt         |   56 +
 arch/arm/mach-tegra/Kconfig                        |   52 +-
 arch/arm64/Kconfig.platforms                       |   12 -
 arch/arm64/boot/dts/Makefile                       |    1 +
 arch/arm64/boot/dts/nvidia/Makefile                |    7 +
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts     | 1130 +++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra132.dtsi           |  990 +++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     |   45 +
 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts |    9 +
 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts |    9 +
 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi     |   50 +
 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts      | 1302 ++++++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi     | 1272 +++++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi     | 1270 +++++++++++++++++++
 arch/arm64/boot/dts/nvidia/tegra210.dtsi           |  805 ++++++++++++
 drivers/soc/Kconfig                                |    1 +
 drivers/soc/tegra/Kconfig                          |   87 ++
 include/dt-bindings/clock/tegra210-car.h           |  401 ++++++
 18 files changed, 7436 insertions(+), 63 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
 create mode 100644 arch/arm64/boot/dts/nvidia/Makefile
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra132.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra210.dtsi
 create mode 100644 drivers/soc/tegra/Kconfig
 create mode 100644 include/dt-bindings/clock/tegra210-car.h

[GIT PULL 5/5] ARM: tegra: Default configuration updates for v4.5-rc1

[Thierry Reding]

Hi ARM SoC maintainers,

The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-defconfig

for you to fetch changes up to 36d6e0872152aab506f952792db7221b9c25ed33:

  arm64: defconfig: Enable printk timestamps (2015-11-16 15:48:24 +0100)

Thanks,
Thierry

----------------------------------------------------------------
ARM: tegra: Default configuration updates for v4.5-rc1

This set of patches enable various drivers and features required by
64-bit Tegra SoCs (Tegra132 and Tegra210).

----------------------------------------------------------------
Thierry Reding (7):
      arm64: defconfig: Enable Tegra210 support
      arm64: defconfig: Do not disable Tegra AHB driver
      arm64: defconfig: Enable tegra-apbdma driver
      arm64: defconfig: Enable serial-tegra driver
      arm64: defconfig: Enable sdhci-tegra driver
      arm64: defconfig: Enable squashfs support
      arm64: defconfig: Enable printk timestamps

 arch/arm64/configs/defconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

[GIT PULL 2/5] memory: tegra: Changes for v4.5-rc1

[Olof Johansson]

On Thu, Dec 17, 2015 at 01:50:36PM +0100, Thierry Reding wrote:
> Hi ARM SoC maintainers,
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-memory
> 
> for you to fetch changes up to e2127ae7a5e80eb53ad431c39145767391da40cd:
> 
>   memory/tegra: Add number of TLB lines for Tegra124 (2015-12-14 16:11:35 +0100)
> 
> Thanks,
> Thierry
> 
> ----------------------------------------------------------------
> memory: tegra: Changes for v4.5-rc1
> 
> This is a single fix to improve performance of the SMMU on Tegra124.

Merged, thanks.


Btw, it's a little confusing when there's [GIT PULL x/5] and we only
see 2-5. I wasn't sure if 1/5 had gotten lost, so I had to go search for
it. Seems like it was destined for the clk tree. It'd be nice if those
were sent outside of the series to avoid confusion in the future.


-Olof

[GIT PULL 3/5] ARM: tegra: Core SoC changes for v4.5-rc1

[Olof Johansson]

On Thu, Dec 17, 2015 at 01:50:37PM +0100, Thierry Reding wrote:
> Hi ARM SoC maintainers,
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-soc
> 
> for you to fetch changes up to a262e87ff354f12447bb6268bd63edf7ba1c20e0:
> 
>   ARM: tegra: select USB_ULPI from EHCI rather than platform (2015-11-24 16:47:26 +0100)
> 
> Thanks,
> Thierry
> 
> ----------------------------------------------------------------
> ARM: tegra: Core SoC changes for v4.5-rc1
> 
> The big thing here is Tegra210 support, which is really only the Kconfig
> symbol. Other than that there's a few miscellaneous fixes.

Hi,

We merge arch/arm and arch/arm64 and drivers/bus contents through separate
branches, so having them come in from you in one combined branch isn't working
very well.

If you don't have any downstream users of this I can just cherry-pick them into
the appropriate branches, but if you do, please send separate requests for
those three categories.


Thanks!


-Olof

[GIT PULL 4/5] ARM: tegra: Devicetree changes for v4.5-rc1

[Olof Johansson]

On Thu, Dec 17, 2015 at 01:50:38PM +0100, Thierry Reding wrote:
> Hi ARM SoC maintainers,
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-dt
> 
> for you to fetch changes up to 336f79c7b6d7d04f7dad0361b9f4c8995107c062:
> 
>   arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support (2015-11-24 16:52:25 +0100)
> 
> Note that this pulls in the device tree bindings for the Tegra210 clock
> and reset controller. A separate pull request is sent to the clock tree
> maintainers including this commit. I've included this patch in the diff
> stat below.
> 
> Thanks,
> Thierry
> 
> ----------------------------------------------------------------
> ARM: tegra: Devicetree changes for v4.5-rc1
> 
> This adds support for the Tegra132 Norrin and various Tegra210-based
> reference designs. There is also an initial device tree for the Jetson
> TX1 development kit.

Unfortunately can't merge this due to the feedback on your soc branch that is
part of this.


-Olof

[GIT PULL 5/5] ARM: tegra: Default configuration updates for v4.5-rc1

[Olof Johansson]

On Thu, Dec 17, 2015 at 01:50:39PM +0100, Thierry Reding wrote:
> Hi ARM SoC maintainers,
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-defconfig
> 
> for you to fetch changes up to 36d6e0872152aab506f952792db7221b9c25ed33:
> 
>   arm64: defconfig: Enable printk timestamps (2015-11-16 15:48:24 +0100)
> 
> Thanks,
> Thierry
> 
> ----------------------------------------------------------------
> ARM: tegra: Default configuration updates for v4.5-rc1
> 
> This set of patches enable various drivers and features required by
> 64-bit Tegra SoCs (Tegra132 and Tegra210).

Merged, thanks.


-Olof

[GIT PULL 2/5] memory: tegra: Changes for v4.5-rc1

[Thierry Reding]

On Tue, Dec 22, 2015 at 11:53:18AM -0800, Olof Johansson wrote:
> On Thu, Dec 17, 2015 at 01:50:36PM +0100, Thierry Reding wrote:
> > Hi ARM SoC maintainers,
> > 
> > The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> > 
> >   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-memory
> > 
> > for you to fetch changes up to e2127ae7a5e80eb53ad431c39145767391da40cd:
> > 
> >   memory/tegra: Add number of TLB lines for Tegra124 (2015-12-14 16:11:35 +0100)
> > 
> > Thanks,
> > Thierry
> > 
> > ----------------------------------------------------------------
> > memory: tegra: Changes for v4.5-rc1
> > 
> > This is a single fix to improve performance of the SMMU on Tegra124.
> 
> Merged, thanks.
> 
> 
> Btw, it's a little confusing when there's [GIT PULL x/5] and we only
> see 2-5. I wasn't sure if 1/5 had gotten lost, so I had to go search for
> it. Seems like it was destined for the clk tree. It'd be nice if those
> were sent outside of the series to avoid confusion in the future.

Alright, I'll make a mental note to not do this in the future.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151230/7e4d58a8/attachment-0001.sig>

[GIT PULL 3/5] ARM: tegra: Core SoC changes for v4.5-rc1

[Thierry Reding]

On Tue, Dec 22, 2015 at 11:54:46AM -0800, Olof Johansson wrote:
> On Thu, Dec 17, 2015 at 01:50:37PM +0100, Thierry Reding wrote:
> > Hi ARM SoC maintainers,
> > 
> > The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> > 
> >   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-soc
> > 
> > for you to fetch changes up to a262e87ff354f12447bb6268bd63edf7ba1c20e0:
> > 
> >   ARM: tegra: select USB_ULPI from EHCI rather than platform (2015-11-24 16:47:26 +0100)
> > 
> > Thanks,
> > Thierry
> > 
> > ----------------------------------------------------------------
> > ARM: tegra: Core SoC changes for v4.5-rc1
> > 
> > The big thing here is Tegra210 support, which is really only the Kconfig
> > symbol. Other than that there's a few miscellaneous fixes.
> 
> Hi,
> 
> We merge arch/arm and arch/arm64 and drivers/bus contents through separate
> branches, so having them come in from you in one combined branch isn't working
> very well.
> 
> If you don't have any downstream users of this I can just cherry-pick them into
> the appropriate branches, but if you do, please send separate requests for
> those three categories.

I don't think that'll work. Or at least, the outcome will be almost the
same because of interdependencies between the branches.

For the patches in this branch:

      soc/tegra: Provide per-SoC Kconfig symbols
      soc/tegra: Add Tegra210 support

These are dependencies for the following:

      ARM: tegra: select USB_ULPI from EHCI rather than platform

Whereas these two:

      ARM: tegra: Ensure entire dcache is flushed on entering LP0/1
      amba: Hide TEGRA_AHB symbol

can be applied in any order. So I could send you a pull request with
only the drivers/bus patch, and another one with the dcache flush fix.

But that's about it. The Kconfig changes are dependent on each other,
hence will need to be brought in via a common ancestor, unless you want
to resolve a rather annoying conflict in arm-soc.

As for the for-4.5/dt branch that has a dependency on both the
for-4.5/clk branch for a DT include file and on the for-4.5/soc branch
for the new ARCH_TEGRA_210_SOC Kconfig symbol. I suppose it wouldn't be
strictly necessary to pull in the branch because it is a ("soft") make
dependency and the Tegra210 DTBs will simply be ignored unless the
for-4.5/soc branch is also merged. That's slightly confusing because
then there's a branch with DTS files that can't be built.

Anyway, let me know what you prefer and I'm sure I can work something
out that will suite you.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151230/feb5ae7b/attachment.sig>

[GIT PULL 4/5] ARM: tegra: Devicetree changes for v4.5-rc1

[Thierry Reding]

On Tue, Dec 22, 2015 at 11:55:20AM -0800, Olof Johansson wrote:
> On Thu, Dec 17, 2015 at 01:50:38PM +0100, Thierry Reding wrote:
> > Hi ARM SoC maintainers,
> > 
> > The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> > 
> >   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-dt
> > 
> > for you to fetch changes up to 336f79c7b6d7d04f7dad0361b9f4c8995107c062:
> > 
> >   arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support (2015-11-24 16:52:25 +0100)
> > 
> > Note that this pulls in the device tree bindings for the Tegra210 clock
> > and reset controller. A separate pull request is sent to the clock tree
> > maintainers including this commit. I've included this patch in the diff
> > stat below.
> > 
> > Thanks,
> > Thierry
> > 
> > ----------------------------------------------------------------
> > ARM: tegra: Devicetree changes for v4.5-rc1
> > 
> > This adds support for the Tegra132 Norrin and various Tegra210-based
> > reference designs. There is also an initial device tree for the Jetson
> > TX1 development kit.
> 
> Unfortunately can't merge this due to the feedback on your soc branch that is
> part of this.

In the past we've sent devicetree updates via a single branch for both
32-bit and 64-bit ARM. That's not the case for this cycle, but if we had
changes to both 32-bit and 64-bit ARM device trees, would you prefer
separate branches for those as well?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151230/b1b15554/attachment.sig>

[GIT PULL 1/5] clk: tegra: Changes for v4.5-rc1

[Michael Turquette]

Quoting Thierry Reding (2015-12-17 04:50:35)
> Hi Mike, Stephen,
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-clk

Pulled.

Regards,
Mike

> 
> for you to fetch changes up to 2d7f61f37731f635af47615a8a331ffe7f884934:
> 
>   clk: tegra: Read correct IDDQ register in PLL_SS registration (2015-12-17 13:37:58 +0100)
> 
> Note that the first commit in this set adds the device tree bindings for
> Tegra210. This is a dependency for the for-4.5/dt branch because it adds
> the dt-bindings include file used by the Tegra210 DTS files.
> 
> Thanks,
> Thierry
> 
> ----------------------------------------------------------------
> clk: tegra: Changes for v4.5-rc1
> 
> This set of changes adds support for the Tegra210 SoC and contains a
> couple fixes and cleanups.
> 
> ----------------------------------------------------------------
> Andrew Bresticker (1):
>       clk: tegra: pll: Fix issues with rates for VCO PLLs
> 
> Bill Huang (8):
>       clk: tegra: pll: Change misc_reg count from 3 to 6
>       clk: tegra: pll: Add code to handle if resets are supported by PLL
>       clk: tegra: pll: Adjust vco_min if SDM present
>       clk: tegra: pll: Add Set_default logic
>       clk: tegra: pll: Add logic for SS
>       clk: tegra: Add Super Gen5 Logic
>       clk: tegra: Fix WARN_ON in PLL_RE registration
>       clk: tegra: Read correct IDDQ register in PLL_SS registration
> 
> Danny Huang (1):
>       clk: tegra: pll: Update PLLM handling
> 
> Rhyland Klein (12):
>       clk: tegra: periph: Add new periph clks and muxes for Tegra210
>       clk: tegra: pll: Add tegra_pll_wait_for_lock to clk header
>       clk: tegra: pll: Simplify clk_enable_path
>       clk: tegra: pll: Update warning message
>       clk: tegra: pll: Don't unconditionally set LOCK flags
>       clk: tegra: pll: Add logic for handling SDM data
>       clk: tegra: pll: Add logic for out-of-table rates for T210
>       clk: tegra: pll: Fix _pll_ramp_calc_pll logic and _calc_dynamic_ramp_rate
>       clk: tegra: pll: Add specialized logic for Tegra210
>       clk: tegra: pll: Add support for PLLMB for Tegra210
>       clk: tegra: pll: Add dyn_ramp callback
>       clk: tegra: Add support for Tegra210 clocks
> 
> Thierry Reding (5):
>       clk: tegra: Add Tegra210 device tree binding
>       clk: tegra: Fix 26 MHz oscillator frequency
>       clk: tegra: Miscellaneous coding style cleanups
>       clk: tegra: Format tables consistently
>       clk: tegra: Constify pdiv-to-hw mappings
> 
>  .../bindings/clock/nvidia,tegra210-car.txt         |   56 +
>  drivers/clk/tegra/Makefile                         |    1 +
>  drivers/clk/tegra/clk-id.h                         |   75 +-
>  drivers/clk/tegra/clk-pll.c                        |  838 ++++--
>  drivers/clk/tegra/clk-tegra-periph.c               |  371 ++-
>  drivers/clk/tegra/clk-tegra-super-gen4.c           |  142 +-
>  drivers/clk/tegra/clk-tegra114.c                   |  339 +--
>  drivers/clk/tegra/clk-tegra124.c                   |  453 ++--
>  drivers/clk/tegra/clk-tegra20.c                    |  314 ++-
>  drivers/clk/tegra/clk-tegra210.c                   | 2852 ++++++++++++++++++++
>  drivers/clk/tegra/clk-tegra30.c                    |  426 +--
>  drivers/clk/tegra/clk.h                            |  101 +-
>  include/dt-bindings/clock/tegra210-car.h           |  401 +++
>  13 files changed, 5439 insertions(+), 930 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
>  create mode 100644 drivers/clk/tegra/clk-tegra210.c
>  create mode 100644 include/dt-bindings/clock/tegra210-car.h

[GIT PULL 3/5] ARM: tegra: Core SoC changes for v4.5-rc1

[Olof Johansson]

On Wed, Dec 30, 2015 at 04:46:47PM +0100, Thierry Reding wrote:
> On Tue, Dec 22, 2015 at 11:54:46AM -0800, Olof Johansson wrote:
> > On Thu, Dec 17, 2015 at 01:50:37PM +0100, Thierry Reding wrote:
> > > Hi ARM SoC maintainers,
> > > 
> > > The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> > > 
> > >   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-soc
> > > 
> > > for you to fetch changes up to a262e87ff354f12447bb6268bd63edf7ba1c20e0:
> > > 
> > >   ARM: tegra: select USB_ULPI from EHCI rather than platform (2015-11-24 16:47:26 +0100)
> > > 
> > > Thanks,
> > > Thierry
> > > 
> > > ----------------------------------------------------------------
> > > ARM: tegra: Core SoC changes for v4.5-rc1
> > > 
> > > The big thing here is Tegra210 support, which is really only the Kconfig
> > > symbol. Other than that there's a few miscellaneous fixes.
> > 
> > Hi,
> > 
> > We merge arch/arm and arch/arm64 and drivers/bus contents through separate
> > branches, so having them come in from you in one combined branch isn't working
> > very well.
> > 
> > If you don't have any downstream users of this I can just cherry-pick them into
> > the appropriate branches, but if you do, please send separate requests for
> > those three categories.
> 
> I don't think that'll work. Or at least, the outcome will be almost the
> same because of interdependencies between the branches.
> 
> For the patches in this branch:
> 
>       soc/tegra: Provide per-SoC Kconfig symbols
>       soc/tegra: Add Tegra210 support
> 
> These are dependencies for the following:
> 
>       ARM: tegra: select USB_ULPI from EHCI rather than platform
> 
> Whereas these two:
> 
>       ARM: tegra: Ensure entire dcache is flushed on entering LP0/1
>       amba: Hide TEGRA_AHB symbol
> 
> can be applied in any order. So I could send you a pull request with
> only the drivers/bus patch, and another one with the dcache flush fix.
> 
> But that's about it. The Kconfig changes are dependent on each other,
> hence will need to be brought in via a common ancestor, unless you want
> to resolve a rather annoying conflict in arm-soc.

Doing the refactoring/cleanup in a separate new branch that both of them build
on wouldn't be a bad way to do it in the future. That way dependences would
still flow in the direction we're used to (cleanups/refactor -> soc -> driver
code).

> As for the for-4.5/dt branch that has a dependency on both the
> for-4.5/clk branch for a DT include file and on the for-4.5/soc branch
> for the new ARCH_TEGRA_210_SOC Kconfig symbol. I suppose it wouldn't be
> strictly necessary to pull in the branch because it is a ("soft") make
> dependency and the Tegra210 DTBs will simply be ignored unless the
> for-4.5/soc branch is also merged. That's slightly confusing because
> then there's a branch with DTS files that can't be built.

The sorting of 64-bit patches into separate branches is sort of new, in the
past we grouped all 64-bit contributions in one branch. So yeah there would be
some dependencies here. I'm personally OK with things not being buildable at
first (or, having nothing to build in the case where SoC is merged first).

> Anyway, let me know what you prefer and I'm sure I can work something
> out that will suite you.

I think the above could be worth considering for now.

Given that the code has been in -next through your own tree, and we're
at a very late phase in the release cycle (and I've owed you this answer
for a while, delayed due to travel and being sick), I'll merge in all
the tegra contents into one late/tegra branch that we'll aim to send in
during this merge window. We've occasionally done that on other platforms
as well when dependencies have been messy.


-Olof

[GIT PULL 4/5] ARM: tegra: Devicetree changes for v4.5-rc1

[Olof Johansson]

On Wed, Dec 30, 2015 at 04:48:28PM +0100, Thierry Reding wrote:
> On Tue, Dec 22, 2015 at 11:55:20AM -0800, Olof Johansson wrote:
> > On Thu, Dec 17, 2015 at 01:50:38PM +0100, Thierry Reding wrote:
> > > Hi ARM SoC maintainers,
> > > 
> > > The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> > > 
> > >   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-dt
> > > 
> > > for you to fetch changes up to 336f79c7b6d7d04f7dad0361b9f4c8995107c062:
> > > 
> > >   arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support (2015-11-24 16:52:25 +0100)
> > > 
> > > Note that this pulls in the device tree bindings for the Tegra210 clock
> > > and reset controller. A separate pull request is sent to the clock tree
> > > maintainers including this commit. I've included this patch in the diff
> > > stat below.
> > > 
> > > Thanks,
> > > Thierry
> > > 
> > > ----------------------------------------------------------------
> > > ARM: tegra: Devicetree changes for v4.5-rc1
> > > 
> > > This adds support for the Tegra132 Norrin and various Tegra210-based
> > > reference designs. There is also an initial device tree for the Jetson
> > > TX1 development kit.
> > 
> > Unfortunately can't merge this due to the feedback on your soc branch that is
> > part of this.
> 
> In the past we've sent devicetree updates via a single branch for both
> 32-bit and 64-bit ARM. That's not the case for this cycle, but if we had
> changes to both 32-bit and 64-bit ARM device trees, would you prefer
> separate branches for those as well?

Yeah, since we sort them into separate branches in our tree, please send them
to us separately. It's how the other platform maintainers have been sending us
stuff as well.


-Olof

[GIT PULL 3/5] ARM: tegra: Core SoC changes for v4.5-rc1

[Olof Johansson]

On Thu, Dec 17, 2015 at 01:50:37PM +0100, Thierry Reding wrote:
> Hi ARM SoC maintainers,
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.5-soc

Merged into late/tegra. Thanks!


-Olof