diff mbox

[v4,7/7] ARM: mach-shmobile: r8a7740: Setup the timer CMT10 using DT

Message ID 1365679443-25456-7-git-send-email-hechtb+renesas@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Bastian Hecht April 11, 2013, 11:24 a.m. UTC
We can now use the Device Tree for bringing up our timer device CMT10 on
the SoC r8a7740.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
---
v4: same. only patch 2 and 3 changed

 arch/arm/mach-shmobile/setup-r8a7740.c |   33 --------------------------------
 1 file changed, 33 deletions(-)

Comments

Simon Horman April 12, 2013, 1:23 a.m. UTC | #1
On Thu, Apr 11, 2013 at 01:24:03PM +0200, Bastian Hecht wrote:
> We can now use the Device Tree for bringing up our timer device CMT10 on
> the SoC r8a7740.

Hi Bastian,

unfortunately with this patch the armaillo800eva no longer boots.

I am testing  against renesas-next-20130411v2 with the other
6 patches in this series applied. I am using the armadillo800eva defconfig.
The boot log is below.

I have also tested kzm9g an kzm9g-reference, they seem fine.


hermit> tftpboot 10.3.5.147 10.3.5.146 --kernel=armadillo/zImage
initializing net-device...OK

Client: 10.3.5.147
Server: 10.3.5.146
Region(kernel): armadillo/zImage

Filename : armadillo/zImage
......................................................................................................................................................................................................................................................................................................................................................................................................................................................
Filesize : 2240001

Copying kernel:net.........done.
Doing console=tty0
Doing console=ttySC1,115200
Doing earlyprintk=sh-sci.1,115200
Doing ignore_loglevel
Doing root=/dev/nfs
Doing ip=dhcp
Doing nfsroot=,rsize=4096,wsize=4096
Doing rw
Booting Linux on physical CPU 0x0
Linux version 3.9.0-rc2-00007-g92bd9f5 (horms@ayumi.isobedori.kobe.vergenet.net) (gcc version 4.4.5 (Debian 4.4.5-8) ) #1698 Fri Apr 12 10:21:28 JST 2013
CPU: ARMv7 Processor [412fc093] revision 3 (ARMv7), cr=10c53c7d
CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache
Machine: armadillo800eva, model: armadillo 800 eva
debug: ignoring loglevel setting.
Memory policy: ECC disabled, Data cache writeback
On node 0 totalpages: 131072
free_area_init_node: node 0, pgdat c0459e1c, node_mem_map c067e000
  Normal zone: 1024 pages used for memmap
  Normal zone: 0 pages reserved
  Normal zone: 131072 pages, LIFO batch:31
CPU: All CPU(s) started in SVC mode.
bootconsole [early_ttySC1] enabled
pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768
pcpu-alloc: [0] 0 
Built 1 zonelists in Zone order, mobility grouping on.  Total pages: 130048
Kernel command line: console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw
PID hash table entries: 2048 (order: 1, 8192 bytes)
Dentry cache hash table entries: 65536 (order: 6, 262144 bytes)
Inode-cache hash table entries: 32768 (order: 5, 131072 bytes)
__ex_table already sorted, skipping sort
Memory: 512MB = 512MB total
Memory: 515124k/515124k available, 9164k reserved, 0K highmem
Virtual kernel memory layout:
    vector  : 0xffff0000 - 0xffff1000   (   4 kB)
    fixmap  : 0xfff00000 - 0xfffe0000   ( 896 kB)
    vmalloc : 0xe0800000 - 0xff000000   ( 488 MB)
    lowmem  : 0xc0000000 - 0xe0000000   ( 512 MB)
    modules : 0xbf000000 - 0xc0000000   (  16 MB)
      .text : 0xc0008000 - 0xc040702c   (4093 kB)
      .init : 0xc0408000 - 0xc042b468   ( 142 kB)
      .data : 0xc042c000 - 0xc045a600   ( 186 kB)
       .bss : 0xc045a600 - 0xc0482624   ( 161 kB)
NR_IRQS:16 nr_irqs:16 16
GIC CPU mask not found - kernel will fail to boot.
GIC CPU mask not found - kernel will fail to boot.
sched_clock: 32 bits at 128 Hz, resolution 7812500ns, wraps every 3489660920ms
Console: colour dummy device 80x30
console [tty0] enabled
Calibrating delay loop...
Bastian Hecht April 12, 2013, 12:46 p.m. UTC | #2
Hello Simon,

2013/4/12 Simon Horman <horms@verge.net.au>:
> On Thu, Apr 11, 2013 at 01:24:03PM +0200, Bastian Hecht wrote:
>> We can now use the Device Tree for bringing up our timer device CMT10 on
>> the SoC r8a7740.
>
> Hi Bastian,
>
> unfortunately with this patch the armaillo800eva no longer boots.
>
> I am testing  against renesas-next-20130411v2 with the other
> 6 patches in this series applied. I am using the armadillo800eva defconfig.
> The boot log is below.

