Re: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport

newer
[U-Boot-Users] [PATCH] (Resubmit)...

older
[U-Boot-Users] Chinese PE rattan...

Gururaja Hebbar K R

21 Jul 2008 21 Jul '08

10:04 a.m.

Hi,

...

...
...
Are you going to add a board which will use it? Right now i am using it on arm Versatile board. Should i send a

patch

...

...
...
to that also

...

...
...
If you do I can test it

...

...
...
Regards Peter

Please find attached my changes to arm versatile config & board file to enable rtc module This is for test only. If you find it acceptable then i will send a final patch.

Comments are welcome.

TIA

Regards Gururaja

Attachments:

update_versatile_config_to_include_pl031_rtc_module.patch (application/octet-stream — 703 bytes)
add_pl031_rtc_init_func.patch (application/octet-stream — 886 bytes)

Show replies by date

Jean-Christophe PLAGNIOL-VILLARD

21 Jul 21 Jul

10:19 p.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport

On 13:34 Mon 21 Jul , Gururaja Hebbar K R wrote:

...

Hi,

...
...
...
Are you going to add a board which will use it? Right now i am using it on arm Versatile board. Should i send a

patch

...
...
...
to that also

...
...
...
If you do I can test it

...
...
...
Regards Peter

Could you please send your patch as inline, otherwise it's really difficult to comment use git-send-email as example

and also please read this http://www.denx.de/wiki/UBoot/Patches and http://lwn.net/Articles/139918/

Best Regads, J.

Gururaja Hebbar K R

22 Jul 22 Jul

3:54 a.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

Hi j,

...

...
Could you please send your patch as inline, otherwise it's really

difficult to comment use git-send-email as example

...

...
and also please read this http://www.denx.de/wiki/UBoot/Patches and http://lwn.net/Articles/139918/

Sorry for the whitespace mistakes. i have now corrected it.

But regarding sending patch inline i am finding it very difficult. I am using MS Off Outlook to send patches to uboot and other mailing lists. I also pasted the same code that i copied from patch files to the mail. Since i think it wraps and creates other issues, i am attaching the patch that i generated using " diff -purN ".

Since our proxy server has some issue, i am not to clone from uboot git server. So here is the thing.

I have downloaded uboot-1.3.3.tar.bz2 and extracted to local system. I have copied to the same to a diff directory on which i work.

so,

u-boot-1.3.3/ ---> original unmodified source uboot/ ---> modified source

I take a diff of these two folders and send it as patch. Now from past few days i am trying to use git to create and send patch to mailing list.

Here is what i do,

1. 1st i tried diff -purN u-boot-1.3.3/drivers/rtc uboot/drivers/rtc/ > new_pl031_rtc_drvr.patch to create a well known patch creation command

2. then i tried git-diff -p --summary --stat u-boot-1.3.3/drivers/rtc/ uboot/drivers/rtc > new_pl031_rtc_drvr_v2.patch to create another patch.

Both didnt have match difference except the 2nd give me few more info. I sent 2 mail to uboot mailing list, each time picking patch from each step and also pasting from the patch file

3. Now i tried git-format-patch

$ git-format-patch.exe u-boot-1.3.3/drivers/rtc/ uboot/drivers/rtc/ fatal: Not a git repository

So kindly know how to solve this.

Regards Gururaja

Hebbar

7:21 a.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

Hi,

I think nabble wont truncate or line wrap my mail. So i am giving it a try.

I have added changes required for versatile board to call rtc_init & defines in include/configs/versatile.h to include pl031 rtc definitions

Kindly comment

TIA

Regards Gururaja

- Add ARM AMBA PL031 RTC Support - Call rtc_init function to start pl031 rtc if enabled from versatile.c - Define rtc base address and date command support in versatile.h

Signed-off-by: Gururaja gururajakr@sanyo.co.in

diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile old mode 100644 new mode 100755 index 2e0c118..f888a31 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -56,6 +56,7 @@ COBJS-y += rs5c372.o COBJS-y += rx8025.o COBJS-y += s3c24x0_rtc.o COBJS-y += x1205.o +COBJS-y += rtc_pl031.o

COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/rtc/rtc_pl031.c b/drivers/rtc/rtc_pl031.c new file mode 100755 index 0000000..7136fed --- /dev/null +++ b/drivers/rtc/rtc_pl031.c @@ -0,0 +1,121 @@ +/* + * (C) Copyright 2008 + * Gururaja Hebbar gururajakr@sanyo.co.in + * + * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <command.h> +#include <rtc.h> + +#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) + +#ifndef CFG_RTC_PL031_BASE +#error CFG_RTC_PL031_BASE is not defined! +#endif + +/* + * Register definitions + */ +#define RTC_DR 0x00 /* Data read register */ +#define RTC_MR 0x04 /* Match register */ +#define RTC_LR 0x08 /* Data load register */ +#define RTC_CR 0x0c /* Control register */ +#define RTC_IMSC 0x10 /* Interrupt mask and set register */ +#define RTC_RIS 0x14 /* Raw interrupt status register */ +#define RTC_MIS 0x18 /* Masked interrupt status register */ +#define RTC_ICR 0x1c /* Interrupt clear register */ + +#define RTC_CR_START (1 << 0) + +#define RTC_WRITE_REG(addr, val) (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr)) = (val)) +#define RTC_READ_REG(addr) (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr))) + +static int pl031_initted = 0; + +/* Enable RTC Start in Control register*/ +void rtc_init(void) +{ + RTC_WRITE_REG(RTC_CR,RTC_CR_START); + + pl031_initted = 1; +} + +/* + * Reset the RTC. We set the date back to 1970-01-01. + */ +void rtc_reset(void) +{ + RTC_WRITE_REG(RTC_LR,0x00); + if(!pl031_initted) + rtc_init(); +} + +/* + * Set the RTC +*/ +void rtc_set(struct rtc_time *tmp) +{ + unsigned long tim; + + if(!pl031_initted) + rtc_init(); + + if (tmp == NULL) { + puts("Error setting the date/time\n"); + return; + } + + /* Calculate number of seconds this incoming time represents */ + tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + RTC_WRITE_REG(RTC_LR,tim); +} + +/* + * Get the current time from the RTC + */ +int rtc_get(struct rtc_time *tmp) +{ + ulong tim; + + if(!pl031_initted) + rtc_init(); + + if (tmp == NULL) { + puts("Error getting the date/time\n"); + return -1; + } + + tim = RTC_READ_REG(RTC_DR); + + to_tm (tim, tmp); + + debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return 0; +} + +#endif

-- 1.5.5.1 diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c index 9d1a25e..5bf7e85 100644 --- a/board/versatile/versatile.c +++ b/board/versatile/versatile.c @@ -41,6 +41,10 @@ void flash__init (void); void ether__init (void); void peripheral_power_enable (void); +#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) +extern int rtc_init(void); +#endif + #if defined(CONFIG_SHOW_BOOT_PROGRESS) void show_boot_progress(int progress) { @@ -84,6 +88,11 @@ int board_init (void) flash__init (); ether__init (); + +#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) + rtc_init(); +#endif + return 0; } diff --git a/include/configs/versatile.h b/include/configs/versatile.h index d250150..b93321d 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -96,6 +96,12 @@ #define CFG_SERIAL0 0x101F1000 #define CFG_SERIAL1 0x101F2000 +/* + * RTC configuration + */ +#define CONFIG_RTC_PL031 1 /* use ARM AMBA PL031 RTC */ +#define CFG_RTC_PL031_BASE 0x101e8000 + /* * Command line configuration. @@ -110,6 +116,7 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_ENV +#define CONFIG_CMD_DATE /* * BOOTP options -- 1.5.5.1 Regards Gururaja -- View this message in context: http://www.nabble.com/-PATCH--%28Resubmit%29-ADD-ARM-AMBA-PL031-RTC-Support-... Sent from the Uboot - Users mailing list archive at Nabble.com.

Wolfgang Denk

8:21 a.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

In message 18582594.post@talk.nabble.com you wrote:

...

I think nabble wont truncate or line wrap my mail. So i am giving it a try.

Don't think - test before sending to public mailing lists.

...

+#define RTC_WRITE_REG(addr, val) (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr)) = (val))

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Line wrapped. Unusable.

Best regards,

Wolfgang Denk

-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de It is common sense to take a method and try it. If it fails, admit it frankly and try another. But above all, try something. - Franklin D. Roosevelt

Hebbar

8:53 a.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

Hi,

Sorry for that.

Now i have generated the patch using below command. Update me if this is not correct $ git format-patch -p -o ../ -C -M -N --summary --stat=80 --no-color --signoff master workingbranch

TIA

Regards Gururaja

- Add ARM AMBA PL031 RTC Support - Call rtc_init function to start pl031 rtc if enabled from versatile.c - Define rtc base address and date command support in versatile.h - Coding Style Changes/Updates

