* Re: [PATCH 2/3] ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva
From: Simon Horman @ 2013-02-13 7:30 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360689333-13525-3-git-send-email-g.liakhovetski@gmx.de>
On Tue, Feb 12, 2013 at 04:53:51PM -0800, Kuninori Morimoto wrote:
>
> Hi Guennadi
>
> > When regulators are used with MMC devices, explicitly provided OCR masks
> > are ignored, they can be removed from platform data. Also switch SDHI0
> > from fixed regulator with hard-wired GPIO levels to a proper GPIO regulator
> > instance to enable dynamic voltage switching.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
>
> I got "checkpatch.pl" warning on this patch.
> I don't care so much about "Avoid CamelCase",
> but please fix "line over 80 characters" and "{" position.
It seems that with this change in place it would also be good
to update the defconfig to enable CONFIG_REGULATOR and possibly
CONFIG_REGULATOR_DUMMY.
Guennadi could you make a separate patch to do this?
^ permalink raw reply
* Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0
From: Guennadi Liakhovetski @ 2013-02-13 7:02 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <Pine.LNX.4.64.1302121633000.7059@axis700.grange>
On Wed, 13 Feb 2013, Guennadi Liakhovetski wrote:
> Hi Simon
>
> On Wed, 13 Feb 2013, Simon Horman wrote:
>
> > [CC Linus and Laurent]
> >
> > On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > > definition on sh73a0.
> > >
> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> >
> > This patch appears to be against code that has been merged into arm-soc
> > for 3.9.
> >
> > In particular the following change in the pfc branch of the renesas tree
> > a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
> >
> > commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > Date: Sat Dec 15 23:51:24 2012 +0100
> >
> > sh-pfc: Add sh73a0 pinmux support
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > Acked-by: Paul Mundt <lethal@linux-sh.org>
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >
> > As such, I would like to handle it separately from the other two patches
> > in this series which are against un-merged code.
> >
> > Before I do so I would like to:
> >
> > * Know about the severity of this problem.
> > Does it break things?
>
> Yes, .dts doesn't compile without the semicolon.
Ok, sorry, obviously, I was thinking about a different patch. Please,
ignore this.
As for breakage - so far I'm personally unaware of any breakage, which is
of course not to say, that none is possible.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply
* Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0
From: Guennadi Liakhovetski @ 2013-02-13 6:59 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <Pine.LNX.4.64.1302121633000.7059@axis700.grange>
Hi Simon
On Wed, 13 Feb 2013, Simon Horman wrote:
> [CC Linus and Laurent]
>
> On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > definition on sh73a0.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
>
> This patch appears to be against code that has been merged into arm-soc
> for 3.9.
>
> In particular the following change in the pfc branch of the renesas tree
> a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
>
> commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Date: Sat Dec 15 23:51:24 2012 +0100
>
> sh-pfc: Add sh73a0 pinmux support
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Acked-by: Paul Mundt <lethal@linux-sh.org>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>
> As such, I would like to handle it separately from the other two patches
> in this series which are against un-merged code.
>
> Before I do so I would like to:
>
> * Know about the severity of this problem.
> Does it break things?
Yes, .dts doesn't compile without the semicolon.
> * Know what the author of the code, Laurent (CCed) thinks about this.
I thinik, you're the author. The semicolon disappears as a result of your
merge, AFAICS both original conflicting patches were ok. However, I might
easily have misinterpreted the merge history.
Thanks
Guennadi
> * Know what the pin control maintainer, Linus (CCed) thinks about this.
>
> Linus, I'm happy to handle this as its code that went through
> my tree. Or I'm happy for you to take it. In the case of the former
> an ack or otherwise would be appreciated.
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply
* Re: [PATCH/RFC v2 7/8] ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference
From: Guennadi Liakhovetski @ 2013-02-13 6:45 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-8-git-send-email-g.liakhovetski@gmx.de>
Hi Simon
On Wed, 13 Feb 2013, Simon Horman wrote:
> On Fri, Feb 08, 2013 at 07:38:31PM +0100, Guennadi Liakhovetski wrote:
> > GPIOs can be provided by the pinctrl subsystem, which can be initialised
> > by DT. Therefore DT has to be parsed before requesting GPIOs. Also non-DT
> > pinmux has to be configured early.
>
> Thanks, applied to the boards-kzm9g-reference branch.
>
> I am intending to merge that branch, which includes
> the basic kzm9g reference code, into v3.10.
Thanks for merging. However, there's already a gotcha with this patch too:
this version is for a stack without sh73a0 DT pinctrl. If that's how
you're going to merge this patch - that is ok. However, if it should go on
top of DT pinctrl, the sh73a0_pinmux_init() call shouldn't be added, which
is also the version, that I've sent to you yesterday. IIUC sh73a0 pinctrl
DT isn't going to be in your tree yes, so, this patch should be ok. Then,
when merging pinctrl DT we'll have to remember to remove that call again.
Thanks
Guennadi
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
> >
> > Also a hack, that should be replaced by a proper pinctrl DT support.
> >
> > arch/arm/mach-shmobile/board-kzm9g-reference.c | 5 +++--
> > 1 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > index 8280d8a..728c810 100644
> > --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > @@ -34,6 +34,9 @@
> >
> > static void __init kzm_init(void)
> > {
> > + sh73a0_add_standard_devices_dt();
> > + sh73a0_pinmux_init();
> > +
> > /* enable SCIFA4 */
> > gpio_request(GPIO_FN_SCIFA4_TXD, NULL);
> > gpio_request(GPIO_FN_SCIFA4_RXD, NULL);
> > @@ -81,8 +84,6 @@ static void __init kzm_init(void)
> > /* Early BRESP enable, Shared attribute override enable, 64K*8way */
> > l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff);
> > #endif
> > -
> > - sh73a0_add_standard_devices_dt();
> > }
> >
> > static void kzm9g_restart(char mode, const char *cmd)
> > --
> > 1.7.2.5
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
>
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply
* Re: [PATCH v2 5/8] ARM: shmobile: add sh73a0-specific timer initialisation to kzm9g-reference
From: Simon Horman @ 2013-02-13 5:37 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-6-git-send-email-g.liakhovetski@gmx.de>
On Wed, Feb 13, 2013 at 02:04:43PM +0900, Magnus Damm wrote:
> Hi Simon,
>
> On Wed, Feb 13, 2013 at 1:41 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Feb 13, 2013 at 01:15:59PM +0900, Magnus Damm wrote:
> >> Hi Simon,
> >>
> >> On Wed, Feb 13, 2013 at 12:46 PM, Simon Horman <horms@verge.net.au> wrote:
> >> > On Fri, Feb 08, 2013 at 07:38:29PM +0100, Guennadi Liakhovetski wrote:
> >> >> This patch fixes failing boot of the kzm9g-reference kernel.
> >> >
> >> > Magnus specifically asked for the DT reference code not to use
> >> > early timers.
> >> >
> >> > As you have no doubt observed the current code doesn't work with SMP.
> >> > I have not been able to find a solution that does work with CONFIG_SMP
> >> > enabled without using early timers. I would welcome some ideas
> >> > on how to resolve this problem without using early timers.
> >>
> >> I have now tracked down and submitted a fix for the KZM9D regression
> >> you pointed me to earlier.
> >>
> >> Next step is to figure out what is wrong with KZM9G in DT-only mode.
> >> Can you guide me to reproduce off-list?
> >
> > I'd prefer to guide you on list so the knowledge is archived.
>
> Ok, thanks, that's fine too of course.
>
> > 1. Obtain the reference code.
> >
> > I suggest the boards-kzm9g-reference branch of the renesas tree.
> >
> > 2. Configure
> >
> > ARCH=arm make kzm9g_defconfig
> >
> > Also, enable CONFIG_MACH_KZM9G_REFERENCE and CONFIG_ARM_APPENDED_DTB
> >
> > N.B: CONFIG_ARM_APPENDED_DTB will be enabled by default in 3.8
> >
> > 3. Compile
> >
> > 4. Append arch/arm/boot/dts/sh73a0-kzm9g-reference.dtb to zImage and
> > refresh uImage
> >
> > 4. Boot, you should see the boot halt at:
> >
> > ...
> > NR_IRQS:16 nr_irqs:16 16
> > sched_clock: 32 bits at 128 Hz, resolution 7812500ns, wraps every 3489660920ms
> > Console: colour dummy device 80x30
> > console [tty0] enabled
> > Calibrating delay loop (skipped) preset value.. 2287.41 BogoMIPS (lpj‰36512)
> > pid_max: default: 32768 minimum: 301
> > Mount-cache hash table entries: 512
> > CPU: Testing write buffer coherency: ok
> > CPU0: thread -1, cpu 0, socket 0, mpidr 80000000
> > Setting up static identity map for 0x4132aaf8 - 0x4132ab50
>
> I assume someone has already tested the obvious things like booting
> with maxcpus=1 and checking if disabling TWD helps.
Yes.
^ permalink raw reply
* Re: [PATCH v2 5/8] ARM: shmobile: add sh73a0-specific timer initialisation to kzm9g-reference
From: Magnus Damm @ 2013-02-13 5:04 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-6-git-send-email-g.liakhovetski@gmx.de>
Hi Simon,
On Wed, Feb 13, 2013 at 1:41 PM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Feb 13, 2013 at 01:15:59PM +0900, Magnus Damm wrote:
>> Hi Simon,
>>
>> On Wed, Feb 13, 2013 at 12:46 PM, Simon Horman <horms@verge.net.au> wrote:
>> > On Fri, Feb 08, 2013 at 07:38:29PM +0100, Guennadi Liakhovetski wrote:
>> >> This patch fixes failing boot of the kzm9g-reference kernel.
>> >
>> > Magnus specifically asked for the DT reference code not to use
>> > early timers.
>> >
>> > As you have no doubt observed the current code doesn't work with SMP.
>> > I have not been able to find a solution that does work with CONFIG_SMP
>> > enabled without using early timers. I would welcome some ideas
>> > on how to resolve this problem without using early timers.
>>
>> I have now tracked down and submitted a fix for the KZM9D regression
>> you pointed me to earlier.
>>
>> Next step is to figure out what is wrong with KZM9G in DT-only mode.
>> Can you guide me to reproduce off-list?
>
> I'd prefer to guide you on list so the knowledge is archived.
Ok, thanks, that's fine too of course.
> 1. Obtain the reference code.
>
> I suggest the boards-kzm9g-reference branch of the renesas tree.
>
> 2. Configure
>
> ARCH=arm make kzm9g_defconfig
>
> Also, enable CONFIG_MACH_KZM9G_REFERENCE and CONFIG_ARM_APPENDED_DTB
>
> N.B: CONFIG_ARM_APPENDED_DTB will be enabled by default in 3.8
>
> 3. Compile
>
> 4. Append arch/arm/boot/dts/sh73a0-kzm9g-reference.dtb to zImage and
> refresh uImage
>
> 4. Boot, you should see the boot halt at:
>
> ...
> NR_IRQS:16 nr_irqs:16 16
> sched_clock: 32 bits at 128 Hz, resolution 7812500ns, wraps every 3489660920ms
> Console: colour dummy device 80x30
> console [tty0] enabled
> Calibrating delay loop (skipped) preset value.. 2287.41 BogoMIPS (lpj‰36512)
> pid_max: default: 32768 minimum: 301
> Mount-cache hash table entries: 512
> CPU: Testing write buffer coherency: ok
> CPU0: thread -1, cpu 0, socket 0, mpidr 80000000
> Setting up static identity map for 0x4132aaf8 - 0x4132ab50
I assume someone has already tested the obvious things like booting
with maxcpus=1 and checking if disabling TWD helps.
Thanks,
/ magnus
^ permalink raw reply
* Re: [PATCH v2 5/8] ARM: shmobile: add sh73a0-specific timer initialisation to kzm9g-reference
From: Simon Horman @ 2013-02-13 4:41 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-6-git-send-email-g.liakhovetski@gmx.de>
On Wed, Feb 13, 2013 at 01:15:59PM +0900, Magnus Damm wrote:
> Hi Simon,
>
> On Wed, Feb 13, 2013 at 12:46 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Fri, Feb 08, 2013 at 07:38:29PM +0100, Guennadi Liakhovetski wrote:
> >> This patch fixes failing boot of the kzm9g-reference kernel.
> >
> > Magnus specifically asked for the DT reference code not to use
> > early timers.
> >
> > As you have no doubt observed the current code doesn't work with SMP.
> > I have not been able to find a solution that does work with CONFIG_SMP
> > enabled without using early timers. I would welcome some ideas
> > on how to resolve this problem without using early timers.
>
> I have now tracked down and submitted a fix for the KZM9D regression
> you pointed me to earlier.
>
> Next step is to figure out what is wrong with KZM9G in DT-only mode.
> Can you guide me to reproduce off-list?
I'd prefer to guide you on list so the knowledge is archived.
1. Obtain the reference code.
I suggest the boards-kzm9g-reference branch of the renesas tree.
2. Configure
ARCH=arm make kzm9g_defconfig
Also, enable CONFIG_MACH_KZM9G_REFERENCE and CONFIG_ARM_APPENDED_DTB
N.B: CONFIG_ARM_APPENDED_DTB will be enabled by default in 3.8
3. Compile
4. Append arch/arm/boot/dts/sh73a0-kzm9g-reference.dtb to zImage and
refresh uImage
4. Boot, you should see the boot halt at:
...
NR_IRQS:16 nr_irqs:16 16
sched_clock: 32 bits at 128 Hz, resolution 7812500ns, wraps every 3489660920ms
Console: colour dummy device 80x30
console [tty0] enabled
Calibrating delay loop (skipped) preset value.. 2287.41 BogoMIPS (lpj‰36512)
pid_max: default: 32768 minimum: 301
Mount-cache hash table entries: 512
CPU: Testing write buffer coherency: ok
CPU0: thread -1, cpu 0, socket 0, mpidr 80000000
Setting up static identity map for 0x4132aaf8 - 0x4132ab50
^ permalink raw reply
* Re: [PATCH/RFC 3/3] ARM: shmobile: switch SDHI and MMCIF interfaces on kzm9g-reference to pinctrl
From: Simon Horman @ 2013-02-13 4:32 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360684204-12888-4-git-send-email-g.liakhovetski@gmx.de>
On Tue, Feb 12, 2013 at 04:50:04PM +0100, Guennadi Liakhovetski wrote:
> The recently added on sh73a0 DT pinctrl support enables us to switch SDHI
> and MMCIF interface pins to pinctrl and to add GPIO bindings for their
> card-detection pins and regulators.
This depends on an earlier patch of yours
"ARM: shmobile: move GIC and I2C devices from sh73a0 common .dtsi to reference"
which I have replied to.
^ permalink raw reply
* Re: [PATCH/RFC 2/3] pinctrl: sh-pfc: add pin groups for all SD/MMC interfaces on sh73a0
From: Simon Horman @ 2013-02-13 4:31 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360684204-12888-3-git-send-email-g.liakhovetski@gmx.de>
On Tue, Feb 12, 2013 at 04:50:03PM +0100, Guennadi Liakhovetski wrote:
> Add pin group definitions for SDHI0, SDHI1, SDHI2 and MMCIF interfaces on
> sh73a0.
Also applied to topic/pinmux-sparse.
^ permalink raw reply
* Re: [PATCH/RFC 1/3] pinctrl: sh-pfc: support sparse GPIO numbers
From: Simon Horman @ 2013-02-13 4:31 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360684204-12888-2-git-send-email-g.liakhovetski@gmx.de>
On Tue, Feb 12, 2013 at 04:50:02PM +0100, Guennadi Liakhovetski wrote:
> Not on all sh-/r-mobile platfotms all pins are numbered contiguously from 0
> to N-1. On all ARM-based platforms datasheets use simple numbers to identify
> them, unlike some SuperH-based SoC, naming pins, using strings, e.g. A31:A0,
> B11:B0, C31:C0, etc. So far the sg-pfc pinctrl driver supported only
> contiguous pin numbering. This patch adds support for sparse pin numbers to
> support sh73a0 and any other similar SoCs.
Applied to a new topic branch, topic/pinmux-sparse.
^ permalink raw reply
* Re: [PATCH v2 5/8] ARM: shmobile: add sh73a0-specific timer initialisation to kzm9g-reference
From: Magnus Damm @ 2013-02-13 4:15 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-6-git-send-email-g.liakhovetski@gmx.de>
Hi Simon,
On Wed, Feb 13, 2013 at 12:46 PM, Simon Horman <horms@verge.net.au> wrote:
> On Fri, Feb 08, 2013 at 07:38:29PM +0100, Guennadi Liakhovetski wrote:
>> This patch fixes failing boot of the kzm9g-reference kernel.
>
> Magnus specifically asked for the DT reference code not to use
> early timers.
>
> As you have no doubt observed the current code doesn't work with SMP.
> I have not been able to find a solution that does work with CONFIG_SMP
> enabled without using early timers. I would welcome some ideas
> on how to resolve this problem without using early timers.
I have now tracked down and submitted a fix for the KZM9D regression
you pointed me to earlier.
Next step is to figure out what is wrong with KZM9G in DT-only mode.
Can you guide me to reproduce off-list?
Thanks,
/ magnus
^ permalink raw reply
* Re: [PATCH/RFC v2 3/8] ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference
From: Simon Horman @ 2013-02-13 4:01 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-4-git-send-email-g.liakhovetski@gmx.de>
On Fri, Feb 08, 2013 at 07:38:27PM +0100, Guennadi Liakhovetski wrote:
> Add SDHI0 and SDHI2 interfaces to kzm9g-reference. With no pinctrl DT
> support we cannot use GPIO card-detection and regulator switching.
> Also update the MMCIF DT node to use all 8 data lines and avoid
> redundant information in DT.
This seems reasonable to me and I have added it to the
boards-kzm9g-reference branch which is targeted at v3.10.
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> NOTE: With no DT pinctrl support this is very limited - no GPIO card
> detection, no dynamically switchable regulators. But after all the
> patching this brings interfaces up.
>
> NOTE 2: I'm not sure the way MMCIF is added to .dtsi and then extended
> here is a very good idea. Not all sh73a0 boards will want MMCIF, actually,
> same holds for I2C. I see some examples, where device DT node templates
> are provided in .dtsi with a 'status="disabled"' property. Then, if a
> board wants to use that template it patches it with 'status="okay".'
> However, what also confuses me, they don't use the '&' "patching" symbol.
> E.g. see "sdi0_per1@80126000" node in snowball.dts and its template in
> dbx5x0.dtsi.
I'm unsure too.
It was my understanding that I2C and MMCIF are part of the SoC and
thus should logically go in the SOC's dtsi file.
Do we actually have any sh73a0 boards that don't use I2C or MMCIF?
If not perhaps its a problem for another day.
> v2:
> 1. renamed regulators to match armadillo800eva
> 2. changed SDHI0/2 Vcc supply to 2.8V to match the original OCR mask from
> board-kzm9g.c. Schematics suggests it's actually 3.3V. No idea which is
> correct.
> 3. added "always-on" and "boot-on" regulator properties
> 4. fixed identical regulator node names
> 5. added a "bus-width" property to MMCIF to avoid running in 1-bit mode
> 6. removed unused CD IRQ on SDHI2
> 7. removed the optional vqmmc-supply on MMCIF - it isn't needed, if
> identical to vmmc-supply
>
> arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 42 ++++++++++++++++++++++--
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 21 ++++++++++++
> 2 files changed, 60 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> index 06f52f9..7fad4b9 100644
> --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> @@ -27,15 +27,51 @@
> reg = <0x41000000 0x1e800000>;
> };
>
> - fixedregulator1v8: fixedregulator@0 {
> + reg_1p8v: regulator@0 {
> compatible = "regulator-fixed";
> regulator-name = "fixed-1.8V";
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> + regulator-always-on;
> + regulator-boot-on;
> + };
> +
> + reg_2p8v: regulator@1 {
> + compatible = "regulator-fixed";
> + regulator-name = "fixed-2.8V";
> + regulator-min-microvolt = <2800000>;
> + regulator-max-microvolt = <2800000>;
> + regulator-always-on;
> + regulator-boot-on;
> + };
> +
> + sdhi0: sdhi@0xee100000 {
> + compatible = "renesas,shmobile-sdhi";
> + reg = <0xee100000 0x100>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 83 4
> + 0 84 4
> + 0 85 4>;
> + vmmc-supply = <®_2p8v>;
> + bus-width = <4>;
> + toshiba,mmc-has-idle-wait;
> + };
> +
> + sdhi2: sdhi@0xee140000 {
> + compatible = "renesas,shmobile-sdhi";
> + reg = <0xee140000 0x100>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 104 4
> + 0 105 4>;
> + vmmc-supply = <®_2p8v>;
> + bus-width = <4>;
> + broken-cd;
> + toshiba,mmc-wrprotect-disable;
> + toshiba,mmc-has-idle-wait;
> };
> };
>
> &mmcif {
> - vmmc-supply = <&fixedregulator1v8>;
> - vqmmc-supply = <&fixedregulator1v8>;
> + bus-width = <8>;
> + vmmc-supply = <®_1p8v>;
> };
> diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> index 6a1222e..534eee6 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> @@ -52,6 +52,27 @@ static void __init kzm_init(void)
> gpio_request(GPIO_FN_MMCD0_6_PU, NULL);
> gpio_request(GPIO_FN_MMCD0_7_PU, NULL);
>
> + /* enable SD */
> + gpio_request(GPIO_FN_SDHIWP0, NULL);
> + gpio_request(GPIO_FN_SDHICD0, NULL);
> + gpio_request(GPIO_FN_SDHICMD0, NULL);
> + gpio_request(GPIO_FN_SDHICLK0, NULL);
> + gpio_request(GPIO_FN_SDHID0_3, NULL);
> + gpio_request(GPIO_FN_SDHID0_2, NULL);
> + gpio_request(GPIO_FN_SDHID0_1, NULL);
> + gpio_request(GPIO_FN_SDHID0_0, NULL);
> + gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON, NULL);
> + gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> +
> + /* enable Micro SD */
> + gpio_request(GPIO_FN_SDHID2_0, NULL);
> + gpio_request(GPIO_FN_SDHID2_1, NULL);
> + gpio_request(GPIO_FN_SDHID2_2, NULL);
> + gpio_request(GPIO_FN_SDHID2_3, NULL);
> + gpio_request(GPIO_FN_SDHICMD2, NULL);
> + gpio_request(GPIO_FN_SDHICLK2, NULL);
> + gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> +
> /* I2C 3 */
> gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL);
> gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL);
> --
> 1.7.2.5
>
^ permalink raw reply
* Re: [PATCH/RFC v2 6/8] ARM: shmobile: add INTC interrupt controllers on sh73a0 in the DT case
From: Simon Horman @ 2013-02-13 3:57 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-7-git-send-email-g.liakhovetski@gmx.de>
On Wed, Feb 13, 2013 at 12:41:51PM +0900, Simon Horman wrote:
> On Fri, Feb 08, 2013 at 07:38:30PM +0100, Guennadi Liakhovetski wrote:
> > Temporary solution to enable INTC controllers on sh73a0 with DT.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
> >
> > Ths should probably be considered a hack / debug patch - until we get
> > proper INTC support in DT on sh73a0. But it was useful for me to get
> > ethernet running on kzm9g-reference.
>
> I will create a topic/kzm9g-reference-rfc branch for this and
> other patches that don't seem ready for kzm9g-reference-rfc.
Actually, on second thoughts, I think I would rather leave this
patch as a hack that lives on the mailing list.
> > arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 +-
> > arch/arm/mach-shmobile/include/mach/common.h | 1 +
> > arch/arm/mach-shmobile/intc-sh73a0.c | 24 ++++++++++++++++++------
> > 3 files changed, 20 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > index 9f5cab757..8280d8a 100644
> > --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > @@ -109,7 +109,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
> > .map_io = sh73a0_map_io,
> > .init_early = sh73a0_add_early_devices_dt,
> > .nr_irqs = NR_IRQS_LEGACY,
> > - .init_irq = sh73a0_init_irq_dt,
> > + .init_irq = sh73a0_init_irq_intc_dt,
> > .init_machine = kzm_init,
> > .init_late = shmobile_init_late,
> > .init_time = sh73a0_earlytimer_init,
> > diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
> > index 16dab18..3bd8873 100644
> > --- a/arch/arm/mach-shmobile/include/mach/common.h
> > +++ b/arch/arm/mach-shmobile/include/mach/common.h
> > @@ -36,6 +36,7 @@ extern struct clk sh7372_extal2_clk;
> >
> > extern void sh73a0_init_irq(void);
> > extern void sh73a0_init_irq_dt(void);
> > +void __init sh73a0_init_irq_intc_dt(void);
> > extern void sh73a0_map_io(void);
> > extern void sh73a0_earlytimer_init(void);
> > extern void sh73a0_add_early_devices(void);
> > diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
> > index 91faba6..209c597 100644
> > --- a/arch/arm/mach-shmobile/intc-sh73a0.c
> > +++ b/arch/arm/mach-shmobile/intc-sh73a0.c
> > @@ -417,16 +417,11 @@ static irqreturn_t sh73a0_pint1_demux(int irq, void *dev_id)
> > return IRQ_HANDLED;
> > }
> >
> > -void __init sh73a0_init_irq(void)
> > +static void __init __sh73a0_init_irq(void)
> > {
> > - void __iomem *gic_dist_base = IOMEM(0xf0001000);
> > - void __iomem *gic_cpu_base = IOMEM(0xf0000100);
> > void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);
> > int k, n;
> >
> > - gic_init(0, 29, gic_dist_base, gic_cpu_base);
> > - gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> > -
> > register_intc_controller(&intcs_desc);
> > register_intc_controller(&intca_irq_pins_desc);
> > register_intc_controller(&intc_pint0_desc);
> > @@ -461,10 +456,27 @@ void __init sh73a0_init_irq(void)
> > setup_irq(gic_spi(34), &sh73a0_pint1_cascade);
> > }
> >
> > +void __init sh73a0_init_irq(void)
> > +{
> > + void __iomem *gic_dist_base = IOMEM(0xf0001000);
> > + void __iomem *gic_cpu_base = IOMEM(0xf0000100);
> > +
> > + gic_init(0, 29, gic_dist_base, gic_cpu_base);
> > + gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> > +
> > + __sh73a0_init_irq();
> > +}
> > +
> > #ifdef CONFIG_OF
> > void __init sh73a0_init_irq_dt(void)
> > {
> > irqchip_init();
> > gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> > }
> > +
> > +void __init sh73a0_init_irq_intc_dt(void)
> > +{
> > + sh73a0_init_irq_dt();
> > + __sh73a0_init_irq();
> > +}
> > #endif
> > --
> > 1.7.2.5
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH v2 5/8] ARM: shmobile: add sh73a0-specific timer initialisation to kzm9g-reference
From: Simon Horman @ 2013-02-13 3:46 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-6-git-send-email-g.liakhovetski@gmx.de>
On Fri, Feb 08, 2013 at 07:38:29PM +0100, Guennadi Liakhovetski wrote:
> This patch fixes failing boot of the kzm9g-reference kernel.
Magnus specifically asked for the DT reference code not to use
early timers.
As you have no doubt observed the current code doesn't work with SMP.
I have not been able to find a solution that does work with CONFIG_SMP
enabled without using early timers. I would welcome some ideas
on how to resolve this problem without using early timers.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> Also a fix.
>
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> index 534eee6..9f5cab757 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> @@ -112,7 +112,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
> .init_irq = sh73a0_init_irq_dt,
> .init_machine = kzm_init,
> .init_late = shmobile_init_late,
> - .init_time = shmobile_timer_init,
> + .init_time = sh73a0_earlytimer_init,
> .restart = kzm9g_restart,
> .dt_compat = kzm9g_boards_compat_dt,
> MACHINE_END
> --
> 1.7.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH/RFC v2 6/8] ARM: shmobile: add INTC interrupt controllers on sh73a0 in the DT case
From: Simon Horman @ 2013-02-13 3:41 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-7-git-send-email-g.liakhovetski@gmx.de>
On Fri, Feb 08, 2013 at 07:38:30PM +0100, Guennadi Liakhovetski wrote:
> Temporary solution to enable INTC controllers on sh73a0 with DT.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> Ths should probably be considered a hack / debug patch - until we get
> proper INTC support in DT on sh73a0. But it was useful for me to get
> ethernet running on kzm9g-reference.
I will create a topic/kzm9g-reference-rfc branch for this and
other patches that don't seem ready for kzm9g-reference-rfc.
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 +-
> arch/arm/mach-shmobile/include/mach/common.h | 1 +
> arch/arm/mach-shmobile/intc-sh73a0.c | 24 ++++++++++++++++++------
> 3 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> index 9f5cab757..8280d8a 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> @@ -109,7 +109,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
> .map_io = sh73a0_map_io,
> .init_early = sh73a0_add_early_devices_dt,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = sh73a0_init_irq_dt,
> + .init_irq = sh73a0_init_irq_intc_dt,
> .init_machine = kzm_init,
> .init_late = shmobile_init_late,
> .init_time = sh73a0_earlytimer_init,
> diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
> index 16dab18..3bd8873 100644
> --- a/arch/arm/mach-shmobile/include/mach/common.h
> +++ b/arch/arm/mach-shmobile/include/mach/common.h
> @@ -36,6 +36,7 @@ extern struct clk sh7372_extal2_clk;
>
> extern void sh73a0_init_irq(void);
> extern void sh73a0_init_irq_dt(void);
> +void __init sh73a0_init_irq_intc_dt(void);
> extern void sh73a0_map_io(void);
> extern void sh73a0_earlytimer_init(void);
> extern void sh73a0_add_early_devices(void);
> diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
> index 91faba6..209c597 100644
> --- a/arch/arm/mach-shmobile/intc-sh73a0.c
> +++ b/arch/arm/mach-shmobile/intc-sh73a0.c
> @@ -417,16 +417,11 @@ static irqreturn_t sh73a0_pint1_demux(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> -void __init sh73a0_init_irq(void)
> +static void __init __sh73a0_init_irq(void)
> {
> - void __iomem *gic_dist_base = IOMEM(0xf0001000);
> - void __iomem *gic_cpu_base = IOMEM(0xf0000100);
> void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);
> int k, n;
>
> - gic_init(0, 29, gic_dist_base, gic_cpu_base);
> - gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> -
> register_intc_controller(&intcs_desc);
> register_intc_controller(&intca_irq_pins_desc);
> register_intc_controller(&intc_pint0_desc);
> @@ -461,10 +456,27 @@ void __init sh73a0_init_irq(void)
> setup_irq(gic_spi(34), &sh73a0_pint1_cascade);
> }
>
> +void __init sh73a0_init_irq(void)
> +{
> + void __iomem *gic_dist_base = IOMEM(0xf0001000);
> + void __iomem *gic_cpu_base = IOMEM(0xf0000100);
> +
> + gic_init(0, 29, gic_dist_base, gic_cpu_base);
> + gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> +
> + __sh73a0_init_irq();
> +}
> +
> #ifdef CONFIG_OF
> void __init sh73a0_init_irq_dt(void)
> {
> irqchip_init();
> gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> }
> +
> +void __init sh73a0_init_irq_intc_dt(void)
> +{
> + sh73a0_init_irq_dt();
> + __sh73a0_init_irq();
> +}
> #endif
> --
> 1.7.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH v2 4/8] ARM: shmobile: move GIC and I2C devices from sh73a0 common .dtsi to reference
From: Simon Horman @ 2013-02-13 3:39 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-5-git-send-email-g.liakhovetski@gmx.de>
On Fri, Feb 08, 2013 at 07:38:28PM +0100, Guennadi Liakhovetski wrote:
> In "legacy" mode, when all devices are initialised by the board .c file,
> there is no need to install the GIC and all I2C devices from the device
> tree too. Move them to the reference implementation, that fully relies upon
> DT.
The motivation for placing the code in sh73a0.dtsi was so that
it would be available to the non-reference board code if/when it
moves over to using DT.
I'm happy to switch things around if its preferred to keep
the dts small.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> I think, this is a fix and should be applied.
>
> arch/arm/boot/dts/sh73a0-reference.dtsi | 69 +++++++++++++++++++++++++++++++
> arch/arm/boot/dts/sh73a0.dtsi | 69 -------------------------------
> 2 files changed, 69 insertions(+), 69 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sh73a0-reference.dtsi b/arch/arm/boot/dts/sh73a0-reference.dtsi
> index d4bb012..457afc7 100644
> --- a/arch/arm/boot/dts/sh73a0-reference.dtsi
> +++ b/arch/arm/boot/dts/sh73a0-reference.dtsi
> @@ -21,4 +21,73 @@
> 0 141 0x4>;
> reg-io-width = <4>;
> };
> +
> + gic: interrupt-controller@f0001000 {
> + compatible = "arm,cortex-a9-gic";
> + #interrupt-cells = <3>;
> + #address-cells = <1>;
> + interrupt-controller;
> + reg = <0xf0001000 0x1000>,
> + <0xf0000100 0x100>;
> + };
> +
> + i2c0: i2c@0xe6820000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "renesas,rmobile-iic";
> + reg = <0xe6820000 0x425>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 167 0x4
> + 0 168 0x4
> + 0 169 0x4
> + 0 170 0x4>;
> + };
> +
> + i2c1: i2c@0xe6822000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "renesas,rmobile-iic";
> + reg = <0xe6822000 0x425>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 51 0x4
> + 0 52 0x4
> + 0 53 0x4
> + 0 54 0x4>;
> + };
> +
> + i2c2: i2c@0xe6824000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "renesas,rmobile-iic";
> + reg = <0xe6824000 0x425>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 171 0x4
> + 0 172 0x4
> + 0 173 0x4
> + 0 174 0x4>;
> + };
> +
> + i2c3: i2c@0xe6826000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "renesas,rmobile-iic";
> + reg = <0xe6826000 0x425>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 183 0x4
> + 0 184 0x4
> + 0 185 0x4
> + 0 186 0x4>;
> + };
> +
> + i2c4: i2c@0xe6828000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "renesas,rmobile-iic";
> + reg = <0xe6828000 0x425>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 187 0x4
> + 0 188 0x4
> + 0 189 0x4
> + 0 190 0x4>;
> + };
> };
> diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
> index 8a59465..6837b3f 100644
> --- a/arch/arm/boot/dts/sh73a0.dtsi
> +++ b/arch/arm/boot/dts/sh73a0.dtsi
> @@ -28,73 +28,4 @@
> reg = <1>;
> };
> };
> -
> - gic: interrupt-controller@f0001000 {
> - compatible = "arm,cortex-a9-gic";
> - #interrupt-cells = <3>;
> - #address-cells = <1>;
> - interrupt-controller;
> - reg = <0xf0001000 0x1000>,
> - <0xf0000100 0x100>;
> - };
> -
> - i2c0: i2c@0xe6820000 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "renesas,rmobile-iic";
> - reg = <0xe6820000 0x425>;
> - interrupt-parent = <&gic>;
> - interrupts = <0 167 0x4
> - 0 168 0x4
> - 0 169 0x4
> - 0 170 0x4>;
> - };
> -
> - i2c1: i2c@0xe6822000 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "renesas,rmobile-iic";
> - reg = <0xe6822000 0x425>;
> - interrupt-parent = <&gic>;
> - interrupts = <0 51 0x4
> - 0 52 0x4
> - 0 53 0x4
> - 0 54 0x4>;
> - };
> -
> - i2c2: i2c@0xe6824000 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "renesas,rmobile-iic";
> - reg = <0xe6824000 0x425>;
> - interrupt-parent = <&gic>;
> - interrupts = <0 171 0x4
> - 0 172 0x4
> - 0 173 0x4
> - 0 174 0x4>;
> - };
> -
> - i2c3: i2c@0xe6826000 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "renesas,rmobile-iic";
> - reg = <0xe6826000 0x425>;
> - interrupt-parent = <&gic>;
> - interrupts = <0 183 0x4
> - 0 184 0x4
> - 0 185 0x4
> - 0 186 0x4>;
> - };
> -
> - i2c4: i2c@0xe6828000 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "renesas,rmobile-iic";
> - reg = <0xe6828000 0x425>;
> - interrupt-parent = <&gic>;
> - interrupts = <0 187 0x4
> - 0 188 0x4
> - 0 189 0x4
> - 0 190 0x4>;
> - };
> };
> --
> 1.7.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH v2 2/8] ARM: shmobile: add SDHI and MMCIF interfaces to armadillo800eva-reference
From: Simon Horman @ 2013-02-13 3:36 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-3-git-send-email-g.liakhovetski@gmx.de>
On Fri, Feb 08, 2013 at 07:38:26PM +0100, Guennadi Liakhovetski wrote:
> Add SDHI0, SDHI1 and MMCIF interfaces to armadillo800eva-reference. With
> no pinctrl DT support we cannot use GPIO card-detection and regulator
> switching.
Thanks. I have added this to the topic/intc-of branch.
^ permalink raw reply
* Re: [PATCH v2 1/8] ARM: shmobile: add MMCIF and SDHI DT clock aliases to sh73a0 and r8a7740
From: Simon Horman @ 2013-02-13 3:33 UTC (permalink / raw)
To: linux-sh
In-Reply-To: <1360348712-29255-2-git-send-email-g.liakhovetski@gmx.de>
On Fri, Feb 08, 2013 at 07:38:25PM +0100, Guennadi Liakhovetski wrote:
> Add clock lookup entries for SDHI and MMCIF device names, for the FDT case.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Thanks, applied to the soc5 branch which is targeted at v3.10.
^ permalink raw reply
* [PATCH 9/9] ARM: shmobile: kzm9g: Move pinctrl mappings to device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Replace the pinctrl mappings in board code by device tree mappings.
Reference the mapping as the default pin controller state to apply it at
boot time.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 10 ++++++++++
arch/arm/mach-shmobile/board-kzm9g.c | 24 ------------------------
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 203efb8..ba321c2 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -36,3 +36,13 @@
};
};
};
+
+&gpio {
+ pinctrl-0 = <&lcd_pins>;
+ pinctrl-names = "default";
+
+ lcd_pins: pfc_lcd_pins {
+ renesas,pins = "lcd_data24", "lcd_sync";
+ renesas,function = "lcd";
+ };
+};
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index b89a9a8..949ef36 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -31,7 +31,6 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
#include <linux/of_platform.h>
-#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>
@@ -601,27 +600,6 @@ static struct platform_device *kzm_devices[] __initdata = {
&fsi_ak4648_device,
};
-static const struct pinctrl_map kzm_pinctrl_map[] = {
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
- "fsia_mclk_in", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
- "fsia_sclk_in", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
- "fsia_data_in", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
- "fsia_data_out", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "e6050000.pfc",
- "i2c3_1", "i2c3"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
- "scifa4_data", "scifa4"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
- "scifa4_ctrl", "scifa4"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
- "lcd_data24", "lcd"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
- "lcd_sync", "lcd"),
-};
-
/*
* FIXME
*
@@ -683,8 +661,6 @@ static void __init kzm_init(void)
ARRAY_SIZE(fixed2v8_power_consumers), 2800000);
regulator_register_fixed(2, dummy_supplies, ARRAY_SIZE(dummy_supplies));
- pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map));
-
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
/* CS4 for SMSC/USB */
--
1.7.10.4
^ permalink raw reply related
* [PATCH 8/9] ARM: shmobile: armadillo: Move pinctrl mappings to device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Replace the pinctrl mappings in board code by device tree mappings.
Reference the mapping as the default pin controller state to apply it at
boot time.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 10 ++++++++++
arch/arm/mach-shmobile/board-armadillo800eva.c | 12 ------------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index a8e7bd9..f324405 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -20,3 +20,13 @@
reg = <0x40000000 0x20000000>;
};
};
+
+&gpio {
+ pinctrl-0 = <&lcd0_pins>;
+ pinctrl-names = "default";
+
+ lcd0_pins: pfc_lcd0_pins {
+ renesas,pins = "lcd0_data24_0", "lcd0_lclk_0", "lcd0_sync";
+ renesas,function = "lcd0";
+ };
+};
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index a10e644..e5dfaeb 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -29,7 +29,6 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
-#include <linux/pinctrl/machine.h>
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>
#include <linux/sh_eth.h>
@@ -916,15 +915,6 @@ static struct platform_device *eva_devices[] __initdata = {
&i2c_gpio_device,
};
-static const struct pinctrl_map eva_pinctrl_map[] = {
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
- "lcd0_data24_0", "lcd0"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
- "lcd0_lclk_1", "lcd0"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
- "lcd0_sync", "lcd0"),
-};
-
static void __init eva_clock_init(void)
{
struct clk *system = clk_get(NULL, "system_clk");
@@ -972,8 +962,6 @@ static void __init eva_init(void)
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
- pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
-
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
r8a7740_meram_workaround();
--
1.7.10.4
^ permalink raw reply related
* [PATCH 7/9] ARM: shmobile: kzm9g: Add LED1-LED4 to the device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
LED1 to LED4 are GPIO LEDs. Add corresponding DT nodes.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g.dts | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 7b37901..203efb8 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -19,4 +19,20 @@
device_type = "memory";
reg = <0x41000000 0x1e800000>;
};
+
+ leds {
+ compatible = "gpio-leds";
+ led1 {
+ gpios = <&gpio 20 1>; /* Active low */
+ };
+ led2 {
+ gpios = <&gpio 21 1>; /* Active low */
+ };
+ led3 {
+ gpios = <&gpio 22 1>; /* Active low */
+ };
+ led4 {
+ gpios = <&gpio 23 1>; /* Active low */
+ };
+ };
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 6/9] ARM: shmobile: kzm9g: reference: Populate platform devices from device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
Call of_platform_populate() at machine initialization time to populate
platform devices. Remove the explicit pinmux initialization as the PFC
device will be instantiated from the device tree.
This change is for the kzm9g reference DT implementation and is in keeping
with a similar change for the default kzm9g implementation made by Laurent
Pinchart.
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 12 ++++++++++++
arch/arm/mach-shmobile/board-kzm9g-reference.c | 7 ++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 06f52f9..9901caf 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -35,6 +35,18 @@
};
};
+&i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3_pins>;
+};
+
+&gpio {
+ i2c3_pins: pfc_i2c3_pins {
+ renesas,pins = "i2c3_1";
+ renesas,function = "i2c3";
+ };
+};
+
&mmcif {
vmmc-supply = <&fixedregulator1v8>;
vqmmc-supply = <&fixedregulator1v8>;
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index 7282048..625e337 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -34,11 +34,9 @@
#include <asm/mach/arch.h>
static const struct pinctrl_map kzm_pinctrl_map[] = {
- PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
- "i2c3_1", "i2c3"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
"scifa4_data", "scifa4"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
"scifa4_ctrl", "scifa4"),
};
@@ -46,7 +44,6 @@ static void __init kzm_init(void)
{
sh73a0_add_standard_devices_dt();
pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map));
- sh73a0_pinmux_init();
/* enable MMCIF */
gpio_request(GPIO_FN_MMCCLK0, NULL);
--
1.7.10.4
^ permalink raw reply related
* [PATCH 5/9] ARM: shmobile: kzm9g: Populate platform devices from device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Call of_platform_populate() at machine initialization time to populate
platform devices. Remove the explicit pinmux initialization as the PFC
device will be instantiated from the device tree.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-kzm9g.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 2b529d2..b89a9a8 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -30,6 +30,7 @@
#include <linux/mmc/sh_mmcif.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
+#include <linux/of_platform.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/regulator/fixed.h>
@@ -601,23 +602,23 @@ static struct platform_device *kzm_devices[] __initdata = {
};
static const struct pinctrl_map kzm_pinctrl_map[] = {
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
"fsia_mclk_in", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
"fsia_sclk_in", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
"fsia_data_in", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "e6050000.pfc",
"fsia_data_out", "fsia"),
- PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "e6050000.pfc",
"i2c3_1", "i2c3"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
"scifa4_data", "scifa4"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
"scifa4_ctrl", "scifa4"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
"lcd_data24", "lcd"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
"lcd_sync", "lcd"),
};
@@ -684,7 +685,7 @@ static void __init kzm_init(void)
pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map));
- sh73a0_pinmux_init();
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
/* CS4 for SMSC/USB */
gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */
--
1.7.10.4
^ permalink raw reply related
* [PATCH 4/9] ARM: shmobile: sh73a0: Add pin control device in device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Add a pfc node in the sh73a0 device tree.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: resolved conflict in sh73a0.dtsi]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 721f486..fc7f0fd 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -22,6 +22,14 @@
};
};
+ gpio: pfc@e6050000 {
+ compatible = "renesas,pfc-sh73a0";
+ reg = <0xe6050000 0x8000>,
+ <0xe605801c 0x1c>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
gic: interrupt-controller@f0001000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
--
1.7.10.4
^ permalink raw reply related
* [PATCH 3/9] ARM: shmobile: armadillo: Populate platform devices from device tree
From: Simon Horman @ 2013-02-13 3:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Call of_platform_populate() at machine initialization time to populate
platform devices. Remove the explicit pinmux initialization as the PFC
device will be instantiated from the device tree.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 5086795..a10e644 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -25,6 +25,7 @@
#include <linux/kernel.h>
#include <linux/input.h>
#include <linux/irq.h>
+#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
@@ -916,11 +917,11 @@ static struct platform_device *eva_devices[] __initdata = {
};
static const struct pinctrl_map eva_pinctrl_map[] = {
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
"lcd0_data24_0", "lcd0"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
"lcd0_lclk_1", "lcd0"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "e6050000.pfc",
"lcd0_sync", "lcd0"),
};
@@ -973,7 +974,8 @@ static void __init eva_init(void)
pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
- r8a7740_pinmux_init();
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
r8a7740_meram_workaround();
/* SCIFA1 */
--
1.7.10.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox