| Message ID | 20131015153620.GA12721@tbergstrom-lnx.Nvidia.com |
|---|---|
| State | New |
| Headers | show |
On 10/15/2013 09:36 AM, Peter De Schrijver wrote: > The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: > > Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) > > are available in the git repository at: > git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 ??? That won't merge into Mike's tree correctly. The pull request should be based on a -rc or final release in the Linus tree, e.g. based on v3.12-rc1. Otherwise, if Mike merges this, it will pull in all patches from other subsystems that went into linux-next.
I'm happy for the changes to be based on an -rc or clk-next. Either is fine. Thanks, Mike On Tue, Oct 15, 2013 at 8:42 AM, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 10/15/2013 09:36 AM, Peter De Schrijver wrote: >> The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: >> >> Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) >> >> are available in the git repository at: >> git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 > > ??? That won't merge into Mike's tree correctly. The pull request should > be based on a -rc or final release in the Linus tree, e.g. based on > v3.12-rc1. Otherwise, if Mike merges this, it will pull in all patches > from other subsystems that went into linux-next.
On Tue, Oct 15, 2013 at 06:36:20PM +0300, Peter De Schrijver wrote: > The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: > > Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) > > are available in the git repository at: > git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 > > Andrew Chew (1): > clk: tegra: Set the clk parent of host1x to pll_p > > Mark Zhang (3): > clk: tegra: Correct sbc mux width & parent > clk: tegra: Fix vde/2d/3d clock src offset > clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2 > > Peter De Schrijver (3): > ARM: tegra114: add missing clocks to binding > clk: tegra: replace enum tegra114_clk by binding header > clk: tegra: PLLE spread spectrum control > > Thierry Reding (1): > clk: tegra114: Rename gr_2d/gr_3d to gr2d/gr3d I think this pull request is missing the initialization of the display controller clocks (TEGRA114_CLK_DISP1 and TEGRA114_CLK_DISP2) from Mikko's Dalmore HDMI series. Thierry
On Wed, Oct 16, 2013 at 05:35:51PM +0200, Thierry Reding wrote: > * PGP Signed by an unknown key > > On Tue, Oct 15, 2013 at 06:36:20PM +0300, Peter De Schrijver wrote: > > The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: > > > > Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) > > > > are available in the git repository at: > > git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 > > > > Andrew Chew (1): > > clk: tegra: Set the clk parent of host1x to pll_p > > > > Mark Zhang (3): > > clk: tegra: Correct sbc mux width & parent > > clk: tegra: Fix vde/2d/3d clock src offset > > clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2 > > > > Peter De Schrijver (3): > > ARM: tegra114: add missing clocks to binding > > clk: tegra: replace enum tegra114_clk by binding header > > clk: tegra: PLLE spread spectrum control > > > > Thierry Reding (1): > > clk: tegra114: Rename gr_2d/gr_3d to gr2d/gr3d > > I think this pull request is missing the initialization of the display > controller clocks (TEGRA114_CLK_DISP1 and TEGRA114_CLK_DISP2) from > Mikko's Dalmore HDMI series. I don't think they were part of the original request to be included? Cheers, Peter.
On Wed, Oct 16, 2013 at 06:53:36PM +0300, Peter De Schrijver wrote: > On Wed, Oct 16, 2013 at 05:35:51PM +0200, Thierry Reding wrote: > > * PGP Signed by an unknown key > > > > On Tue, Oct 15, 2013 at 06:36:20PM +0300, Peter De Schrijver wrote: > > > The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: > > > > > > Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) > > > > > > are available in the git repository at: > > > git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 > > > > > > Andrew Chew (1): > > > clk: tegra: Set the clk parent of host1x to pll_p > > > > > > Mark Zhang (3): > > > clk: tegra: Correct sbc mux width & parent > > > clk: tegra: Fix vde/2d/3d clock src offset > > > clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2 > > > > > > Peter De Schrijver (3): > > > ARM: tegra114: add missing clocks to binding > > > clk: tegra: replace enum tegra114_clk by binding header > > > clk: tegra: PLLE spread spectrum control > > > > > > Thierry Reding (1): > > > clk: tegra114: Rename gr_2d/gr_3d to gr2d/gr3d > > > > I think this pull request is missing the initialization of the display > > controller clocks (TEGRA114_CLK_DISP1 and TEGRA114_CLK_DISP2) from > > Mikko's Dalmore HDMI series. > > I don't think they were part of the original request to be included? Not sure, I certainly sent it to Mike for inclusion at some point. I guess I can respin it on top of this pull request. There is another small patch required for gr3d on Tegra30 which I can rebase on top of this as well. Mike, do you want me to hold these back until you've merged Peter's Tegra series or would you rather take them all in one go? Until when will you be taking patches for 3.13? Thierry
Quoting Thierry Reding (2013-10-16 08:56:21) > On Wed, Oct 16, 2013 at 06:53:36PM +0300, Peter De Schrijver wrote: > > On Wed, Oct 16, 2013 at 05:35:51PM +0200, Thierry Reding wrote: > > > * PGP Signed by an unknown key > > > > > > On Tue, Oct 15, 2013 at 06:36:20PM +0300, Peter De Schrijver wrote: > > > > The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: > > > > > > > > Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) > > > > > > > > are available in the git repository at: > > > > git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 > > > > > > > > Andrew Chew (1): > > > > clk: tegra: Set the clk parent of host1x to pll_p > > > > > > > > Mark Zhang (3): > > > > clk: tegra: Correct sbc mux width & parent > > > > clk: tegra: Fix vde/2d/3d clock src offset > > > > clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2 > > > > > > > > Peter De Schrijver (3): > > > > ARM: tegra114: add missing clocks to binding > > > > clk: tegra: replace enum tegra114_clk by binding header > > > > clk: tegra: PLLE spread spectrum control > > > > > > > > Thierry Reding (1): > > > > clk: tegra114: Rename gr_2d/gr_3d to gr2d/gr3d > > > > > > I think this pull request is missing the initialization of the display > > > controller clocks (TEGRA114_CLK_DISP1 and TEGRA114_CLK_DISP2) from > > > Mikko's Dalmore HDMI series. > > > > I don't think they were part of the original request to be included? > > Not sure, I certainly sent it to Mike for inclusion at some point. I > guess I can respin it on top of this pull request. There is another > small patch required for gr3d on Tegra30 which I can rebase on top of > this as well. > > Mike, do you want me to hold these back until you've merged Peter's > Tegra series or would you rather take them all in one go? Until when > will you be taking patches for 3.13? Can you send another pull request with these patches that is based on top of Peter's pull request? I've already pulled Peter's request in but have not published it to clk-next yet, so the best way to avoid merge issues is to just rebase those changes on top of his latest pull request. Mike > > Thierry
The following changes since commit a0cf1abc25ac197dd97b857c0f6341066a8cb1cf: Add linux-next specific files for 20130927 (2013-09-27 18:48:50 +1000) are available in the git repository at: git://nv-tegra.nvidia.com/user/pdeschrijver/linux.git tegra-clk-patches-0 Andrew Chew (1): clk: tegra: Set the clk parent of host1x to pll_p Mark Zhang (3): clk: tegra: Correct sbc mux width & parent clk: tegra: Fix vde/2d/3d clock src offset clk: tegra: Set the clock parent of gr2d/gr3d to pll_c2 Peter De Schrijver (3): ARM: tegra114: add missing clocks to binding clk: tegra: replace enum tegra114_clk by binding header clk: tegra: PLLE spread spectrum control Thierry Reding (1): clk: tegra114: Rename gr_2d/gr_3d to gr2d/gr3d drivers/clk/tegra/clk-pll.c | 30 ++- drivers/clk/tegra/clk-tegra114.c | 442 ++++++++++++++---------------- include/dt-bindings/clock/tegra114-car.h | 8 +- 3 files changed, 235 insertions(+), 245 deletions(-)