Signed-off-by: Gururaja Hebbar gururajakr@sanyo.co.in --- drivers/rtc/Makefile | 1 + drivers/rtc/rtc_pl031.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ board/versatile/versatile.c | 9 +++++++++ include/configs/versatile.h | 7 +++++++

diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 2e0c118..f888a31 100755 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -56,6 +56,7 @@ COBJS-y += rs5c372.o COBJS-y += rx8025.o COBJS-y += s3c24x0_rtc.o COBJS-y += x1205.o +COBJS-y += rtc_pl031.o

COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/rtc/rtc_pl031.c b/drivers/rtc/rtc_pl031.c new file mode 100755 index 0000000..ff8926d --- /dev/null +++ b/drivers/rtc/rtc_pl031.c @@ -0,0 +1,123 @@ +/* + * (C) Copyright 2008 + * Gururaja Hebbar gururajakr@sanyo.co.in + * + * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <command.h> +#include <rtc.h> + +#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) + +#ifndef CFG_RTC_PL031_BASE +#error CFG_RTC_PL031_BASE is not defined! +#endif + +/* + * Register definitions + */ +#define RTC_DR 0x00 /* Data read register */ +#define RTC_MR 0x04 /* Match register */ +#define RTC_LR 0x08 /* Data load register */ +#define RTC_CR 0x0c /* Control register */ +#define RTC_IMSC 0x10 /* Interrupt mask and set register */ +#define RTC_RIS 0x14 /* Raw interrupt status register */ +#define RTC_MIS 0x18 /* Masked interrupt status register */ +#define RTC_ICR 0x1c /* Interrupt clear register */ + +#define RTC_CR_START (1 << 0) + +#define RTC_WRITE_REG(addr, val) \ + (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr)) = (val)) +#define RTC_READ_REG(addr) \ + (*(volatile unsigned int *)(CFG_RTC_PL031_BASE + (addr))) + +static int pl031_initted = 0; + +/* Enable RTC Start in Control register*/ +void rtc_init(void) +{ + RTC_WRITE_REG(RTC_CR,RTC_CR_START); + + pl031_initted = 1; +} + +/* + * Reset the RTC. We set the date back to 1970-01-01. + */ +void rtc_reset(void) +{ + RTC_WRITE_REG(RTC_LR,0x00); + if(!pl031_initted) + rtc_init(); +} + +/* + * Set the RTC +*/ +void rtc_set(struct rtc_time *tmp) +{ + unsigned long tim; + + if(!pl031_initted) + rtc_init(); + + if (tmp == NULL) { + puts("Error setting the date/time\n"); + return; + } + + /* Calculate number of seconds this incoming time represents */ + tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + RTC_WRITE_REG(RTC_LR,tim); +} + +/* + * Get the current time from the RTC + */ +int rtc_get(struct rtc_time *tmp) +{ + ulong tim; + + if(!pl031_initted) + rtc_init(); + + if (tmp == NULL) { + puts("Error getting the date/time\n"); + return -1; + } + + tim = RTC_READ_REG(RTC_DR); + + to_tm (tim, tmp); + + debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return 0; +} + +#endif

-- 1.5.5.1 diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c index 9d1a25e..5bf7e85 100644 --- a/board/versatile/versatile.c +++ b/board/versatile/versatile.c @@ -41,6 +41,10 @@ void flash__init (void); void ether__init (void); void peripheral_power_enable (void); +#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) +extern int rtc_init(void); +#endif + #if defined(CONFIG_SHOW_BOOT_PROGRESS) void show_boot_progress(int progress) { @@ -84,6 +88,11 @@ int board_init (void) flash__init (); ether__init (); + +#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) + rtc_init(); +#endif + return 0; } diff --git a/include/configs/versatile.h b/include/configs/versatile.h index d250150..b93321d 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -96,6 +96,12 @@ #define CFG_SERIAL0 0x101F1000 #define CFG_SERIAL1 0x101F2000 +/* + * RTC configuration + */ +#define CONFIG_RTC_PL031 1 /* use ARM AMBA PL031 RTC */ +#define CFG_RTC_PL031_BASE 0x101e8000 + /* * Command line configuration. @@ -110,6 +116,7 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_ENV +#define CONFIG_CMD_DATE /* * BOOTP options -- 1.5.5.1 -- View this message in context: http://www.nabble.com/-PATCH--%28Resubmit%29-ADD-ARM-AMBA-PL031-RTC-Support-... Sent from the Uboot - Users mailing list archive at Nabble.com.

Wolfgang Denk

29 Jul 29 Jul

10:54 p.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

