| Message ID | 20180521115947.wqrnv2hczate65lz@flea |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] Allwinner clock changes for 4.18 | expand |
Quoting Maxime Ripard (2018-05-21 04:59:47) > Hi Mike, Stephen, > > Please merge the following changes for the next merge window, thanks! > Thanks. Pulled into clk-next.
Hi Maxime, 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: > Hi Mike, Stephen, > > Please merge the following changes for the next merge window, thanks! > > Maxime > > The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: > > Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 > > for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: > > clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) > > ---------------------------------------------------------------- > Allwinner clock changes for 4.18 > > Not a lot of changes for this release, but two quite important features > were added: the H6 PRCM clock support, and the needed changes to the R40 > clock driver to allow for the EMAC to operate. > > ---------------------------------------------------------------- > Icenowy Zheng (3): > clk: sunxi-ng: add support for H6 PRCM CCU > clk: sunxi-ng: r40: rewrite init code to a platform driver > clk: sunxi-ng: r40: export a regmap to access the GMAC register > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" not included in the pull request? You said "I've picked it up" https://patchwork.kernel.org/patch/10348031/ > .../devicetree/bindings/clock/sunxi-ccu.txt | 3 +- > drivers/clk/sunxi-ng/Kconfig | 5 + > drivers/clk/sunxi-ng/Makefile | 1 + > drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 207 +++++++++++++++++++++ > drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 19 ++ > drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 72 +++++-- > include/dt-bindings/clock/sun50i-h6-r-ccu.h | 24 +++ > include/dt-bindings/reset/sun50i-h6-r-ccu.h | 17 ++ > 8 files changed, 336 insertions(+), 12 deletions(-) > create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c > create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h > create mode 100644 include/dt-bindings/clock/sun50i-h6-r-ccu.h > create mode 100644 include/dt-bindings/reset/sun50i-h6-r-ccu.h > > -- > Maxime Ripard, Bootlin (formerly Free Electrons) > Embedded Linux and Kernel engineering > https://bootlin.com
Hi, On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > Hi Maxime, > > > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: >> Hi Mike, Stephen, >> >> Please merge the following changes for the next merge window, thanks! >> >> Maxime >> >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: >> >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) >> >> are available in the Git repository at: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 >> >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) >> >> ---------------------------------------------------------------- >> Allwinner clock changes for 4.18 >> >> Not a lot of changes for this release, but two quite important features >> were added: the H6 PRCM clock support, and the needed changes to the R40 >> clock driver to allow for the EMAC to operate. >> >> ---------------------------------------------------------------- >> Icenowy Zheng (3): >> clk: sunxi-ng: add support for H6 PRCM CCU >> clk: sunxi-ng: r40: rewrite init code to a platform driver >> clk: sunxi-ng: r40: export a regmap to access the GMAC register >> > > > > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" > not included in the pull request? > > > You said "I've picked it up" > https://patchwork.kernel.org/patch/10348031/ It looks like it was accidentally dropped after a rebase. Not quite sure what happened there. Maxime? ChenYu
Quoting Chen-Yu Tsai (2018-06-11 00:53:41) > Hi, > > On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada > <yamada.masahiro@socionext.com> wrote: > > Hi Maxime, > > > > > > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: > >> Hi Mike, Stephen, > >> > >> Please merge the following changes for the next merge window, thanks! > >> > >> Maxime > >> > >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: > >> > >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) > >> > >> are available in the Git repository at: > >> > >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 > >> > >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: > >> > >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) > >> > >> ---------------------------------------------------------------- > >> Allwinner clock changes for 4.18 > >> > >> Not a lot of changes for this release, but two quite important features > >> were added: the H6 PRCM clock support, and the needed changes to the R40 > >> clock driver to allow for the EMAC to operate. > >> > >> ---------------------------------------------------------------- > >> Icenowy Zheng (3): > >> clk: sunxi-ng: add support for H6 PRCM CCU > >> clk: sunxi-ng: r40: rewrite init code to a platform driver > >> clk: sunxi-ng: r40: export a regmap to access the GMAC register > >> > > > > > > > > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" > > not included in the pull request? > > > > > > You said "I've picked it up" > > https://patchwork.kernel.org/patch/10348031/ > > It looks like it was accidentally dropped after a rebase. > Not quite sure what happened there. Maxime? > I can directly pick and send as fix for clk-fixes targeting rc2.
On Tue, Jun 12, 2018 at 4:00 PM, Stephen Boyd <sboyd@kernel.org> wrote: > Quoting Chen-Yu Tsai (2018-06-11 00:53:41) >> Hi, >> >> On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada >> <yamada.masahiro@socionext.com> wrote: >> > Hi Maxime, >> > >> > >> > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: >> >> Hi Mike, Stephen, >> >> >> >> Please merge the following changes for the next merge window, thanks! >> >> >> >> Maxime >> >> >> >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: >> >> >> >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) >> >> >> >> are available in the Git repository at: >> >> >> >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 >> >> >> >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: >> >> >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) >> >> >> >> ---------------------------------------------------------------- >> >> Allwinner clock changes for 4.18 >> >> >> >> Not a lot of changes for this release, but two quite important features >> >> were added: the H6 PRCM clock support, and the needed changes to the R40 >> >> clock driver to allow for the EMAC to operate. >> >> >> >> ---------------------------------------------------------------- >> >> Icenowy Zheng (3): >> >> clk: sunxi-ng: add support for H6 PRCM CCU >> >> clk: sunxi-ng: r40: rewrite init code to a platform driver >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register >> >> >> > >> > >> > >> > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" >> > not included in the pull request? >> > >> > >> > You said "I've picked it up" >> > https://patchwork.kernel.org/patch/10348031/ >> >> It looks like it was accidentally dropped after a rebase. >> Not quite sure what happened there. Maxime? >> > > I can directly pick and send as fix for clk-fixes targeting rc2. The patch can still be found in the sunxi/for-next branch of the sunxi repo on kernel.org: https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/commit/?h=sunxi/for-next&id=d4a1496286b0c29fcace4e10c0047cca7cc79b25 Or the original on patchwork: https://patchwork.kernel.org/patch/10348027/ Thanks ChenYu
On Mon, Jun 11, 2018 at 03:53:41PM +0800, Chen-Yu Tsai wrote: > Hi, > > On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada > <yamada.masahiro@socionext.com> wrote: > > Hi Maxime, > > > > > > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: > >> Hi Mike, Stephen, > >> > >> Please merge the following changes for the next merge window, thanks! > >> > >> Maxime > >> > >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: > >> > >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) > >> > >> are available in the Git repository at: > >> > >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 > >> > >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: > >> > >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) > >> > >> ---------------------------------------------------------------- > >> Allwinner clock changes for 4.18 > >> > >> Not a lot of changes for this release, but two quite important features > >> were added: the H6 PRCM clock support, and the needed changes to the R40 > >> clock driver to allow for the EMAC to operate. > >> > >> ---------------------------------------------------------------- > >> Icenowy Zheng (3): > >> clk: sunxi-ng: add support for H6 PRCM CCU > >> clk: sunxi-ng: r40: rewrite init code to a platform driver > >> clk: sunxi-ng: r40: export a regmap to access the GMAC register > >> > > > > > > > > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" > > not included in the pull request? > > > > > > You said "I've picked it up" > > https://patchwork.kernel.org/patch/10348031/ > > It looks like it was accidentally dropped after a rebase. > Not quite sure what happened there. Maxime? I'm not quite sure what happened, sorry, but this should have definitely been part of that PR :/ Maxime
Hi. 2018-06-13 16:26 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: > On Mon, Jun 11, 2018 at 03:53:41PM +0800, Chen-Yu Tsai wrote: >> Hi, >> >> On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada >> <yamada.masahiro@socionext.com> wrote: >> > Hi Maxime, >> > >> > >> > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: >> >> Hi Mike, Stephen, >> >> >> >> Please merge the following changes for the next merge window, thanks! >> >> >> >> Maxime >> >> >> >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: >> >> >> >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) >> >> >> >> are available in the Git repository at: >> >> >> >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 >> >> >> >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: >> >> >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) >> >> >> >> ---------------------------------------------------------------- >> >> Allwinner clock changes for 4.18 >> >> >> >> Not a lot of changes for this release, but two quite important features >> >> were added: the H6 PRCM clock support, and the needed changes to the R40 >> >> clock driver to allow for the EMAC to operate. >> >> >> >> ---------------------------------------------------------------- >> >> Icenowy Zheng (3): >> >> clk: sunxi-ng: add support for H6 PRCM CCU >> >> clk: sunxi-ng: r40: rewrite init code to a platform driver >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register >> >> >> > >> > >> > >> > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" >> > not included in the pull request? >> > >> > >> > You said "I've picked it up" >> > https://patchwork.kernel.org/patch/10348031/ >> >> It looks like it was accidentally dropped after a rebase. >> Not quite sure what happened there. Maxime? > > I'm not quite sure what happened, sorry, but this should have > definitely been part of that PR :/ > Stephen offered to pick it up directly for -rc2. Is that OK with you? I am fine if it is well-organized between you and Stephen.
On Wed, Jun 13, 2018 at 05:16:30PM +0900, Masahiro Yamada wrote: > Hi. > > 2018-06-13 16:26 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: > > On Mon, Jun 11, 2018 at 03:53:41PM +0800, Chen-Yu Tsai wrote: > >> Hi, > >> > >> On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada > >> <yamada.masahiro@socionext.com> wrote: > >> > Hi Maxime, > >> > > >> > > >> > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: > >> >> Hi Mike, Stephen, > >> >> > >> >> Please merge the following changes for the next merge window, thanks! > >> >> > >> >> Maxime > >> >> > >> >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: > >> >> > >> >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) > >> >> > >> >> are available in the Git repository at: > >> >> > >> >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 > >> >> > >> >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: > >> >> > >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) > >> >> > >> >> ---------------------------------------------------------------- > >> >> Allwinner clock changes for 4.18 > >> >> > >> >> Not a lot of changes for this release, but two quite important features > >> >> were added: the H6 PRCM clock support, and the needed changes to the R40 > >> >> clock driver to allow for the EMAC to operate. > >> >> > >> >> ---------------------------------------------------------------- > >> >> Icenowy Zheng (3): > >> >> clk: sunxi-ng: add support for H6 PRCM CCU > >> >> clk: sunxi-ng: r40: rewrite init code to a platform driver > >> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register > >> >> > >> > > >> > > >> > > >> > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" > >> > not included in the pull request? > >> > > >> > > >> > You said "I've picked it up" > >> > https://patchwork.kernel.org/patch/10348031/ > >> > >> It looks like it was accidentally dropped after a rebase. > >> Not quite sure what happened there. Maxime? > > > > I'm not quite sure what happened, sorry, but this should have > > definitely been part of that PR :/ > > > > Stephen offered to pick it up directly for -rc2. > Is that OK with you? > > I am fine if it is well-organized between you and Stephen. Yep, that definitely works for me. Sorry again, Maxime
Hi Stephen, On Tue, Jun 12, 2018 at 4:38 PM, Chen-Yu Tsai <wens@csie.org> wrote: > On Tue, Jun 12, 2018 at 4:00 PM, Stephen Boyd <sboyd@kernel.org> wrote: >> Quoting Chen-Yu Tsai (2018-06-11 00:53:41) >>> Hi, >>> >>> On Mon, Jun 11, 2018 at 10:00 AM, Masahiro Yamada >>> <yamada.masahiro@socionext.com> wrote: >>> > Hi Maxime, >>> > >>> > >>> > 2018-05-21 20:59 GMT+09:00 Maxime Ripard <maxime.ripard@bootlin.com>: >>> >> Hi Mike, Stephen, >>> >> >>> >> Please merge the following changes for the next merge window, thanks! >>> >> >>> >> Maxime >>> >> >>> >> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: >>> >> >>> >> Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) >>> >> >>> >> are available in the Git repository at: >>> >> >>> >> https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 >>> >> >>> >> for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: >>> >> >>> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) >>> >> >>> >> ---------------------------------------------------------------- >>> >> Allwinner clock changes for 4.18 >>> >> >>> >> Not a lot of changes for this release, but two quite important features >>> >> were added: the H6 PRCM clock support, and the needed changes to the R40 >>> >> clock driver to allow for the EMAC to operate. >>> >> >>> >> ---------------------------------------------------------------- >>> >> Icenowy Zheng (3): >>> >> clk: sunxi-ng: add support for H6 PRCM CCU >>> >> clk: sunxi-ng: r40: rewrite init code to a platform driver >>> >> clk: sunxi-ng: r40: export a regmap to access the GMAC register >>> >> >>> > >>> > >>> > >>> > Why was my patch "clk: sunxi-ng: replace lib-y with obj-y" >>> > not included in the pull request? >>> > >>> > >>> > You said "I've picked it up" >>> > https://patchwork.kernel.org/patch/10348031/ >>> >>> It looks like it was accidentally dropped after a rebase. >>> Not quite sure what happened there. Maxime? >>> >> >> I can directly pick and send as fix for clk-fixes targeting rc2. This is a friendly reminder to pick up this patch for -rc2. > The patch can still be found in the sunxi/for-next branch of the > sunxi repo on kernel.org: > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/commit/?h=sunxi/for-next&id=d4a1496286b0c29fcace4e10c0047cca7cc79b25 This is still available, but no longer referenced in any branch, as we've updated our sunxi/for-next branch for 4.19 stuff. > Or the original on patchwork: > > https://patchwork.kernel.org/patch/10348027/ And Acked-by: Chen-Yu Tsai <wens@csie.org> if you pick directly from patchwork. Thanks ChenYu
Quoting Chen-Yu Tsai (2018-06-19 19:14:26) > Hi Stephen, > > On Tue, Jun 12, 2018 at 4:38 PM, Chen-Yu Tsai <wens@csie.org> wrote: > > On Tue, Jun 12, 2018 at 4:00 PM, Stephen Boyd <sboyd@kernel.org> wrote: > >> Quoting Chen-Yu Tsai (2018-06-11 00:53:41) > >>> > >> > >> I can directly pick and send as fix for clk-fixes targeting rc2. > > This is a friendly reminder to pick up this patch for -rc2. > > > The patch can still be found in the sunxi/for-next branch of the > > sunxi repo on kernel.org: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/commit/?h=sunxi/for-next&id=d4a1496286b0c29fcace4e10c0047cca7cc79b25 > > This is still available, but no longer referenced in any branch, > as we've updated our sunxi/for-next branch for 4.19 stuff. > > > Or the original on patchwork: > > > > https://patchwork.kernel.org/patch/10348027/ > > And > > Acked-by: Chen-Yu Tsai <wens@csie.org> > > if you pick directly from patchwork. > Got it from linux-next. Thanks!
Hi Mike, Stephen, Please merge the following changes for the next merge window, thanks! Maxime The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-for-4.18 for you to fetch changes up to 17de4c857b1f74b90967f7e7fd5ff81be61dc044: clk: sunxi-ng: r40: export a regmap to access the GMAC register (2018-05-17 14:02:07 +0800) ---------------------------------------------------------------- Allwinner clock changes for 4.18 Not a lot of changes for this release, but two quite important features were added: the H6 PRCM clock support, and the needed changes to the R40 clock driver to allow for the EMAC to operate. ---------------------------------------------------------------- Icenowy Zheng (3): clk: sunxi-ng: add support for H6 PRCM CCU clk: sunxi-ng: r40: rewrite init code to a platform driver clk: sunxi-ng: r40: export a regmap to access the GMAC register .../devicetree/bindings/clock/sunxi-ccu.txt | 3 +- drivers/clk/sunxi-ng/Kconfig | 5 + drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 207 +++++++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 19 ++ drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 72 +++++-- include/dt-bindings/clock/sun50i-h6-r-ccu.h | 24 +++ include/dt-bindings/reset/sun50i-h6-r-ccu.h | 17 ++ 8 files changed, 336 insertions(+), 12 deletions(-) create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h create mode 100644 include/dt-bindings/clock/sun50i-h6-r-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h6-r-ccu.h