| Message ID | cover.1442536920.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
Hi Simon, On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Renesas ARM Based SoC DT Updates for v4.4 > > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound These two should actually go in in v4.3, as they're bugfixes for commits that are in v4.3-rc1. That can be done in parallel, though. Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in sh-drivers-for-v4.3 enters mainline. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote: > > On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Renesas ARM Based SoC DT Updates for v4.4 > > > > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > > > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound > > These two should actually go in in v4.3, as they're bugfixes for commits that > are in v4.3-rc1. That can be done in parallel, though. > > Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 > ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in > sh-drivers-for-v4.3 enters mainline. > The commits are on the top of the branch, so we could just remove them here and apply them to the fixes branch if you like. Arnd
Hi Arnd, On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote: >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman >> <horms+renesas@verge.net.au> wrote: >> > Renesas ARM Based SoC DT Updates for v4.4 >> > >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs >> >> > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound >> > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound >> >> These two should actually go in in v4.3, as they're bugfixes for commits that >> are in v4.3-rc1. That can be done in parallel, though. >> >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in >> sh-drivers-for-v4.3 enters mainline. > > The commits are on the top of the branch, so we could just remove them > here and apply them to the fixes branch if you like. That sounds fine to me, thanks! Simon, is that OK for you? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Fri, Sep 18, 2015 at 09:16:31AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Renesas ARM Based SoC DT Updates for v4.4 > > > > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > > > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound > > These two should actually go in in v4.3, as they're bugfixes for commits that > are in v4.3-rc1. That can be done in parallel, though. Thanks, I'll resubmit those patches as fixes and revise this pull request accordingly. > Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 > ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in > sh-drivers-for-v4.3 enters mainline. I sent a pull-request for that yesterday, so presumably that will be soon.
On Fri, Sep 18, 2015 at 09:21:54AM +0200, Arnd Bergmann wrote: > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote: > > > > On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman > > <horms+renesas@verge.net.au> wrote: > > > Renesas ARM Based SoC DT Updates for v4.4 > > > > > > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > > > > > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > > > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound > > > > These two should actually go in in v4.3, as they're bugfixes for commits that > > are in v4.3-rc1. That can be done in parallel, though. > > > > Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 > > ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in > > sh-drivers-for-v4.3 enters mainline. > > > > The commits are on the top of the branch, so we could just remove them > here and apply them to the fixes branch if you like. Thanks, that would be wonderful. Would you also like me to resubmit this pull request with the top two patches removed?
On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote: > Hi Arnd, > > On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote: > >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman > >> <horms+renesas@verge.net.au> wrote: > >> > Renesas ARM Based SoC DT Updates for v4.4 > >> > > >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > >> > >> > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > >> > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound > >> > >> These two should actually go in in v4.3, as they're bugfixes for commits that > >> are in v4.3-rc1. That can be done in parallel, though. > >> > >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 > >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in > >> sh-drivers-for-v4.3 enters mainline. > > > > The commits are on the top of the branch, so we could just remove them > > here and apply them to the fixes branch if you like. > > That sounds fine to me, thanks! > > Simon, is that OK for you? Yes, perfectly fine.
Hi Arnd, On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote: > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote: > > Hi Arnd, > > > > On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote: > > > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote: > > >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman > > >> <horms+renesas@verge.net.au> wrote: > > >> > Renesas ARM Based SoC DT Updates for v4.4 > > >> > > > >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > > >> > > >> > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > > >> > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound > > >> > > >> These two should actually go in in v4.3, as they're bugfixes for commits that > > >> are in v4.3-rc1. That can be done in parallel, though. > > >> > > >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 > > >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in > > >> sh-drivers-for-v4.3 enters mainline. > > > > > > The commits are on the top of the branch, so we could just remove them > > > here and apply them to the fixes branch if you like. > > > > That sounds fine to me, thanks! > > > > Simon, is that OK for you? > > Yes, perfectly fine. I am wondering if you need anything from me at this point.
On 09/18/2015 03:47 AM, Simon Horman wrote: > Add Silk Device tree bindings Documentation, listing it as a supported board. > > This allows to use checkpatch to validate DTSes referring to the Silk board. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt > index 2b9cb62838f2..1d70e78e7c80 100644 > --- a/Documentation/devicetree/bindings/arm/shmobile.txt > +++ b/Documentation/devicetree/bindings/arm/shmobile.txt > @@ -55,3 +55,5 @@ Boards: > compatible = "renesas,lager", "renesas,r8a7790" > - Marzen > compatible = "renesas,marzen", "renesas,r8a7779" > + - Silk I'll have to fix this up to SILK (RTP0RC7794LCB00011S). Sorry, noticed too late. :-( MBR, Sergei
Hi Arnd, On Thu, Sep 24, 2015 at 02:08:46PM +0900, Simon Horman wrote: > Hi Arnd, > > On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote: > > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote: > > > Hi Arnd, > > > > > > On Fri, Sep 18, 2015 at 9:21 AM, Arnd Bergmann <arnd@arndb.de> wrote: > > > > On Friday 18 September 2015 09:16:31 Geert Uytterhoeven wrote: > > > >> On Fri, Sep 18, 2015 at 2:47 AM, Simon Horman > > > >> <horms+renesas@verge.net.au> wrote: > > > >> > Renesas ARM Based SoC DT Updates for v4.4 > > > >> > > > > >> > * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs > > > >> > > > >> > ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound > > > >> > ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound > > > >> > > > >> These two should actually go in in v4.3, as they're bugfixes for commits that > > > >> are in v4.3-rc1. That can be done in parallel, though. > > > >> > > > >> Sound will stop working in mainline as soon as commit cbc41d0a761bffb3 > > > >> ("drivers: sh: Disable PM runtime for multi-platform ARM with genpd") in > > > >> sh-drivers-for-v4.3 enters mainline. > > > > > > > > The commits are on the top of the branch, so we could just remove them > > > > here and apply them to the fixes branch if you like. > > > > > > That sounds fine to me, thanks! > > > > > > Simon, is that OK for you? > > > > Yes, perfectly fine. > > I am wondering if you need anything from me at this point. In the interest of moving things forwards I am: * Withdrawing this pull request * Preparing a pull request with only the fixes I will also prepare an updated, v2, version of this pull request without the fixes and with some new patches I have queued-up in the mean time.
On Friday 02 October 2015 11:28:39 Simon Horman wrote: > > > > > > Yes, perfectly fine. > > > > I am wondering if you need anything from me at this point. > > In the interest of moving things forwards I am: > > * Withdrawing this pull request > * Preparing a pull request with only the fixes > > I will also prepare an updated, v2, version of this pull request > without the fixes and with some new patches I have queued-up in > the mean time. Hi Simon, I'm very sorry for dropping the ball here. I'm definitely fine with this, I just screwed up and didn't do any merges at all since I returned from my leave, and Olof was also busy otherwise this week. Arnd
On Sat, Oct 03, 2015 at 12:18:00AM +0200, Arnd Bergmann wrote: > On Friday 02 October 2015 11:28:39 Simon Horman wrote: > > > > > > > > Yes, perfectly fine. > > > > > > I am wondering if you need anything from me at this point. > > > > In the interest of moving things forwards I am: > > > > * Withdrawing this pull request > > * Preparing a pull request with only the fixes > > > > I will also prepare an updated, v2, version of this pull request > > without the fixes and with some new patches I have queued-up in > > the mean time. > > Hi Simon, > > I'm very sorry for dropping the ball here. I'm definitely fine with this, > I just screwed up and didn't do any merges at all since I returned from > my leave, and Olof was also busy otherwise this week. Hi And No problem. I assumed you were busy with something.
On Friday 02 October 2015 11:28:39 Simon Horman wrote: > On Thu, Sep 24, 2015 at 02:08:46PM +0900, Simon Horman wrote: > > On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote: > > > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote: > > > Yes, perfectly fine. > > > > I am wondering if you need anything from me at this point. > > In the interest of moving things forwards I am: > > * Withdrawing this pull request > * Preparing a pull request with only the fixes > > I will also prepare an updated, v2, version of this pull request > without the fixes and with some new patches I have queued-up in > the mean time. > As you noticed, I have finally started merging stuff now. Based on your mail here, I'm waiting for v2 of this pull request now, but I can also apply the remaining patches as I suggested earlier if you prefer. Arnd
On Tue, Oct 06, 2015 at 04:39:08PM +0200, Arnd Bergmann wrote: > On Friday 02 October 2015 11:28:39 Simon Horman wrote: > > On Thu, Sep 24, 2015 at 02:08:46PM +0900, Simon Horman wrote: > > > On Fri, Sep 18, 2015 at 05:19:36PM +0900, Simon Horman wrote: > > > > On Fri, Sep 18, 2015 at 09:29:58AM +0200, Geert Uytterhoeven wrote: > > > > Yes, perfectly fine. > > > > > > I am wondering if you need anything from me at this point. > > > > In the interest of moving things forwards I am: > > > > * Withdrawing this pull request > > * Preparing a pull request with only the fixes > > > > I will also prepare an updated, v2, version of this pull request > > without the fixes and with some new patches I have queued-up in > > the mean time. > > > > As you noticed, I have finally started merging stuff now. Based on > your mail here, I'm waiting for v2 of this pull request now, but > I can also apply the remaining patches as I suggested earlier if > you prefer. Please wait for v2, I'll send it out soon.
Hi Olof, Hi Kevin, Hi Arnd, Please consider these Renesas ARM based SoC DT updates for v4.4. This pull request is based on "Renesas ARM Based SoC Cleanup for v4.4, tagged as renesas-cleanup-for-v4.4, which I have also sent a pull-request for. The following changes since commit 04418c23a9411b85b8789eab5f4397bcbd62b7b4: ARM: shmobile: Remove legacy clock support leftovers (2015-09-14 10:06:56 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v4.4 for you to fetch changes up to 2529493c288c109cf734235d1eb3de1b23d9bcef: ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound (2015-09-14 10:25:58 +0900) ---------------------------------------------------------------- Renesas ARM Based SoC DT Updates for v4.4 * Add missing CPG/MSTP Clock Domain for sound on r8a779[01] SoCs * Tidy up SCI resource region on r8a779[018] SoCs * Add pinmux for iic0 on Lager board * Use CCF for audio clock on Lager and Koelsch boards * Use serial0 and 1 as serial ports on Marzen board * Use adxl345-specific compatible property for KZM9G board * Document compat string for Silk board * Enable GPIO, I2C, QSPI and VIN support on r8a7794/Silk ---------------------------------------------------------------- Geert Uytterhoeven (3): ARM: shmobile: kzm9g dts: Use adxl345-specific compatible property ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound Kuninori Morimoto (5): ARM: shmobile: koelsch: use CCF for audio clock ARM: shmobile: lager: use CCF for audio clock ARM: shmobile: r8a7790: tidyup SSI resource region ARM: shmobile: r8a7791: tidyup SSI resource region ARM: shmobile: r8a7778: tidyup SSI resource region Magnus Damm (1): ARM: shmobile: marzen: Board specific serial port order Sergei Shtylyov (8): ARM: shmobile: r8a7794: add GPIO clocks ARM: shmobile: r8a7794: add GPIO DT support ARM: shmobile: r8a7794: add QSPI DT support ARM: shmobile: silk: add QSPI DT support ARM: shmobile: r8a7794: add I2C DT support ARM: shmobile: silk: add I2C1 DT support ARM: shmobile: r8a7794: add VIN DT support ARM: shmobile: silk: add VIN0/ADV7180 DT support Simon Horman (1): ARM: shmobile: Add silk device tree bindings documentation Wolfram Sang (1): ARM: shmobile: r8a7790: lager: add pinmux for iic0 Documentation/devicetree/bindings/arm/shmobile.txt | 2 + arch/arm/boot/dts/r8a7778.dtsi | 2 +- arch/arm/boot/dts/r8a7779-marzen.dts | 6 +- arch/arm/boot/dts/r8a7790-lager.dts | 16 +- arch/arm/boot/dts/r8a7790.dtsi | 3 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- arch/arm/boot/dts/r8a7791.dtsi | 3 +- arch/arm/boot/dts/r8a7794-silk.dts | 88 ++++++++ arch/arm/boot/dts/r8a7794.dtsi | 224 ++++++++++++++++++++- arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- 10 files changed, 338 insertions(+), 17 deletions(-)