In message 18583543.post@talk.nabble.com you wrote:

...

Now i have generated the patch using below command. Update me if this is not correct $ git format-patch -p -o ../ -C -M -N --summary --stat=80 --no-color --signoff master workingbranch

Please move such comments *below* the '---' line. Anything ABOVE '---' will become the commit message that goes into the repository, only stuff below the '---' gets ignores as comment.

...

Add ARM AMBA PL031 RTC Support

Call rtc_init function to start pl031 rtc if enabled from versatile.c

Define rtc base address and date command support in versatile.h

Coding Style Changes/Updates

Signed-off-by: Gururaja Hebbar gururajakr@sanyo.co.in

drivers/rtc/Makefile | 1 + drivers/rtc/rtc_pl031.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ board/versatile/versatile.c | 9 +++++++++ include/configs/versatile.h | 7 +++++++

So this is actually not a single patch, but TWO:

- the first one adds support for the PL031 RTC (files drivers/rtc/Makefile and drivers/rtc/rtc_pl031.c) - the second one uses it for the "versatile" board (files board/versatile/versatile.c and include/configs/versatile.h).

So please split your patch and submit as two separate patches.

...

diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c index 9d1a25e..5bf7e85 100644 --- a/board/versatile/versatile.c +++ b/board/versatile/versatile.c

...

+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) +extern int rtc_init(void); +#endif

#if defined(CONFIG_SHOW_BOOT_PROGRESS) void show_boot_progress(int progress) { @@ -84,6 +88,11 @@ int board_init (void)

flash__init (); ether__init ();

+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)

rtc_init();

+#endif

Why do we need the #ifdef's here? It seems this is a board specific configuration anyway, i. e. we don't expect for example other RTC chips to be used on this board, or do we?

Best regards,

Wolfgang Denk

-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de 1 1 was a race-horse, 2 2 was 1 2. When 1 1 1 1 race, 2 2 1 1 2.

Gururaja Hebbar K R

1 Aug 1 Aug

2:42 a.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

Hi,

...

Please move such comments *below* the '---' line. Anything ABOVE '---' will become the commit message that goes into the repository, only

stuff below the '---' gets ignores as comment.

Yes i will do & re-submit

...

...
drivers/rtc/Makefile | 1 + drivers/rtc/rtc_pl031.c | 123

+++++++++++++++++++++++++++++++++++++++++++++++

...

...
board/versatile/versatile.c | 9 +++++++++ include/configs/versatile.h | 7 +++++++

So this is actually not a single patch, but TWO:

Peter Pearse & Jean-Christophe PLAGNIOL-VILLARD had asked me to the board details which will be using it. So i added it here. I already sent a separate Versatile Board Update Only Code to Peter Pearse but not received any update from him.

...

So please split your patch and submit as two separate patches.

Ok will do that

...

...
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)

rtc_init();

+#endif

Why do we need the #ifdef's here? It seems this is a board specific

configuration anyway, i. e. we don't expect for example other RTC chips to be used on this board, or do we?

If the user doesn't Need to Use RTC, He can Just disable it from Versatile Board Config file versatile.h. This was my Idea. Isn't it required

Regards Gururaja

Hebbar

5:15 a.m.

New subject: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

Hi,

...

Why do we need the #ifdef's here? It seems this is a board specific configuration anyway, i. e. we don't expect for example other RTC chips to be used on this board, or do we?

Also I Just Checked u-boot-1.3.3/board/bc3450/bc3450.c. Even here it has a declaration for RTC @ line 47

#ifdef CONFIG_RTC_MPC5200 #include <rtc.h> #endif

@ line 371

#ifdef CONFIG_RTC_MPC5200 struct rtc_time t;

/* set to Wed Dec 31 19:00:00 1969 */ t.tm_sec = t.tm_min = 0; t.tm_hour = 19; t.tm_mday = 31; t.tm_mon = 12; t.tm_year = 1969; t.tm_wday = 3;

rtc_set(&t); #endif /* CONFIG_RTC_MPC5200 */

So i think its correct. Please Update me if i am wrong

Regards Gururaja

-- View this message in context: http://www.nabble.com/-PATCH--%28Resubmit%29-ADD-ARM-AMBA-PL031-RTC-Support-... Sent from the Uboot - Users mailing list archive at Nabble.com.

6122

Age (days ago)

6133

Last active (days ago)

List overview

Download

8 comments

4 participants

tags (0)

participants (4)

Gururaja Hebbar K R
Hebbar
Jean-Christophe PLAGNIOL-VILLARD
Wolfgang Denk