diff for duplicates of <3862076.Cf1OAGsbuq@phil> diff --git a/a/1.txt b/N1/1.txt index c5c9ae2..c58fa80 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,11 @@ Hi Mike, Stephen, no new clock trees this time, but more clock ids and fixes for issues -present for a longer time (not introduced during the 4.5-rc1 merge wind= -ow) +present for a longer time (not introduced during the 4.5-rc1 merge window) that Stephen thought should go through the regular process. -Most "interesting" change might be that we now handle factors correctly= - -according to their position in the clock-tree instead of registering th= -em +Most "interesting" change might be that we now handle factors correctly +according to their position in the clock-tree instead of registering them individually during init - which became a clutch. So if nothing stands out, please pull @@ -17,21 +14,17 @@ So if nothing stands out, please pull Thanks Heiko -The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04= -f08d: +The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04f08d: Linux 4.5-rc1 (2016-01-24 13:06:47 -0800) are available in the git repository at: - git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.gi= -t tags/v4.6-rockchip-clk1 + git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.6-rockchip-clk1 -for you to fetch changes up to 36714529f8bbd4f8eaf93b50f4a64c52a24879aa= -: +for you to fetch changes up to 36714529f8bbd4f8eaf93b50f4a64c52a24879aa: - clk: rockchip: convert manually created factor clocks to the new type= - (2016-02-04 15:54:20 +0100) + clk: rockchip: convert manually created factor clocks to the new type (2016-02-04 15:54:20 +0100) ---------------------------------------------------------------- Introduction of a factor type and a variant containing a gate @@ -43,10 +36,8 @@ past kernel releases. ---------------------------------------------------------------- Alexander Kochetkov (2): - clk: rockchip: add hclk_cpubus to the list of rk3188 critical clo= -cks - clk: rockchip: Allow sclk_i2s0 and i2s0_frac to change their pare= -nts rate on rk3188 + clk: rockchip: add hclk_cpubus to the list of rk3188 critical clocks + clk: rockchip: Allow sclk_i2s0 and i2s0_frac to change their parents rate on rk3188 Heiko Stuebner (9): clk: rockchip: rk3368: fix cpuclk mux bit of big cpu-cluster @@ -57,38 +48,31 @@ Heiko Stuebner (9): Merge branch 'v4.6-shared/clkids' into v4.6-clk/next clk: rockchip: fix parent of hclk_vcodec on rk3036 clk: rockchip: add a factor clock type - clk: rockchip: convert manually created factor clocks to the new = -type + clk: rockchip: convert manually created factor clocks to the new type -Pawe=C5=82 Jarosz (2): +Paweł Jarosz (2): clk: rockchip: Add new id for rk3066 tsadc clock clk: rockchip: add tsadc clock on rk3066 Shawn Lin (2): clk: rockchip: fix wrong mmc phase shift for rk3228 - clk: rockchip: free memory in error cases when registering clock = -branches + clk: rockchip: free memory in error cases when registering clock branches Yakir Yang (1): - clk: rockchip: rk3036: enable the CLK_IGNORE_UNUSED flag for hclk= -_vio_bus + clk: rockchip: rk3036: enable the CLK_IGNORE_UNUSED flag for hclk_vio_bus zhangqing (3): clk: rockchip: rk3368: fix edp_24m parent - clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for sp= -dif_8ch - clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for i2= -s_2ch + clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for spdif_8ch + clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for i2s_2ch arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- drivers/clk/rockchip/clk-rk3036.c | 33 +++-------- drivers/clk/rockchip/clk-rk3188.c | 27 +++------ drivers/clk/rockchip/clk-rk3228.c | 38 +++---------- drivers/clk/rockchip/clk-rk3288.c | 38 ++++--------- - drivers/clk/rockchip/clk-rk3368.c | 82 +++++++++++--------= --------- - drivers/clk/rockchip/clk.c | 64 +++++++++++++++++++= -+- + drivers/clk/rockchip/clk-rk3368.c | 82 +++++++++++---------------- + drivers/clk/rockchip/clk.c | 64 ++++++++++++++++++++- drivers/clk/rockchip/clk.h | 28 +++++++++ include/dt-bindings/clock/rk3188-cru-common.h | 1 + 9 files changed, 159 insertions(+), 154 deletions(-) diff --git a/a/content_digest b/N1/content_digest index 34a79e2..53e747c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,14 +10,11 @@ "Hi Mike, Stephen,\n" "\n" "no new clock trees this time, but more clock ids and fixes for issues\n" - "present for a longer time (not introduced during the 4.5-rc1 merge wind=\n" - "ow)\n" + "present for a longer time (not introduced during the 4.5-rc1 merge window)\n" "that Stephen thought should go through the regular process.\n" "\n" - "Most \"interesting\" change might be that we now handle factors correctly=\n" - "\n" - "according to their position in the clock-tree instead of registering th=\n" - "em\n" + "Most \"interesting\" change might be that we now handle factors correctly\n" + "according to their position in the clock-tree instead of registering them\n" "individually during init - which became a clutch.\n" "\n" "So if nothing stands out, please pull\n" @@ -26,21 +23,17 @@ "Thanks\n" "Heiko\n" "\n" - "The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04=\n" - "f08d:\n" + "The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04f08d:\n" "\n" " Linux 4.5-rc1 (2016-01-24 13:06:47 -0800)\n" "\n" "are available in the git repository at:\n" "\n" - " git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.gi=\n" - "t tags/v4.6-rockchip-clk1\n" + " git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.6-rockchip-clk1\n" "\n" - "for you to fetch changes up to 36714529f8bbd4f8eaf93b50f4a64c52a24879aa=\n" - ":\n" + "for you to fetch changes up to 36714529f8bbd4f8eaf93b50f4a64c52a24879aa:\n" "\n" - " clk: rockchip: convert manually created factor clocks to the new type=\n" - " (2016-02-04 15:54:20 +0100)\n" + " clk: rockchip: convert manually created factor clocks to the new type (2016-02-04 15:54:20 +0100)\n" "\n" "----------------------------------------------------------------\n" "Introduction of a factor type and a variant containing a gate\n" @@ -52,10 +45,8 @@ "\n" "----------------------------------------------------------------\n" "Alexander Kochetkov (2):\n" - " clk: rockchip: add hclk_cpubus to the list of rk3188 critical clo=\n" - "cks\n" - " clk: rockchip: Allow sclk_i2s0 and i2s0_frac to change their pare=\n" - "nts rate on rk3188\n" + " clk: rockchip: add hclk_cpubus to the list of rk3188 critical clocks\n" + " clk: rockchip: Allow sclk_i2s0 and i2s0_frac to change their parents rate on rk3188\n" "\n" "Heiko Stuebner (9):\n" " clk: rockchip: rk3368: fix cpuclk mux bit of big cpu-cluster\n" @@ -66,40 +57,33 @@ " Merge branch 'v4.6-shared/clkids' into v4.6-clk/next\n" " clk: rockchip: fix parent of hclk_vcodec on rk3036\n" " clk: rockchip: add a factor clock type\n" - " clk: rockchip: convert manually created factor clocks to the new =\n" - "type\n" + " clk: rockchip: convert manually created factor clocks to the new type\n" "\n" - "Pawe=C5=82 Jarosz (2):\n" + "Pawe\305\202 Jarosz (2):\n" " clk: rockchip: Add new id for rk3066 tsadc clock\n" " clk: rockchip: add tsadc clock on rk3066\n" "\n" "Shawn Lin (2):\n" " clk: rockchip: fix wrong mmc phase shift for rk3228\n" - " clk: rockchip: free memory in error cases when registering clock =\n" - "branches\n" + " clk: rockchip: free memory in error cases when registering clock branches\n" "\n" "Yakir Yang (1):\n" - " clk: rockchip: rk3036: enable the CLK_IGNORE_UNUSED flag for hclk=\n" - "_vio_bus\n" + " clk: rockchip: rk3036: enable the CLK_IGNORE_UNUSED flag for hclk_vio_bus\n" "\n" "zhangqing (3):\n" " clk: rockchip: rk3368: fix edp_24m parent\n" - " clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for sp=\n" - "dif_8ch\n" - " clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for i2=\n" - "s_2ch\n" + " clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for spdif_8ch\n" + " clk: rockchip: rk3368: enable the CLK_SET_RATE_PARENT flag for i2s_2ch\n" "\n" " arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +-\n" " drivers/clk/rockchip/clk-rk3036.c | 33 +++--------\n" " drivers/clk/rockchip/clk-rk3188.c | 27 +++------\n" " drivers/clk/rockchip/clk-rk3228.c | 38 +++----------\n" " drivers/clk/rockchip/clk-rk3288.c | 38 ++++---------\n" - " drivers/clk/rockchip/clk-rk3368.c | 82 +++++++++++--------=\n" - "--------\n" - " drivers/clk/rockchip/clk.c | 64 +++++++++++++++++++=\n" - "+-\n" + " drivers/clk/rockchip/clk-rk3368.c | 82 +++++++++++----------------\n" + " drivers/clk/rockchip/clk.c | 64 ++++++++++++++++++++-\n" " drivers/clk/rockchip/clk.h | 28 +++++++++\n" " include/dt-bindings/clock/rk3188-cru-common.h | 1 +\n" 9 files changed, 159 insertions(+), 154 deletions(-) -8adba6d4c66b30700022e1dd630a5b086ca9f765d4465109f249de4b2c2bb7b5 +5d9d9c023efcca539a51d0c1bb5eda1fef4df64de9b92149b8eab8c6c9ad6e07
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.