diff for duplicates of <20150831192125.11508.92473@quantum> diff --git a/a/1.txt b/N1/1.txt index 8dde9c7..70d9b10 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,13 +4,11 @@ The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754: are available in the git repository at: - git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-= -linus-4.3 + git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus-4.3 for you to fetch changes up to ba30011577330b7e29ecb5916d89c6db9fbc5b3d: - clk: s5pv210: add missing call to samsung_clk_of_add_provider() (2015-08-= -27 12:03:21 -0700) + clk: s5pv210: add missing call to samsung_clk_of_add_provider() (2015-08-27 12:03:21 -0700) ---------------------------------------------------------------- The clk framework changes for 4.3 are mostly updates to existing drivers @@ -36,8 +34,7 @@ Boris Brezillon (2): clk: fix some determine_rate implementations Chanwoo Choi (1): - clk: exynos3250: Add cpu clock configuration data and instaniate cpu = -clock + clk: exynos3250: Add cpu clock configuration data and instaniate cpu clock Chen-Yu Tsai (1): clk: Add missing header for 'bool' definition to clk-conf.h @@ -160,10 +157,8 @@ Maxime Ripard (7): clk: sunxi: Add a simple gates driver Michael Turquette (2): - Merge branch 'v4.3-topic/clk-samsung' of git://git.kernel.org/.../kge= -ne/linux-samsung into clk-next - Merge tag 'imx-clk-4.3' of git://git.kernel.org/.../shawnguo/linux in= -to clk-next + Merge branch 'v4.3-topic/clk-samsung' of git://git.kernel.org/.../kgene/linux-samsung into clk-next + Merge tag 'imx-clk-4.3' of git://git.kernel.org/.../shawnguo/linux into clk-next Mikko Perttunen (1): clk: tegra: Introduce ability for SoC-specific reset control callbacks @@ -282,8 +277,7 @@ Stephen Boyd (113): clk: h8300: Use standard Linux I/O accessors clk: gpio: Unlock mutex on error path clk: qcom: Set CLK_SET_RATE_PARENT on ce1 clocks - Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/lin= -ux-pm into clk-next + Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk-next clk: ti: Check kzalloc() for failures clk: ti: Mark ti_clk_features static clk: ti: clk-3xxx: Remove unused structures @@ -320,8 +314,7 @@ ux-pm into clk-next clk: Remove unused provider APIs clk: Constify clk_hw argument to provider APIs clk: Convert __clk_get_name(hw->clk) to clk_hw_get_name(hw) - Merge tag 'tegra-for-4.3-clk' of git://git.kernel.org/.../tegra/linux= - into clk-next + Merge tag 'tegra-for-4.3-clk' of git://git.kernel.org/.../tegra/linux into clk-next clk: tegra: Fix some static checker problems Tero Kristo (27): @@ -335,8 +328,7 @@ Tero Kristo (27): ARM: OMAP36xx: remove clock36xx.c/.h files clk: ti: autoidle: move generic autoidle handling code to clock driver clk: ti: move omap2_clk_enable_init_clocks under clock driver - ARM: OMAP2+: clock: remove support for legacy mpurate command line pa= -ram + ARM: OMAP2+: clock: remove support for legacy mpurate command line param ARM: OMAP2+: clock: add support for clkdm ops to the low level clk ops ARM: OMAP2+: clock: add support for specific CM ops to ti_clk_ll_ops clk: ti: dpll: move omap3 DPLL functionality to clock driver @@ -345,21 +337,17 @@ ram clk: ti: dflt: move support for default gate clock to clock driver clk: ti: omap2430: move clock support code under clock driver clk: ti: clkdm: move clkdm gate clock support code to clock driver - clk: ti: omap34xx: move omap34xx clock type support code to clock dri= -ver + clk: ti: omap34xx: move omap34xx clock type support code to clock driver ARM: OMAP4: clock: remove clock44xx.h header - clk: ti: am3517: move remaining am3517 clock support code to clock dr= -iver + clk: ti: am3517: move remaining am3517 clock support code to clock driver clk: ti: move some public definitions to private header ARM: OMAP2+: clock: remove dead definitions from the clock header file - clk: ti: remove exported ll_ops struct, instead add an API for regist= -ration + clk: ti: remove exported ll_ops struct, instead add an API for registration ARM: OMAP2+: clock: remove legacy omap2_clk_readl/writel APIs clk: ti: move low-level access and init code under clock driver Thomas Abraham (1): - clk: exynos5250: add cpu clock configuration data and instantiate cpu= - clock + clk: exynos5250: add cpu clock configuration data and instantiate cpu clock Tuomas Tynkkynen (7): clk: tegra: Add binding for the Tegra124 DFLL clocksource @@ -617,8 +605,7 @@ Zdenko Pulitika (3): drivers/clk/sunxi/clk-sunxi.c | 227 +-- drivers/clk/sunxi/clk-usb.c | 3 +- drivers/clk/tegra/Makefile | 3 + - drivers/clk/tegra/clk-dfll.c | 1757 ++++++++++++++++= -++++ + drivers/clk/tegra/clk-dfll.c | 1757 ++++++++++++++++++++ drivers/clk/tegra/clk-dfll.h | 54 + drivers/clk/tegra/clk-divider.c | 1 - drivers/clk/tegra/clk-emc.c | 36 +- @@ -656,15 +643,15 @@ Zdenko Pulitika (3): drivers/clk/ti/clk-dra7-atl.c | 1 + drivers/clk/ti/clk.c | 154 +- drivers/clk/ti/clkt_dflt.c | 316 ++++ - .../arm/mach-omap2 =3D> drivers/clk/ti}/clkt_dpll.c | 36 +- + .../arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c | 36 +- drivers/clk/ti/clkt_iclk.c | 101 ++ drivers/clk/ti/clock.h | 105 ++ drivers/clk/ti/clockdomain.c | 83 +- drivers/clk/ti/composite.c | 4 +- drivers/clk/ti/divider.c | 8 +- drivers/clk/ti/dpll.c | 9 +- - {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll3xxx.c | 217 ++- - {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll44xx.c | 55 +- + {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c | 217 ++- + {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c | 55 +- drivers/clk/ti/fapll.c | 4 +- drivers/clk/ti/fixed-factor.c | 2 + drivers/clk/ti/gate.c | 6 +- @@ -686,7 +673,7 @@ Zdenko Pulitika (3): drivers/clk/versatile/clk-versatile.c | 4 +- drivers/clk/zte/Makefile | 2 +- drivers/clk/zte/clk-zx296702.c | 126 +- - drivers/clk/zte/{clk-pll.c =3D> clk.c} | 141 +- + drivers/clk/zte/{clk-pll.c => clk.c} | 141 +- drivers/clk/zte/clk.h | 9 + drivers/clk/zynq/clkc.c | 1 + drivers/clocksource/cadence_ttc_timer.c | 1 - @@ -712,12 +699,9 @@ Zdenko Pulitika (3): lib/vsprintf.c | 1 + 327 files changed, 9170 insertions(+), 4991 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/sp810.txt - create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.= -txt - create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124= --dfll.txt - create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368= --cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt create mode 100644 Documentation/devicetree/bindings/clock/ux500.txt delete mode 100644 arch/arm/mach-omap2/clkt_clksel.c delete mode 100644 arch/arm/mach-omap2/clkt_iclk.c @@ -745,12 +729,12 @@ txt create mode 100644 drivers/clk/tegra/cvb.c create mode 100644 drivers/clk/tegra/cvb.h create mode 100644 drivers/clk/ti/clkt_dflt.c - rename {arch/arm/mach-omap2 =3D> drivers/clk/ti}/clkt_dpll.c (92%) + rename {arch/arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c (92%) create mode 100644 drivers/clk/ti/clkt_iclk.c - rename {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll3xxx.c (79%) - rename {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll44xx.c (79%) + rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c (79%) + rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c (79%) delete mode 100644 drivers/clk/ux500/u8500_clk.c - rename drivers/clk/zte/{clk-pll.c =3D> clk.c} (55%) + rename drivers/clk/zte/{clk-pll.c => clk.c} (55%) create mode 100644 include/dt-bindings/clock/imx6ul-clock.h create mode 100644 include/dt-bindings/clock/rk3368-cru.h create mode 100644 include/dt-bindings/reset/tegra124-car.h diff --git a/a/content_digest b/N1/content_digest index d62f56f..fb94011 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,13 +13,11 @@ "\n" "are available in the git repository at:\n" "\n" - " git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-=\n" - "linus-4.3\n" + " git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus-4.3\n" "\n" "for you to fetch changes up to ba30011577330b7e29ecb5916d89c6db9fbc5b3d:\n" "\n" - " clk: s5pv210: add missing call to samsung_clk_of_add_provider() (2015-08-=\n" - "27 12:03:21 -0700)\n" + " clk: s5pv210: add missing call to samsung_clk_of_add_provider() (2015-08-27 12:03:21 -0700)\n" "\n" "----------------------------------------------------------------\n" "The clk framework changes for 4.3 are mostly updates to existing drivers\n" @@ -45,8 +43,7 @@ " clk: fix some determine_rate implementations\n" "\n" "Chanwoo Choi (1):\n" - " clk: exynos3250: Add cpu clock configuration data and instaniate cpu =\n" - "clock\n" + " clk: exynos3250: Add cpu clock configuration data and instaniate cpu clock\n" "\n" "Chen-Yu Tsai (1):\n" " clk: Add missing header for 'bool' definition to clk-conf.h\n" @@ -169,10 +166,8 @@ " clk: sunxi: Add a simple gates driver\n" "\n" "Michael Turquette (2):\n" - " Merge branch 'v4.3-topic/clk-samsung' of git://git.kernel.org/.../kge=\n" - "ne/linux-samsung into clk-next\n" - " Merge tag 'imx-clk-4.3' of git://git.kernel.org/.../shawnguo/linux in=\n" - "to clk-next\n" + " Merge branch 'v4.3-topic/clk-samsung' of git://git.kernel.org/.../kgene/linux-samsung into clk-next\n" + " Merge tag 'imx-clk-4.3' of git://git.kernel.org/.../shawnguo/linux into clk-next\n" "\n" "Mikko Perttunen (1):\n" " clk: tegra: Introduce ability for SoC-specific reset control callbacks\n" @@ -291,8 +286,7 @@ " clk: h8300: Use standard Linux I/O accessors\n" " clk: gpio: Unlock mutex on error path\n" " clk: qcom: Set CLK_SET_RATE_PARENT on ce1 clocks\n" - " Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/lin=\n" - "ux-pm into clk-next\n" + " Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk-next\n" " clk: ti: Check kzalloc() for failures\n" " clk: ti: Mark ti_clk_features static\n" " clk: ti: clk-3xxx: Remove unused structures\n" @@ -329,8 +323,7 @@ " clk: Remove unused provider APIs\n" " clk: Constify clk_hw argument to provider APIs\n" " clk: Convert __clk_get_name(hw->clk) to clk_hw_get_name(hw)\n" - " Merge tag 'tegra-for-4.3-clk' of git://git.kernel.org/.../tegra/linux=\n" - " into clk-next\n" + " Merge tag 'tegra-for-4.3-clk' of git://git.kernel.org/.../tegra/linux into clk-next\n" " clk: tegra: Fix some static checker problems\n" "\n" "Tero Kristo (27):\n" @@ -344,8 +337,7 @@ " ARM: OMAP36xx: remove clock36xx.c/.h files\n" " clk: ti: autoidle: move generic autoidle handling code to clock driver\n" " clk: ti: move omap2_clk_enable_init_clocks under clock driver\n" - " ARM: OMAP2+: clock: remove support for legacy mpurate command line pa=\n" - "ram\n" + " ARM: OMAP2+: clock: remove support for legacy mpurate command line param\n" " ARM: OMAP2+: clock: add support for clkdm ops to the low level clk ops\n" " ARM: OMAP2+: clock: add support for specific CM ops to ti_clk_ll_ops\n" " clk: ti: dpll: move omap3 DPLL functionality to clock driver\n" @@ -354,21 +346,17 @@ " clk: ti: dflt: move support for default gate clock to clock driver\n" " clk: ti: omap2430: move clock support code under clock driver\n" " clk: ti: clkdm: move clkdm gate clock support code to clock driver\n" - " clk: ti: omap34xx: move omap34xx clock type support code to clock dri=\n" - "ver\n" + " clk: ti: omap34xx: move omap34xx clock type support code to clock driver\n" " ARM: OMAP4: clock: remove clock44xx.h header\n" - " clk: ti: am3517: move remaining am3517 clock support code to clock dr=\n" - "iver\n" + " clk: ti: am3517: move remaining am3517 clock support code to clock driver\n" " clk: ti: move some public definitions to private header\n" " ARM: OMAP2+: clock: remove dead definitions from the clock header file\n" - " clk: ti: remove exported ll_ops struct, instead add an API for regist=\n" - "ration\n" + " clk: ti: remove exported ll_ops struct, instead add an API for registration\n" " ARM: OMAP2+: clock: remove legacy omap2_clk_readl/writel APIs\n" " clk: ti: move low-level access and init code under clock driver\n" "\n" "Thomas Abraham (1):\n" - " clk: exynos5250: add cpu clock configuration data and instantiate cpu=\n" - " clock\n" + " clk: exynos5250: add cpu clock configuration data and instantiate cpu clock\n" "\n" "Tuomas Tynkkynen (7):\n" " clk: tegra: Add binding for the Tegra124 DFLL clocksource\n" @@ -626,8 +614,7 @@ " drivers/clk/sunxi/clk-sunxi.c | 227 +--\n" " drivers/clk/sunxi/clk-usb.c | 3 +-\n" " drivers/clk/tegra/Makefile | 3 +\n" - " drivers/clk/tegra/clk-dfll.c | 1757 ++++++++++++++++=\n" - "++++\n" + " drivers/clk/tegra/clk-dfll.c | 1757 ++++++++++++++++++++\n" " drivers/clk/tegra/clk-dfll.h | 54 +\n" " drivers/clk/tegra/clk-divider.c | 1 -\n" " drivers/clk/tegra/clk-emc.c | 36 +-\n" @@ -665,15 +652,15 @@ " drivers/clk/ti/clk-dra7-atl.c | 1 +\n" " drivers/clk/ti/clk.c | 154 +-\n" " drivers/clk/ti/clkt_dflt.c | 316 ++++\n" - " .../arm/mach-omap2 =3D> drivers/clk/ti}/clkt_dpll.c | 36 +-\n" + " .../arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c | 36 +-\n" " drivers/clk/ti/clkt_iclk.c | 101 ++\n" " drivers/clk/ti/clock.h | 105 ++\n" " drivers/clk/ti/clockdomain.c | 83 +-\n" " drivers/clk/ti/composite.c | 4 +-\n" " drivers/clk/ti/divider.c | 8 +-\n" " drivers/clk/ti/dpll.c | 9 +-\n" - " {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll3xxx.c | 217 ++-\n" - " {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll44xx.c | 55 +-\n" + " {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c | 217 ++-\n" + " {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c | 55 +-\n" " drivers/clk/ti/fapll.c | 4 +-\n" " drivers/clk/ti/fixed-factor.c | 2 +\n" " drivers/clk/ti/gate.c | 6 +-\n" @@ -695,7 +682,7 @@ " drivers/clk/versatile/clk-versatile.c | 4 +-\n" " drivers/clk/zte/Makefile | 2 +-\n" " drivers/clk/zte/clk-zx296702.c | 126 +-\n" - " drivers/clk/zte/{clk-pll.c =3D> clk.c} | 141 +-\n" + " drivers/clk/zte/{clk-pll.c => clk.c} | 141 +-\n" " drivers/clk/zte/clk.h | 9 +\n" " drivers/clk/zynq/clkc.c | 1 +\n" " drivers/clocksource/cadence_ttc_timer.c | 1 -\n" @@ -721,12 +708,9 @@ " lib/vsprintf.c | 1 +\n" " 327 files changed, 9170 insertions(+), 4991 deletions(-)\n" " create mode 100644 Documentation/devicetree/bindings/arm/sp810.txt\n" - " create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.=\n" - "txt\n" - " create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124=\n" - "-dfll.txt\n" - " create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368=\n" - "-cru.txt\n" + " create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.txt\n" + " create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt\n" + " create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt\n" " create mode 100644 Documentation/devicetree/bindings/clock/ux500.txt\n" " delete mode 100644 arch/arm/mach-omap2/clkt_clksel.c\n" " delete mode 100644 arch/arm/mach-omap2/clkt_iclk.c\n" @@ -754,14 +738,14 @@ " create mode 100644 drivers/clk/tegra/cvb.c\n" " create mode 100644 drivers/clk/tegra/cvb.h\n" " create mode 100644 drivers/clk/ti/clkt_dflt.c\n" - " rename {arch/arm/mach-omap2 =3D> drivers/clk/ti}/clkt_dpll.c (92%)\n" + " rename {arch/arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c (92%)\n" " create mode 100644 drivers/clk/ti/clkt_iclk.c\n" - " rename {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll3xxx.c (79%)\n" - " rename {arch/arm/mach-omap2 =3D> drivers/clk/ti}/dpll44xx.c (79%)\n" + " rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c (79%)\n" + " rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c (79%)\n" " delete mode 100644 drivers/clk/ux500/u8500_clk.c\n" - " rename drivers/clk/zte/{clk-pll.c =3D> clk.c} (55%)\n" + " rename drivers/clk/zte/{clk-pll.c => clk.c} (55%)\n" " create mode 100644 include/dt-bindings/clock/imx6ul-clock.h\n" " create mode 100644 include/dt-bindings/clock/rk3368-cru.h\n" create mode 100644 include/dt-bindings/reset/tegra124-car.h -4ac98665c64bf2dc60dedd598527b74086f77df3f5abb400c78d448dfd56f34c +5528b8ab3d88804ed1ac5c4225e82d9e1c4c31e9c6899dd0748f4296ed563130
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.