* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
@ 2012-11-08 5:47 ` Simon Horman
2012-11-08 5:56 ` Kuninori Morimoto
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2012-11-08 5:47 UTC (permalink / raw)
To: linux-sh
On Wed, Nov 07, 2012 at 07:07:02PM -0800, Kuninori Morimoto wrote:
>
> Hi Simon
>
> These are FSI clock change patches, and renesas_usbhs Host patch.
>
> FSI patches try to use FSI driver's clock method instead of platform's one.
> This is 2nd step of FSI DT support.
>
> Kuninori Morimoto (8):
> 1) ARM: shmobile: add fsi external clock on r8a7740
> 2) ARM: shmobile: add fsi external clock sh7372
> 3) ARM: shmobile: mackerel: enable DMAEngine on USB Host
> 4) ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> 5) ARM: shmobile: use FSI driver's audio clock on mackerel
> 6) ARM: shmobile: use FSI driver's audio clock on ap4evb
> 7) ARM: shmobile: sh7372: remove fsidivx clock
> 8) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
>
> arch/arm/mach-shmobile/board-ap4evb.c | 139 +-----------------------
> arch/arm/mach-shmobile/board-armadillo800eva.c | 38 +------
> arch/arm/mach-shmobile/board-mackerel.c | 74 +------------
> arch/arm/mach-shmobile/clock-r8a7740.c | 2 +
> arch/arm/mach-shmobile/clock-sh7372.c | 18 +--
> arch/arm/mach-shmobile/include/mach/sh7372.h | 2 -
> 6 files changed, 19 insertions(+), 254 deletions(-)
>
> 3) try to use DMAEngine on renesas_usbhs Host driver.
> It based on latest USB (= felipe's) branch
>
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git :: gadget
> 87c2905fd80da736b8f9aa58cbc0c9cf34a11aac
> (usb: renesas_usbhs: add DMAEngine support on mod_host)
>
> Other are based on latest ASoC (= Mark's) branch
>
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git :: /topic/fsi
> ab6f6d85210c4d0265cf48e9958c04e08595055a
> (ASoC: fsi: add master clock control functions)
>
> 1)2) are for cpu patches
> 3)4)5)6) are for platform patches
> 7)8) are for cpu patches, but depend on platform patches
Thanks, I plan to apply 1, 2, 7 & 8 to the soc branch of the renesas tree and;
3 - 6 to the boards branch of the reneas stree.
However, I am getting conflicts when applying your patches.
Could you either:
1. Split the series in two
a) 1, 2, 7 & 8 based on the soc branch of the renesas tree and;
b) 3 - 6 based on the boards branch of the renesas tree
2. Rebase the series on the next branch in the renesas tree.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
2012-11-08 5:47 ` Simon Horman
@ 2012-11-08 5:56 ` Kuninori Morimoto
2012-11-08 5:58 ` Paul Mundt
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Kuninori Morimoto @ 2012-11-08 5:56 UTC (permalink / raw)
To: linux-sh
Hi Simon
> > Kuninori Morimoto (8):
> > 1) ARM: shmobile: add fsi external clock on r8a7740
> > 2) ARM: shmobile: add fsi external clock sh7372
> > 3) ARM: shmobile: mackerel: enable DMAEngine on USB Host
> > 4) ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> > 5) ARM: shmobile: use FSI driver's audio clock on mackerel
> > 6) ARM: shmobile: use FSI driver's audio clock on ap4evb
> > 7) ARM: shmobile: sh7372: remove fsidivx clock
> > 8) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
(snip)
> Thanks, I plan to apply 1, 2, 7 & 8 to the soc branch of the renesas tree and;
> 3 - 6 to the boards branch of the reneas stree.
>
> However, I am getting conflicts when applying your patches.
> Could you either:
>
> 1. Split the series in two
>
> a) 1, 2, 7 & 8 based on the soc branch of the renesas tree and;
> b) 3 - 6 based on the boards branch of the renesas tree
>
> 2. Rebase the series on the next branch in the renesas tree.
I see, but I couldn't.
Because FSI patch-set depends on FSI-DVI patch
d5a1a6ca8c142a9b0b1120d303ee90e86a7e83c2
(ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks)
and I find it on simon/boards branch (not soc branch).
~~~~~~~~~~~~
What should I do in this case ?
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
2012-11-08 5:47 ` Simon Horman
2012-11-08 5:56 ` Kuninori Morimoto
@ 2012-11-08 5:58 ` Paul Mundt
2012-11-08 6:10 ` Simon Horman
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Paul Mundt @ 2012-11-08 5:58 UTC (permalink / raw)
To: linux-sh
On Wed, Nov 07, 2012 at 09:56:33PM -0800, Kuninori Morimoto wrote:
>
> Hi Simon
>
> > > Kuninori Morimoto (8):
> > > 1) ARM: shmobile: add fsi external clock on r8a7740
> > > 2) ARM: shmobile: add fsi external clock sh7372
> > > 3) ARM: shmobile: mackerel: enable DMAEngine on USB Host
> > > 4) ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> > > 5) ARM: shmobile: use FSI driver's audio clock on mackerel
> > > 6) ARM: shmobile: use FSI driver's audio clock on ap4evb
> > > 7) ARM: shmobile: sh7372: remove fsidivx clock
> > > 8) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> (snip)
> > Thanks, I plan to apply 1, 2, 7 & 8 to the soc branch of the renesas tree and;
> > 3 - 6 to the boards branch of the reneas stree.
> >
> > However, I am getting conflicts when applying your patches.
> > Could you either:
> >
> > 1. Split the series in two
> >
> > a) 1, 2, 7 & 8 based on the soc branch of the renesas tree and;
> > b) 3 - 6 based on the boards branch of the renesas tree
> >
> > 2. Rebase the series on the next branch in the renesas tree.
>
> I see, but I couldn't.
> Because FSI patch-set depends on FSI-DVI patch
>
> d5a1a6ca8c142a9b0b1120d303ee90e86a7e83c2
> (ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks)
>
> and I find it on simon/boards branch (not soc branch).
> ~~~~~~~~~~~~
>
> What should I do in this case ?
>
I suppose the easiest is to take the fsi-div change on its own topic
branch and then merge that twice, once for each of boards and soc, and
then layer these on top of it. git can figure out the rest, provided
there are no rebases.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
` (2 preceding siblings ...)
2012-11-08 5:58 ` Paul Mundt
@ 2012-11-08 6:10 ` Simon Horman
2012-11-08 6:17 ` Simon Horman
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2012-11-08 6:10 UTC (permalink / raw)
To: linux-sh
On Wed, Nov 07, 2012 at 09:56:33PM -0800, Kuninori Morimoto wrote:
>
> Hi Simon
>
> > > Kuninori Morimoto (8):
> > > 1) ARM: shmobile: add fsi external clock on r8a7740
> > > 2) ARM: shmobile: add fsi external clock sh7372
> > > 3) ARM: shmobile: mackerel: enable DMAEngine on USB Host
> > > 4) ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> > > 5) ARM: shmobile: use FSI driver's audio clock on mackerel
> > > 6) ARM: shmobile: use FSI driver's audio clock on ap4evb
> > > 7) ARM: shmobile: sh7372: remove fsidivx clock
> > > 8) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> (snip)
> > Thanks, I plan to apply 1, 2, 7 & 8 to the soc branch of the renesas tree and;
> > 3 - 6 to the boards branch of the reneas stree.
> >
> > However, I am getting conflicts when applying your patches.
> > Could you either:
> >
> > 1. Split the series in two
> >
> > a) 1, 2, 7 & 8 based on the soc branch of the renesas tree and;
> > b) 3 - 6 based on the boards branch of the renesas tree
> >
> > 2. Rebase the series on the next branch in the renesas tree.
>
> I see, but I couldn't.
> Because FSI patch-set depends on FSI-DVI patch
>
> d5a1a6ca8c142a9b0b1120d303ee90e86a7e83c2
> (ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks)
That commit is in the boards branch as far as I can see.
I will try to apply the board patches, they may be ok.
It was the first two soc patches that I had trouble with.
> and I find it on simon/boards branch (not soc branch).
> ~~~~~~~~~~~~
Strange, it seems to be here
http://git.kernel.org/?p=linux/kernel/git/horms/renesas.git;a=shortlog;h=refs/heads/soc
> What should I do in this case ?
Can you try to check your remote and fetch again?
If that fails I can manually apply the changes and send them to you for
review.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
` (3 preceding siblings ...)
2012-11-08 6:10 ` Simon Horman
@ 2012-11-08 6:17 ` Simon Horman
2012-11-08 7:29 ` Simon Horman
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2012-11-08 6:17 UTC (permalink / raw)
To: linux-sh
On Thu, Nov 08, 2012 at 03:10:42PM +0900, Simon Horman wrote:
> On Wed, Nov 07, 2012 at 09:56:33PM -0800, Kuninori Morimoto wrote:
> >
> > Hi Simon
> >
> > > > Kuninori Morimoto (8):
> > > > 1) ARM: shmobile: add fsi external clock on r8a7740
> > > > 2) ARM: shmobile: add fsi external clock sh7372
> > > > 3) ARM: shmobile: mackerel: enable DMAEngine on USB Host
> > > > 4) ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> > > > 5) ARM: shmobile: use FSI driver's audio clock on mackerel
> > > > 6) ARM: shmobile: use FSI driver's audio clock on ap4evb
> > > > 7) ARM: shmobile: sh7372: remove fsidivx clock
> > > > 8) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> > (snip)
> > > Thanks, I plan to apply 1, 2, 7 & 8 to the soc branch of the renesas tree and;
> > > 3 - 6 to the boards branch of the reneas stree.
> > >
> > > However, I am getting conflicts when applying your patches.
> > > Could you either:
> > >
> > > 1. Split the series in two
> > >
> > > a) 1, 2, 7 & 8 based on the soc branch of the renesas tree and;
> > > b) 3 - 6 based on the boards branch of the renesas tree
> > >
> > > 2. Rebase the series on the next branch in the renesas tree.
> >
> > I see, but I couldn't.
> > Because FSI patch-set depends on FSI-DVI patch
> >
> > d5a1a6ca8c142a9b0b1120d303ee90e86a7e83c2
> > (ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks)
>
> That commit is in the boards branch as far as I can see.
> I will try to apply the board patches, they may be ok.
> It was the first two soc patches that I had trouble with.
>
> > and I find it on simon/boards branch (not soc branch).
> > ~~~~~~~~~~~~
>
> Strange, it seems to be here
> http://git.kernel.org/?p=linux/kernel/git/horms/renesas.git;a=shortlog;h=refs/heads/soc
>
> > What should I do in this case ?
>
> Can you try to check your remote and fetch again?
>
> If that fails I can manually apply the changes and send them to you for
> review.
Sorry, I've noticed some problems with my branches.
I'll shake them out and get back to you ASAP.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
` (4 preceding siblings ...)
2012-11-08 6:17 ` Simon Horman
@ 2012-11-08 7:29 ` Simon Horman
2012-11-08 7:58 ` Kuninori Morimoto
2012-11-08 9:08 ` Simon Horman
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2012-11-08 7:29 UTC (permalink / raw)
To: linux-sh
On Thu, Nov 08, 2012 at 03:17:19PM +0900, Simon Horman wrote:
> On Thu, Nov 08, 2012 at 03:10:42PM +0900, Simon Horman wrote:
> > On Wed, Nov 07, 2012 at 09:56:33PM -0800, Kuninori Morimoto wrote:
> > >
> > > Hi Simon
> > >
> > > > > Kuninori Morimoto (8):
> > > > > 1) ARM: shmobile: add fsi external clock on r8a7740
> > > > > 2) ARM: shmobile: add fsi external clock sh7372
> > > > > 3) ARM: shmobile: mackerel: enable DMAEngine on USB Host
> > > > > 4) ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> > > > > 5) ARM: shmobile: use FSI driver's audio clock on mackerel
> > > > > 6) ARM: shmobile: use FSI driver's audio clock on ap4evb
> > > > > 7) ARM: shmobile: sh7372: remove fsidivx clock
> > > > > 8) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> > > (snip)
> > > > Thanks, I plan to apply 1, 2, 7 & 8 to the soc branch of the renesas tree and;
> > > > 3 - 6 to the boards branch of the reneas stree.
> > > >
> > > > However, I am getting conflicts when applying your patches.
> > > > Could you either:
> > > >
> > > > 1. Split the series in two
> > > >
> > > > a) 1, 2, 7 & 8 based on the soc branch of the renesas tree and;
> > > > b) 3 - 6 based on the boards branch of the renesas tree
> > > >
> > > > 2. Rebase the series on the next branch in the renesas tree.
> > >
> > > I see, but I couldn't.
> > > Because FSI patch-set depends on FSI-DVI patch
> > >
> > > d5a1a6ca8c142a9b0b1120d303ee90e86a7e83c2
> > > (ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks)
> >
> > That commit is in the boards branch as far as I can see.
> > I will try to apply the board patches, they may be ok.
> > It was the first two soc patches that I had trouble with.
> >
> > > and I find it on simon/boards branch (not soc branch).
> > > ~~~~~~~~~~~~
> >
> > Strange, it seems to be here
> > http://git.kernel.org/?p=linux/kernel/git/horms/renesas.git;a=shortlog;h=refs/heads/soc
> >
> > > What should I do in this case ?
> >
> > Can you try to check your remote and fetch again?
> >
> > If that fails I can manually apply the changes and send them to you for
> > review.
>
> Sorry, I've noticed some problems with my branches.
> I'll shake them out and get back to you ASAP.
I have spoken of with Olof Johansson and based on his advice I have
based the boards branch on the soc branch.
The result is as follows. Could you check to see if it
a) looks sane
b) anything is missing
* 7e7477a (origin/boards, boards) ARM: shmobile: use FSI driver's audio clock on ap4evb
* 38f8b5f ARM: shmobile: use FSI driver's audio clock on mackerel
* 23d98fe ARM: shmobile: use FSI driver's audio clock on armadillo800eva
* 19bf12f ARM: shmobile: mackerel: enable DMAEngine on USB Host
* 6188248 ARM: shmobile: marzen: add USB OHCI driver support
* 4f75b75 ARM: shmobile: marzen: add USB EHCI driver support
* 44051e2 ARM: shmobile: marzen: add USB phy support
* 092cb53 Merge branch 'soc' into boards
|\
| * c089609 (origin/soc, soc) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
| * 2a14f32 ARM: shmobile: sh7372: remove fsidivx clock
| * 2944628 ARM: shmobile: add fsi external clock sh7372
| * 8b0eadd ARM: shmobile: add fsi external clock on r8a7740
| * 7c4fd73 ARM: shmobile: r8a7740: add FSI-DVI clocks
| * dc3cad8 ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks
| * 9ee8008 ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global
| * 9d626ec sh: clkfwk: add sh_clk_fsidiv_register()
| * 9d69f5b ARM: shmobile: r8a7779: add USB OHCI clock support
| * 8841954 ARM: shmobile: r8a7779: add USB EHCI clock support
| * 0a38429 ARM: shmobile: r8a7740: add USB24 clock explain
| * 167443b ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
| * 86bc52e (arm-soc/renesas/soc) ARM: shmobile: r8a7740: Enable PMU
| * 40eaed7 ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
| * ccc2a27 ARM: shmobile: r8a7779: add I2C driver support
| * 16c40ab ARM: shmobile: r8a7779: add I2C clock support
| * f92246e ARM: shmobile: r8a7779: add HSPI clock support
| * a41acc4 ARM: shmobile: r8a7740: fixup DT machine desc name typo
| * cdc7594 ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode
| * e721295 ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode
| * 865d90f ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode
| * 2864b19 ARM: shmobile: Remove SH7377 support
| * ed9c075 ARM: shmobile: Remove SH7367 support
* | 631a7b5 (arm-soc/renesas/boards) ARM: shmobile: Remove G4EVM machine support
* | 6a800a0 ARM: shmobile: Remove G3EVM machine support
* | 0ce53cd ARM: mach-shmobile: Use DT_MACHINE for mackerel
* | b82573e ARM: shmobile: marzen: add HSPI support
* | 1efdf56 ARM: shmobile: armadillo800eva: enable restart
* | bd9e2e7 ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
* | 608c562 ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
* | 8cec012 ARM: shmobile: kzm9g: enable magnetometer ak8975.
|/
* ddffeb8 (tag: v3.7-rc1, origin/pmu, origin/master, origin/dt, origin/cleanup, arm-soc/ux500/soc, pmu, master, gpio, dt, cleanup) Linux 3.7-rc1
I have also update the next branch accordingly.
I have aslo added a new experimental branch, next+dependencies,
which is the next branch plus a merge of dependencies for FSI and USB
which are not in v3.7-rc1 or next. That is, dependencies that are in
branches of other trees.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
` (5 preceding siblings ...)
2012-11-08 7:29 ` Simon Horman
@ 2012-11-08 7:58 ` Kuninori Morimoto
2012-11-08 9:08 ` Simon Horman
7 siblings, 0 replies; 9+ messages in thread
From: Kuninori Morimoto @ 2012-11-08 7:58 UTC (permalink / raw)
To: linux-sh
Hi Simon
Thank you for your hard work
> a) looks sane
> b) anything is missing
> * 7e7477a (origin/boards, boards) ARM: shmobile: use FSI driver's audio clock on ap4evb
This patch chaned to use FSI driver's audio clock,
then, it removed old style clock settings.
But...
> * 38f8b5f ARM: shmobile: use FSI driver's audio clock on mackerel
> * 23d98fe ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> * 19bf12f ARM: shmobile: mackerel: enable DMAEngine on USB Host
> * 6188248 ARM: shmobile: marzen: add USB OHCI driver support
> * 4f75b75 ARM: shmobile: marzen: add USB EHCI driver support
> * 44051e2 ARM: shmobile: marzen: add USB phy support
> * 092cb53 Merge branch 'soc' into boards
> |\
> | * c089609 (origin/soc, soc) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> | * 2a14f32 ARM: shmobile: sh7372: remove fsidivx clock
These 2 patches are depend on above patches,
becouse these patches remove sh7372_xxx fsi clocks (= old style clock).
This means that there is compile error on ap4evb board from 2a14f32 to 38f8b5f.
and it is not good for "git bisect"
Can you change patch order like this ?
xxxxxxx ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
xxxxxxx ARM: shmobile: sh7372: remove fsidivx clock
...
xxxxxxx ARM: shmobile: use FSI driver's audio clock on ap4evb
xxxxxxx ARM: shmobile: use FSI driver's audio clock on mackerel
xxxxxxx ARM: shmobile: use FSI driver's audio clock on armadillo800eva
...
xxxxxxx ARM: shmobile: add fsi external clock sh7372
xxxxxxx ARM: shmobile: add fsi external clock on r8a7740
xxxxxxx ARM: shmobile: r8a7740: add FSI-DVI clocks
xxxxxxx ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks
....
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/8] ARM: shmobile: board used FSI driver's clock
2012-11-08 3:07 [PATCH 0/8] ARM: shmobile: board used FSI driver's clock Kuninori Morimoto
` (6 preceding siblings ...)
2012-11-08 7:58 ` Kuninori Morimoto
@ 2012-11-08 9:08 ` Simon Horman
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2012-11-08 9:08 UTC (permalink / raw)
To: linux-sh
On Wed, Nov 07, 2012 at 11:58:08PM -0800, Kuninori Morimoto wrote:
>
> Hi Simon
>
> Thank you for your hard work
>
> > a) looks sane
> > b) anything is missing
>
> > * 7e7477a (origin/boards, boards) ARM: shmobile: use FSI driver's audio clock on ap4evb
>
> This patch chaned to use FSI driver's audio clock,
> then, it removed old style clock settings.
> But...
>
> > * 38f8b5f ARM: shmobile: use FSI driver's audio clock on mackerel
> > * 23d98fe ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> > * 19bf12f ARM: shmobile: mackerel: enable DMAEngine on USB Host
> > * 6188248 ARM: shmobile: marzen: add USB OHCI driver support
> > * 4f75b75 ARM: shmobile: marzen: add USB EHCI driver support
> > * 44051e2 ARM: shmobile: marzen: add USB phy support
> > * 092cb53 Merge branch 'soc' into boards
> > |\
> > | * c089609 (origin/soc, soc) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> > | * 2a14f32 ARM: shmobile: sh7372: remove fsidivx clock
>
> These 2 patches are depend on above patches,
> becouse these patches remove sh7372_xxx fsi clocks (= old style clock).
> This means that there is compile error on ap4evb board from 2a14f32 to 38f8b5f.
> and it is not good for "git bisect"
>
> Can you change patch order like this ?
Yes. I talked to Olof Johansson again and he offered a solution
which is to:
* Have the boards branch based on the soc branch and then;
* Add an soc2 branch which is based on the boards branch.
-> soc2 branch HEAD
> xxxxxxx ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
> xxxxxxx ARM: shmobile: sh7372: remove fsidivx clock
> ...
-> boards branch HEAD
> xxxxxxx ARM: shmobile: use FSI driver's audio clock on ap4evb
> xxxxxxx ARM: shmobile: use FSI driver's audio clock on mackerel
> xxxxxxx ARM: shmobile: use FSI driver's audio clock on armadillo800eva
> ...
-> merge soc branch with already merged boards branch
-> soc branch HEAD
> xxxxxxx ARM: shmobile: add fsi external clock sh7372
> xxxxxxx ARM: shmobile: add fsi external clock on r8a7740
> xxxxxxx ARM: shmobile: r8a7740: add FSI-DVI clocks
> xxxxxxx ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks
> ....
-> already merged soc branch HEAD
The result is as follows. I have also updated the next and
next+dependencies branches accordingly.
* d5b6890 (origin/soc2, soc2) ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
* d14795f ARM: shmobile: sh7372: remove fsidivx clock
* 12818d8 (origin/boards, boards) ARM: shmobile: use FSI driver's audio clock on ap4evb
* 50ce2da ARM: shmobile: use FSI driver's audio clock on mackerel
* 13e35b4 ARM: shmobile: use FSI driver's audio clock on armadillo800eva
* c8c3243 ARM: shmobile: mackerel: enable DMAEngine on USB Host
* ac7c4ea ARM: shmobile: marzen: add USB OHCI driver support
* 94e1f7f ARM: shmobile: marzen: add USB EHCI driver support
* b5ce635 ARM: shmobile: marzen: add USB phy support
* ab3ff12 Merge branch 'soc' into boards
|\
| * 2944628 (origin/soc, soc) ARM: shmobile: add fsi external clock sh7372
| * 8b0eadd ARM: shmobile: add fsi external clock on r8a7740
| * 7c4fd73 ARM: shmobile: r8a7740: add FSI-DVI clocks
| * dc3cad8 ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks
| * 9ee8008 ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global
| * 9d626ec sh: clkfwk: add sh_clk_fsidiv_register()
| * 9d69f5b ARM: shmobile: r8a7779: add USB OHCI clock support
| * 8841954 ARM: shmobile: r8a7779: add USB EHCI clock support
| * 0a38429 ARM: shmobile: r8a7740: add USB24 clock explain
| * 167443b ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
| * 86bc52e (arm-soc/renesas/soc) ARM: shmobile: r8a7740: Enable PMU
| * 40eaed7 ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
| * ccc2a27 ARM: shmobile: r8a7779: add I2C driver support
| * 16c40ab ARM: shmobile: r8a7779: add I2C clock support
| * f92246e ARM: shmobile: r8a7779: add HSPI clock support
| * a41acc4 ARM: shmobile: r8a7740: fixup DT machine desc name typo
| * cdc7594 ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode
| * e721295 ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode
| * 865d90f ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode
| * 2864b19 ARM: shmobile: Remove SH7377 support
| * ed9c075 ARM: shmobile: Remove SH7367 support
* | 631a7b5 (arm-soc/renesas/boards) ARM: shmobile: Remove G4EVM machine support
* | 6a800a0 ARM: shmobile: Remove G3EVM machine support
* | 0ce53cd ARM: mach-shmobile: Use DT_MACHINE for mackerel
* | b82573e ARM: shmobile: marzen: add HSPI support
* | 1efdf56 ARM: shmobile: armadillo800eva: enable restart
* | bd9e2e7 ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
* | 608c562 ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
* | 8cec012 ARM: shmobile: kzm9g: enable magnetometer ak8975.
|/
* ddffeb8 (tag: v3.7-rc1, origin/pmu, origin/master, origin/dt, origin/cleanup, arm-soc/ux500/soc, pmu, master, gpio, dt, cleanup) Linux 3.7-rc1
^ permalink raw reply [flat|nested] 9+ messages in thread