From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Wed, 26 Aug 2015 23:31:41 +0000 Subject: Re: [PATCH v2] clk: shmobile: Get rid of CONFIG_SHMOBILE_MULTI Message-Id: <20150826233139.GB22263@verge.net.au> List-Id: References: <20150826074309.4298.76147.sendpatchset@little-apple> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Magnus Damm Cc: Geert Uytterhoeven , linux-clk , Kuninori Morimoto , Linux-sh list , Michael Turquette , Stephen Boyd , Laurent Pinchart On Wed, Aug 26, 2015 at 04:56:47PM +0900, Magnus Damm wrote: > Hi Geert, > > On Wed, Aug 26, 2015 at 4:48 PM, Geert Uytterhoeven > wrote: > > On Wed, Aug 26, 2015 at 9:43 AM, Magnus Damm wrote: > >> From: Magnus Damm > >> > >> Shmobile is all multiplatform these days, so get rid of the > >> reference to CONFIG_ARCH_SHMOBILE_MULTI. Also instead of always > >> enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and > >> MSTP depending on if they are included in the SoC or not. > >> > >> Signed-off-by: Magnus Damm > >> Acked-by: Geert Uytterhoeven > >> --- > >> > >> Changes since V1: > >> - dropped DIV6 from R-Car Gen1 variants - thanks Geert! > > > > BTW, you forgot to mention, but it's important for Mike and Stephen to > > know that this should not be queued up in a branch that still has > > ARCH_SHMOBILE_LEGACY. > > Right, we need to sync with the mach-shmobile integration merge order > with stuff from Simon. I believe the remaining legacy cleanups are > targeted for v4.4. So merging this in v4.4 or later would be good. Yes, the remaining legacy cleanups are queued up in my renesas tree for v4.4.