Ouch, sorry! I checked the patches and somehow I missed a chunk in
0007-... when I rebased the series to next. The part that actually
adds the DT info to r8a7740.dtsi. Further we need the GIC to be
present in the DT to make things work here (my old patch used the
INTCA as interrupt controller reference, but that has gone in the
meantime).
I want to repost my A1 reference code soon and in there I add the way
to set up the GIC via DT.

To accelerate things maybe we take 0001-0006 now and postpone 0007
until the GIC is in the DT?
I diffed the new patches against the v3 series, and the .dtsi chunk is
the only one that didn't make it, so I strongly believe the series is
fine now.

Thanks,

 Bastian
Simon Horman April 15, 2013, 3:58 a.m. UTC | #3
On Fri, Apr 12, 2013 at 02:46:15PM +0200, Bastian Hecht wrote:
> Hello Simon,
> 
> 2013/4/12 Simon Horman <horms@verge.net.au>:
> > On Thu, Apr 11, 2013 at 01:24:03PM +0200, Bastian Hecht wrote:
> >> We can now use the Device Tree for bringing up our timer device CMT10 on
> >> the SoC r8a7740.
> >
> > Hi Bastian,
> >
> > unfortunately with this patch the armaillo800eva no longer boots.
> >
> > I am testing  against renesas-next-20130411v2 with the other
> > 6 patches in this series applied. I am using the armadillo800eva defconfig.
> > The boot log is below.
> 
> Ouch, sorry! I checked the patches and somehow I missed a chunk in
> 0007-... when I rebased the series to next. The part that actually
> adds the DT info to r8a7740.dtsi. Further we need the GIC to be
> present in the DT to make things work here (my old patch used the
> INTCA as interrupt controller reference, but that has gone in the
> meantime).
> I want to repost my A1 reference code soon and in there I add the way
> to set up the GIC via DT.
> 
> To accelerate things maybe we take 0001-0006 now and postpone 0007
> until the GIC is in the DT?
> I diffed the new patches against the v3 series, and the .dtsi chunk is
> the only one that didn't make it, so I strongly believe the series is
> fine now.

Ok, thanks. I'll see about queuing-up 0001-0006 and you can repost
0007 at a later date.
Simon Horman April 17, 2013, 2:15 a.m. UTC | #4
On Mon, Apr 15, 2013 at 12:58:05PM +0900, Simon Horman wrote:
> On Fri, Apr 12, 2013 at 02:46:15PM +0200, Bastian Hecht wrote:
> > Hello Simon,
> > 
> > 2013/4/12 Simon Horman <horms@verge.net.au>:
> > > On Thu, Apr 11, 2013 at 01:24:03PM +0200, Bastian Hecht wrote:
> > >> We can now use the Device Tree for bringing up our timer device CMT10 on
> > >> the SoC r8a7740.
> > >
> > > Hi Bastian,
> > >
> > > unfortunately with this patch the armaillo800eva no longer boots.
> > >
> > > I am testing  against renesas-next-20130411v2 with the other
> > > 6 patches in this series applied. I am using the armadillo800eva defconfig.
> > > The boot log is below.
> > 
> > Ouch, sorry! I checked the patches and somehow I missed a chunk in
> > 0007-... when I rebased the series to next. The part that actually
> > adds the DT info to r8a7740.dtsi. Further we need the GIC to be
> > present in the DT to make things work here (my old patch used the
> > INTCA as interrupt controller reference, but that has gone in the
> > meantime).
> > I want to repost my A1 reference code soon and in there I add the way
> > to set up the GIC via DT.
> > 
> > To accelerate things maybe we take 0001-0006 now and postpone 0007
> > until the GIC is in the DT?
> > I diffed the new patches against the v3 series, and the .dtsi chunk is
> > the only one that didn't make it, so I strongly believe the series is
> > fine now.
> 
> Ok, thanks. I'll see about queuing-up 0001-0006 and you can repost
> 0007 at a later date.

I have queued-up 0001-0006.
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index c2ac4aa..e88b50d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -363,38 +363,6 @@  static struct platform_device scifb_device = {
 	},
 };
 
-/* CMT */
-static struct sh_timer_config cmt10_platform_data = {
-	.name = "CMT10",
-	.channel_offset = 0x10,
-	.timer_bit = 0,
-	.clockevent_rating = 125,
-	.clocksource_rating = 125,
-};
-
-static struct resource cmt10_resources[] = {
-	[0] = {
-		.name	= "CMT10",
-		.start	= 0xe6138010,
-		.end	= 0xe613801b,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= gic_spi(58),
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device cmt10_device = {
-	.name		= "sh_cmt",
-	.id		= 10,
-	.dev = {
-		.platform_data	= &cmt10_platform_data,
-	},
-	.resource	= cmt10_resources,
-	.num_resources	= ARRAY_SIZE(cmt10_resources),
-};
-
 /* TMU */
 static struct sh_timer_config tmu00_platform_data = {
 	.name = "TMU00",
@@ -531,7 +499,6 @@  static struct platform_device *r8a7740_early_devices[] __initdata = {
 	&scif6_device,
 	&scif7_device,
 	&scifb_device,
-	&cmt10_device,
 	&tmu00_device,
 	&tmu01_device,
 	&tmu02_device,