* [GIT PULL] Renesas ARM-based SoC: SoC for 3.7
@ 2012-09-06 2:02 Simon Horman
2012-09-06 2:02 ` [PATCH] r8a7779: add SDHI clock support Simon Horman
2012-09-07 21:49 ` [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Olof Johansson
0 siblings, 2 replies; 7+ messages in thread
From: Simon Horman @ 2012-09-06 2:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following SoC enhancement from
Phil Edworthy for inclusion in 3.7.
----------------------------------------------------------------
The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0:
ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
for you to fetch changes up to 263510ec774b490dffbd0b8db7b723025cf560c9:
r8a7779: add SDHI clock support (2012-09-06 10:49:18 +0900)
----------------------------------------------------------------
Phil Edworthy (1):
r8a7779: add SDHI clock support
arch/arm/mach-shmobile/clock-r8a7779.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] r8a7779: add SDHI clock support 2012-09-06 2:02 [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Simon Horman @ 2012-09-06 2:02 ` Simon Horman 2012-09-07 21:49 ` [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Olof Johansson 1 sibling, 0 replies; 7+ messages in thread From: Simon Horman @ 2012-09-06 2:02 UTC (permalink / raw) To: linux-arm-kernel From: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 339c62c..3cafb6a 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -86,11 +86,16 @@ static struct clk div4_clks[DIV4_NR] = { 0x0300, CLK_ENABLE_ON_INIT), }; -enum { MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, +enum { MSTP323, MSTP322, MSTP321, MSTP320, + MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, MSTP016, MSTP015, MSTP014, MSTP_NR }; static struct clk mstp_clks[MSTP_NR] = { + [MSTP323] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 23, 0), /* SDHI0 */ + [MSTP322] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 22, 0), /* SDHI1 */ + [MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */ + [MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */ [MSTP026] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 26, 0), /* SCIF0 */ [MSTP025] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 25, 0), /* SCIF1 */ [MSTP024] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 24, 0), /* SCIF2 */ @@ -149,6 +154,10 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */ CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */ + CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */ + CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */ + CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */ + CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP320]), /* SDHI3 */ }; void __init r8a7779_clock_init(void) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 2012-09-06 2:02 [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Simon Horman 2012-09-06 2:02 ` [PATCH] r8a7779: add SDHI clock support Simon Horman @ 2012-09-07 21:49 ` Olof Johansson 2012-09-08 0:10 ` Simon Horman 1 sibling, 1 reply; 7+ messages in thread From: Olof Johansson @ 2012-09-07 21:49 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thu, Sep 06, 2012 at 11:02:07AM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > please consider the following SoC enhancement from > Phil Edworthy for inclusion in 3.7. > > ---------------------------------------------------------------- > The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0: > > ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc The above is based on the previous branch we pulled from you (kzm9g), and contains a patch to support rebooting of a board. I would have expected that to be the base for your board branch but not the SoC branch. Did you mean to base them like this for some other reason that I didn't realize, or would you mind switching the two branches so that the board one includes the restart change but not the other way around? -Olof ^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 2012-09-07 21:49 ` [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Olof Johansson @ 2012-09-08 0:10 ` Simon Horman 2012-09-11 4:51 ` Simon Horman 0 siblings, 1 reply; 7+ messages in thread From: Simon Horman @ 2012-09-08 0:10 UTC (permalink / raw) To: linux-arm-kernel On Fri, Sep 07, 2012 at 02:49:51PM -0700, Olof Johansson wrote: > Hi, > > On Thu, Sep 06, 2012 at 11:02:07AM +0900, Simon Horman wrote: > > Hi Olof, Hi Arnd, > > > > please consider the following SoC enhancement from > > Phil Edworthy for inclusion in 3.7. > > > > ---------------------------------------------------------------- > > The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0: > > > > ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc > > The above is based on the previous branch we pulled from you (kzm9g), and > contains a patch to support rebooting of a board. I would have expected that to > be the base for your board branch but not the SoC branch. > > Did you mean to base them like this for some other reason that I didn't > realize, or would you mind switching the two branches so that the board > one includes the restart change but not the other way around? Sorry about that, I'll switch things around. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 2012-09-08 0:10 ` Simon Horman @ 2012-09-11 4:51 ` Simon Horman 2012-09-12 5:55 ` Olof Johansson 0 siblings, 1 reply; 7+ messages in thread From: Simon Horman @ 2012-09-11 4:51 UTC (permalink / raw) To: linux-arm-kernel On Sat, Sep 08, 2012 at 09:10:26AM +0900, Simon Horman wrote: > On Fri, Sep 07, 2012 at 02:49:51PM -0700, Olof Johansson wrote: > > Hi, > > > > On Thu, Sep 06, 2012 at 11:02:07AM +0900, Simon Horman wrote: > > > Hi Olof, Hi Arnd, > > > > > > please consider the following SoC enhancement from > > > Phil Edworthy for inclusion in 3.7. > > > > > > ---------------------------------------------------------------- > > > The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0: > > > > > > ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc > > > > The above is based on the previous branch we pulled from you (kzm9g), and > > contains a patch to support rebooting of a board. I would have expected that to > > be the base for your board branch but not the SoC branch. > > > > Did you mean to base them like this for some other reason that I didn't > > realize, or would you mind switching the two branches so that the board > > one includes the restart change but not the other way around? > > Sorry about that, I'll switch things around. Hi Olof, I was going to switch things around as you suggest, but I noticed that the reason that I did things this way is that my kzm9g branch was pulled into the next/soc branch of the arm-soc tree (commit 301fd5c13257862df66c81c48d963d474e63e0ef). With that in mind, do you want to take this pull-request as is? ^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 2012-09-11 4:51 ` Simon Horman @ 2012-09-12 5:55 ` Olof Johansson 2012-09-12 7:20 ` Simon Horman 0 siblings, 1 reply; 7+ messages in thread From: Olof Johansson @ 2012-09-12 5:55 UTC (permalink / raw) To: linux-arm-kernel Hi, On Mon, Sep 10, 2012 at 9:51 PM, Simon Horman <horms@verge.net.au> wrote: > On Sat, Sep 08, 2012 at 09:10:26AM +0900, Simon Horman wrote: >> On Fri, Sep 07, 2012 at 02:49:51PM -0700, Olof Johansson wrote: >> > Hi, >> > >> > On Thu, Sep 06, 2012 at 11:02:07AM +0900, Simon Horman wrote: >> > > Hi Olof, Hi Arnd, >> > > >> > > please consider the following SoC enhancement from >> > > Phil Edworthy for inclusion in 3.7. >> > > >> > > ---------------------------------------------------------------- >> > > The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0: >> > > >> > > ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900) >> > > >> > > are available in the git repository at: >> > > >> > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc >> > >> > The above is based on the previous branch we pulled from you (kzm9g), and >> > contains a patch to support rebooting of a board. I would have expected that to >> > be the base for your board branch but not the SoC branch. >> > >> > Did you mean to base them like this for some other reason that I didn't >> > realize, or would you mind switching the two branches so that the board >> > one includes the restart change but not the other way around? >> >> Sorry about that, I'll switch things around. > > Hi Olof, > > I was going to switch things around as you suggest, but I noticed > that the reason that I did things this way is that my kzm9g branch > was pulled into the next/soc branch of the arm-soc tree (commit > 301fd5c13257862df66c81c48d963d474e63e0ef). Ah, gotcha, and also noticing my own slight confusion here. First, since there's no overlap with the old and the new branch, there's no need to base them on each other (since they won't cause merge conflicts, and order of merging them in doesn't have other dependencies either). But it also makes sense from your development point of view to stack them, since that's how you'll end up building up the branches anyway. So: > With that in mind, do you want to take this pull-request as is? Nah, no need, sorry for the confusion. I'll pull it in as it is into next/soc. -Olof ^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 2012-09-12 5:55 ` Olof Johansson @ 2012-09-12 7:20 ` Simon Horman 0 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2012-09-12 7:20 UTC (permalink / raw) To: linux-arm-kernel On Tue, Sep 11, 2012 at 10:55:47PM -0700, Olof Johansson wrote: > Hi, > > On Mon, Sep 10, 2012 at 9:51 PM, Simon Horman <horms@verge.net.au> wrote: > > On Sat, Sep 08, 2012 at 09:10:26AM +0900, Simon Horman wrote: > >> On Fri, Sep 07, 2012 at 02:49:51PM -0700, Olof Johansson wrote: > >> > Hi, > >> > > >> > On Thu, Sep 06, 2012 at 11:02:07AM +0900, Simon Horman wrote: > >> > > Hi Olof, Hi Arnd, > >> > > > >> > > please consider the following SoC enhancement from > >> > > Phil Edworthy for inclusion in 3.7. > >> > > > >> > > ---------------------------------------------------------------- > >> > > The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0: > >> > > > >> > > ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900) > >> > > > >> > > are available in the git repository at: > >> > > > >> > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc > >> > > >> > The above is based on the previous branch we pulled from you (kzm9g), and > >> > contains a patch to support rebooting of a board. I would have expected that to > >> > be the base for your board branch but not the SoC branch. > >> > > >> > Did you mean to base them like this for some other reason that I didn't > >> > realize, or would you mind switching the two branches so that the board > >> > one includes the restart change but not the other way around? > >> > >> Sorry about that, I'll switch things around. > > > > Hi Olof, > > > > I was going to switch things around as you suggest, but I noticed > > that the reason that I did things this way is that my kzm9g branch > > was pulled into the next/soc branch of the arm-soc tree (commit > > 301fd5c13257862df66c81c48d963d474e63e0ef). > > Ah, gotcha, and also noticing my own slight confusion here. > > First, since there's no overlap with the old and the new branch, > there's no need to base them on each other (since they won't cause > merge conflicts, and order of merging them in doesn't have other > dependencies either). > > But it also makes sense from your development point of view to stack > them, since that's how you'll end up building up the branches anyway. > So: > > > With that in mind, do you want to take this pull-request as is? > > Nah, no need, sorry for the confusion. I'll pull it in as it is into next/soc. Thanks! ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-12 7:20 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-06 2:02 [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Simon Horman 2012-09-06 2:02 ` [PATCH] r8a7779: add SDHI clock support Simon Horman 2012-09-07 21:49 ` [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Olof Johansson 2012-09-08 0:10 ` Simon Horman 2012-09-11 4:51 ` Simon Horman 2012-09-12 5:55 ` Olof Johansson 2012-09-12 7:20 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).