unify hw level clock for at91 cores

PATCH New Andreas Bießmann 3 participants 11 messages Jun 7, 2011 – Jun 26, 2011 2 messages not in the archive

Subsystems (3)

Arm (32-bit) Kbuild Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Andreas Bießmann

author

2011-06-07 23:27 UTC #0 lore raw

cover unify hw level clock for at91 cores

This patchset makes the arm926ejs/at91/clock.c features available to arm920t/at91 devices. This is a first step to replace at91rm9200_usart by atmel_usart driver.

This change was already discussed in mid.gmane.org/BANLkTimn29vmAYGb5csMdCYS-xx6zD_6Zw at mail.gmail.com

The patchset is on top of current atmel/master. It would be nice if we can get this change into 2011.06. The changes for at91rm9200 removal are ongoing (atmel_usart is required!) but will most probable not be finished for 2011.06 release.
Therefore it is not a must to get these changes in now.

Andreas Bie?mann (2):
at91: move a/a/c/arm926ejs/at91/clock.c -> a/a/lib/at91 arm920t/at91: use new clock features from libat91-common

 Makefile                                    |    3 +
 arch/arm/cpu/arm920t/at91/Makefile          |    1 +
 arch/arm/cpu/arm926ejs/at91/Makefile        |    1 -
 arch/arm/cpu/arm926ejs/at91/clock.c         |  215 ---------------------------
 arch/arm/include/asm/arch-at91/at91rm9200.h |    1 +
 arch/arm/lib/at91/Makefile                  |   45 ++++++
 arch/arm/lib/at91/clock.c                   |  215 +++++++++++++++++++++++++++
 include/configs/at91rm9200ek.h              |    3 +
 include/configs/cpuat91.h                   |    5 +-
 include/configs/eb_cpux9k2.h                |    4 +-
 10 files changed, 273 insertions(+), 220 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/at91/clock.c
 create mode 100644 arch/arm/lib/at91/Makefile
 create mode 100644 arch/arm/lib/at91/clock.c

Signature · 1 line

1.7.5.4

Andreas Bießmann

author

2011-06-07 23:27 UTC #1 lore raw

PATCH 1/2 at91: move a/a/c/arm926ejs/at91/clock.c -> a/a/lib/at91

The at91/clock.c is copied from linux kernel and has support for both arm920t and arm926ejs core devices. Therefore this patch moves this generic at91/clock.c to a new place at arch/arm/lib/at91 to be used from at91 family devices.

We build a new libat91-common.o to provide the required symbols to both cpu types.

Signed-off-by Andreas Bie?mann <[email protected]>

---
 Makefile                             |    3 +
 arch/arm/cpu/arm926ejs/at91/Makefile |    1 -
 arch/arm/cpu/arm926ejs/at91/clock.c  |  215 ----------------------------------
 arch/arm/lib/at91/Makefile           |   45 +++++++
 arch/arm/lib/at91/clock.c            |  215 ++++++++++++++++++++++++++++++++++
 5 files changed, 263 insertions(+), 216 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/at91/clock.c
 create mode 100644 arch/arm/lib/at91/Makefile
 create mode 100644 arch/arm/lib/at91/clock.c

Makefile +3 -0

index 76124e5..64e47c7 100644
@@ -189,6 +189,9 @@ LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
 LIBS += $(CPUDIR)/lib$(CPU).o
 ifdef SOC
 LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o
+ifeq ($(SOC),at91)
+LIBS += arch/arm/lib/at91/libat91-common.o
+endif
 endif
 ifeq ($(CPU),ixp)
 LIBS += arch/arm/cpu/ixp/npe/libnpe.o

arch/arm/cpu/arm926ejs/at91/Makefile +0 -1

index f333753..ee66b3d 100644
@@ -37,7 +37,6 @@ COBJS-$(CONFIG_AT91SAM9M10G45)	+= at91sam9m10g45_devices.o
 COBJS-$(CONFIG_AT91SAM9G45)	+= at91sam9m10g45_devices.o
 COBJS-$(CONFIG_AT91_EFLASH)	+= eflash.o
 COBJS-$(CONFIG_AT91_LED)	+= led.o
-COBJS-y += clock.o
 COBJS-y += cpu.o
 COBJS-y	+= reset.o
 COBJS-y	+= timer.o

arch/arm/cpu/arm926ejs/at91/clock.c deleted +0 ~~-215~~

215 lines not on this page · raw message

arch/arm/lib/at91/Makefile new file +45 -0

45 lines not on this page · raw message

arch/arm/lib/at91/clock.c new file +215 -0

215 lines not on this page · raw message

Signature · 1 line

1.7.5.4

Reinhard Meyer

2011-06-09 09:38 UTC #2 lore raw

PATCH 1/2 at91: move a/a/c/arm926ejs/at91/clock.c -> a/a/lib/at91

Dear Andreas Bie?mann,

Quoted 9 lines

The at91/clock.c is copied from linux kernel and has support for both arm920t and arm926ejs core devices. Therefore this patch moves this generic at91/clock.c to a new place at arch/arm/lib/at91 to be used from at91 family devices.
We build a new libat91-common.o to provide the required symbols to both cpu types.
Signed-off-by Andreas Bie?mann <[email protected]>

Quoted 10 lines

---
 Makefile                             |    3 +
 arch/arm/cpu/arm926ejs/at91/Makefile |    1 -
 arch/arm/cpu/arm926ejs/at91/clock.c  |  215 ----------------------------------
 arch/arm/lib/at91/Makefile           |   45 +++++++
 arch/arm/lib/at91/clock.c            |  215 ++++++++++++++++++++++++++++++++++
 5 files changed, 263 insertions(+), 216 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/at91/clock.c
 create mode 100644 arch/arm/lib/at91/Makefile
 create mode 100644 arch/arm/lib/at91/clock.c

Please use the "git-mv" command to move the file "clock.c".

On any account, we should discuss about opening a subdir lib scheme first. Currently arch/arm/lib does not have any subdirectories.

I _do_ see the problems of the current ARM directory structure which makes the ARM core a more important criteria than SoC family especially in the Atmel context where the SoCs have identical peripheral blocks but can have different ARM cores.

Since that change goes outside the "Atmel directory domain", I consider this an RFC. Albert is already on CC.

Best Regards,
Reinhard

Andreas Bießmann

author

2011-06-09 09:46 UTC #3 lore raw

PATCH 1/2 at91: move a/a/c/arm926ejs/at91/clock.c -> a/a/lib/at91

Dear Reinhard Meyer,

Am 09.06.2011 11:38, schrieb Reinhard Meyer:

Quoted 21 lines

Dear Andreas Bie?mann,
Quoted 9 lines
The at91/clock.c is copied from linux kernel and has support for both arm920t and arm926ejs core devices. Therefore this patch moves this generic at91/clock.c to a new place at arch/arm/lib/at91 to be used from at91 family devices.
We build a new libat91-common.o to provide the required symbols to both cpu types.
Signed-off-by Andreas Bie?mann <[email protected]>
Quoted 10 lines
---
 Makefile                             |    3 +
 arch/arm/cpu/arm926ejs/at91/Makefile |    1 -
 arch/arm/cpu/arm926ejs/at91/clock.c  |  215 ----------------------------------
 arch/arm/lib/at91/Makefile           |   45 +++++++
 arch/arm/lib/at91/clock.c            |  215 ++++++++++++++++++++++++++++++++++
 5 files changed, 263 insertions(+), 216 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/at91/clock.c
 create mode 100644 arch/arm/lib/at91/Makefile
 create mode 100644 arch/arm/lib/at91/clock.c

Quoted 1 line

Please use the "git-mv" command to move the file "clock.c".

I did it that way ... but I think there was another trick for git-format-patch ... will have a look for that

Quoted 2 lines

On any account, we should discuss about opening a subdir lib scheme first. Currently arch/arm/lib does not have any subdirectories.

Well as described in cover letter this was discussed before. See the other discussion on gmane:
http://mid.gmane.org/BANLkTimn29vmAYGb5csMdCYS-xx6zD_6Zw at mail.gmail.com

I think this solution was preferred by Albert too. But I'm open for another solution, so lets see what possibilities you have.

Quoted 4 lines

I _do_ see the problems of the current ARM directory structure which makes the ARM core a more important criteria than SoC family especially in the Atmel context where the SoCs have identical peripheral blocks but can have different ARM cores.

correct

regards

Andreas Bie?mann

Reinhard Meyer

2011-06-09 10:23 UTC #4 lore raw

PATCH 1/2 at91: move a/a/c/arm926ejs/at91/clock.c -> a/a/lib/at91

Dear Andreas Bie?mann,

Quoted 29 lines

Dear Reinhard Meyer,
Am 09.06.2011 11:38, schrieb Reinhard Meyer:
Quoted 21 lines
Dear Andreas Bie?mann,
Quoted 9 lines
The at91/clock.c is copied from linux kernel and has support for both arm920t and arm926ejs core devices. Therefore this patch moves this generic at91/clock.c to a new place at arch/arm/lib/at91 to be used from at91 family devices.
We build a new libat91-common.o to provide the required symbols to both cpu types.
Signed-off-by Andreas Bie?mann <[email protected]>
Quoted 10 lines
---
 Makefile                             |    3 +
 arch/arm/cpu/arm926ejs/at91/Makefile |    1 -
 arch/arm/cpu/arm926ejs/at91/clock.c  |  215 ----------------------------------
 arch/arm/lib/at91/Makefile           |   45 +++++++
 arch/arm/lib/at91/clock.c            |  215 ++++++++++++++++++++++++++++++++++
 5 files changed, 263 insertions(+), 216 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/at91/clock.c
 create mode 100644 arch/arm/lib/at91/Makefile
 create mode 100644 arch/arm/lib/at91/clock.c
Quoted 1 line
Please use the "git-mv" command to move the file "clock.c".
I did it that way ... but I think there was another trick for git-format-patch ... will have a look for that

Quoted 6 lines

Quoted 2 lines
On any account, we should discuss about opening a subdir lib scheme first. Currently arch/arm/lib does not have any subdirectories.
Well as described in cover letter this was discussed before. See the other discussion on gmane:
http://mid.gmane.org/BANLkTimn29vmAYGb5csMdCYS-xx6zD_6Zw at mail.gmail.com

Sorry, I had forgotten already about that discussion, it was even marked "important" in my e-Mail program... and I wanted to comment then but was too busy with other things ;)

Quoted 3 lines

I think this solution was preferred by Albert too. But I'm open for another solution, so lets see what possibilities you have.

What other files do you see (in the future) to be in arch/arm/lib/at91? For just clock.c, it seems like an overkill... Can we (on the long run) move _all_ files from the at91 subdirs there, like *_devices.c, reset.c, timer.c, at91sam9_watchdog.c? Then it would make sense to me...

if YES, ignore the following ideas:
{
When I look at the #ifdef's near the end of clock.c I get an uneasy feeling;)

With more Atmel SoCs coming up which must have additional clock domains (e.g. with 2x EMAC, CAN, etc) I can imagine this file to become more and more ugly.

I currently have rough ideas to add to the discussion:

1. move the SoC specific clock stuff into <SoC>_devices.c - even if that means some duplication (the get_*_clk_rate() functions could possibly be inlined and put into the header file ?)

2. introduce <SoC>_clock.c (if one does not like the clock stuff in "devices")

3. similar to drivers/watchdog we could have drivers/clock and put at91sam9_clock.c there. On that account, the hardware specific timer functions of any new timer scheme could be placed there as well. }

Quoted 7 lines

Quoted 5 lines
I _do_ see the problems of the current ARM directory structure which makes the ARM core a more important criteria than SoC family especially in the Atmel context where the SoCs have identical peripheral blocks but can have different ARM cores.
correct

Best Regards,
Reinhard

Andreas Bießmann

author

2011-06-09 11:07 UTC #5 lore raw

PATCH 1/2 at91: move a/a/c/arm926ejs/at91/clock.c -> a/a/lib/at91

Dear Reinhard Meyer,

Am 09.06.2011 12:23, schrieb Reinhard Meyer:

Quoted 5 lines

Dear Andreas Bie?mann,
Quoted 4 lines
Dear Reinhard Meyer,
Am 09.06.2011 11:38, schrieb Reinhard Meyer:
Quoted 1 line
Dear Andreas Bie?mann,

Quoted 10 lines

Quoted 6 lines
Quoted 2 lines
On any account, we should discuss about opening a subdir lib scheme first. Currently arch/arm/lib does not have any subdirectories.
Well as described in cover letter this was discussed before. See the other discussion on gmane:
http://mid.gmane.org/BANLkTimn29vmAYGb5csMdCYS-xx6zD_6Zw at mail.gmail.com
Sorry, I had forgotten already about that discussion, it was even marked "important" in my e-Mail program... and I wanted to comment then but was too busy with other things ;)

no problem, we can do it here ...

Quoted 5 lines

Quoted 3 lines
I think this solution was preferred by Albert too. But I'm open for another solution, so lets see what possibilities you have.
What other files do you see (in the future) to be in arch/arm/lib/at91?

Well, if I look at the arm920t/at91 I do see following files:

timer.c
timer could not be shared between arm920t and arm926ejs at91 SoC cause at91rm9200 do not have a 32 bit PITC!
reset.c
reset could not be shared cause at91rm9200 has an input only NRST pin. We do need the watchdog workaround to do the reset

A future commit will add cpu.c as in arm926ejs but with less features (just arch_cpu_init() for at91_clock_init()).

If I look at ar926ejs/at91 files I do see additionally these files:

eflash.c
new feature in some sam9XE devices, not related to at91rm9200
led.c
I do hate this ... we have dozen of led API ... but it is really helpful for assembler (lowlevel_init) stage debugging without JTAG, could be useful for at91rm9200
<SoC>_devices.c
...

Quoted 1 line

For just clock.c, it seems like an overkill...

You are right here ..

Quoted 3 lines

Can we (on the long run)
move _all_ files from the at91 subdirs there, like *_devices.c, reset.c, timer.c, at91sam9_watchdog.c? Then it would make sense to me...

This makes no sense to me in the current structure. If we have some arch/arm/mach-XXX like the linux kernel it would make sense to make the effort to unify those files.

The main aim for this patch was to not duplicate the clock.c from arm926ejs to arm920t (remember, the file is already prepared for at92rm9200 cause it is a copy from linux source tree).

Quoted 3 lines

if YES, ignore the following ideas:
{
When I look at the #ifdef's near the end of clock.c I get an uneasy feeling;)

I see ... Therefore it would be better to rewrite the clock.c in arm926ejs (remove at91rm9200 support) and arm920t (do not add support for other SoC).

Quoted 3 lines

With more Atmel SoCs coming up which must have additional clock domains (e.g. with 2x EMAC, CAN, etc) I can imagine this file to become more and more ugly.

That may be true.

Quoted 5 lines

I currently have rough ideas to add to the discussion:
1. move the SoC specific clock stuff into <SoC>_devices.c - even if that means some duplication (the get_*_clk_rate() functions could possibly be inlined and put into the header file ?)

We should inline the get_*_clk_rate() functions in header in any case. That is a good idea.

Quoted 1 line

2. introduce <SoC>_clock.c (if one does not like the clock stuff in "devices")

But this needs also an rewrite of the clock.c driver (which was copied from linux kernel).

Quoted 3 lines

3. similar to drivers/watchdog we could have drivers/clock and put at91sam9_clock.c there. On that account, the hardware specific timer functions of any new timer scheme could be placed there as well.

That could be another solution.

The conclusion is that lib/at91 is not the correct way, cause there are only a few commonalities between arm920t and arm926ejs. Therefore we have
a) include new clock.c in arm920t
b) move current clock.c to driver/clock (or similar)

regards

Andreas Bie?mann

Andreas Bießmann

author

2011-06-07 23:27 UTC #6 lore raw

PATCH 2/2 arm920t/at91: use new clock features from libat91-common

In reply to Andreas Bießmann

This patch enables the new clock features from new libat91-common. This is a required step to get at91rm9200_usart replaced by atmel_usart driver.

Signed-off-by Andreas Bie?mann <[email protected]>

CC Jens Scharsig <[email protected]>

CC Eric B?nard <[email protected]>

---
 arch/arm/cpu/arm920t/at91/Makefile          |    1 +
 arch/arm/include/asm/arch-at91/at91rm9200.h |    1 +
 include/configs/at91rm9200ek.h              |    3 +++
 include/configs/cpuat91.h                   |    5 +++--
 include/configs/eb_cpux9k2.h                |    4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

arch/arm/cpu/arm920t/at91/Makefile +1 -0

index 5c71b77..872461a 100644
@@ -28,6 +28,7 @@ LIB	= $(obj)lib$(SOC).o
 SOBJS	+= lowlevel_init.o
 COBJS	+= reset.o
 COBJS	+= timer.o
+COBJS	+= cpu.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

arch/arm/include/asm/arch-at91/at91rm9200.h +1 -0

index ff18014..979241e 100644
@@ -22,6 +22,7 @@
 #define __AT91RM9200_H__
 
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
+#define CONFIG_ARCH_CPU_INIT	/* we need arch_cpu_init() for hw timers */
 #define CONFIG_ARM920T		/* This is an ARM920T Core	*/
 
 /* Periperial Identifiers */

include/configs/at91rm9200ek.h +3 -0

index 16cd214..ee199ab 100644
@@ -55,6 +55,7 @@
  * CONFIG_SYS_HZ is the tick rate for timer tc0
  */
 #define AT91C_XTAL_CLOCK		18432000
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 #define AT91C_MAIN_CLOCK		((AT91C_XTAL_CLOCK / 4) * 39)
 #define AT91C_MASTER_CLOCK		(AT91C_MAIN_CLOCK / 3 )
 #define CONFIG_SYS_HZ_CLOCK		(AT91C_MASTER_CLOCK / 2)

@@ -66,6 +67,8 @@
 #define CONFIG_CPUAT91
 #define USE_920T_MMU
 
+#include <asm/hardware.h>	/* needed for port definitions */
+
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

include/configs/cpuat91.h +3 -2

index cfaef15..2bda72b 100644
@@ -37,6 +37,7 @@
 #endif
 
 #define AT91C_XTAL_CLOCK		18432000
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 #define AT91C_MAIN_CLOCK		((AT91C_XTAL_CLOCK / 4) * 39)
 #define AT91C_MASTER_CLOCK		(AT91C_MAIN_CLOCK / 3)
 #define CONFIG_SYS_HZ_CLOCK		(AT91C_MASTER_CLOCK / 2)

@@ -45,11 +46,11 @@
 #define CONFIG_ARM920T
 #define CONFIG_AT91RM9200
 #define CONFIG_CPUAT91
-#define CONFIG_AT91FAMILY
-
 #undef CONFIG_USE_IRQ
 #define USE_920T_MMU
 
+#include <asm/hardware.h>	/* needed for port definitions */
+
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

include/configs/eb_cpux9k2.h +2 -2

index e12770a..25b28f5 100644
@@ -36,7 +36,7 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_IDENT_STRING	" on EB+CPUx9K2"
 
-#include <asm/arch/hardware.h>	/* needed for port definitions */
+#include <asm/hardware.h>	/* needed for port definitions */
 
 #define CONFIG_MISC_INIT_R

@@ -69,7 +69,7 @@
 #define CONFIG_SYS_HZ		1000
 #define CONFIG_SYS_HZ_CLOCK 	(AT91C_MASTER_CLOCK / 2)
 
-#define AT91_SLOW_CLOCK			32768		/* slow clock */
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock */
 
 #define CONFIG_CMDLINE_TAG		1
 #define CONFIG_SETUP_MEMORY_TAGS	1

Signature · 1 line

1.7.5.4

Jens Scharsig

2011-06-08 17:06 UTC #7 lore raw

PATCH 2/2 arm920t/at91: use new clock features from libat91-common

Am 08.06.2011 01:27, schrieb Andreas Bie?mann:

arch/arm/include/asm/arch-at91/at91rm9200.h

Quoted 15 lines

arch/arm/cpu/arm920t/at91/Makefile +1 -0

index 5c71b77..872461a 100644
@@ -28,6 +28,7 @@ LIB	= $(obj)lib$(SOC).o
  SOBJS	+= lowlevel_init.o
  COBJS	+= reset.o
  COBJS	+= timer.o
+COBJS	+= cpu.o
 
  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
  OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

arch/arm/include/asm/arch-at91/at91rm9200.h +0 -0

index ff18014..979241e 100644

Dear Andreas Bie?mann,

I am running in the following error:

.....
make -C arch/arm/cpu/arm920t/at91/
make[1]: Entering directory /home/scharsig/projects/CPUx9K2/u-boot/arch/arm/cpu/arm920t/at91' make[1]: *** No rule to make target cpu.c', needed by .depend'. Stop. make[1]: Leaving directory /home/scharsig/projects/CPUx9K2/u-boot/arch/arm/cpu/arm920t/at91'
make: *** [arch/arm/cpu/arm920t/at91/libat91.o] Error 2

Is it possible that the patch is incomplete
or is an additional patch needed

Best regards

Jens Scharsig

Andreas Bießmann

author

2011-06-08 20:10 UTC #8 lore raw

PATCH v2 1/1 arm920t/at91: use new clock features from libat91-common

This patch enables the new clock features from new libat91-common. This is a required step to get at91rm9200_usart replaced by atmel_usart driver.

Signed-off-by Andreas Bie?mann <[email protected]>

Cc Jens Scharsig <[email protected]>

Cc Eric B?nard <[email protected]>

---
changes since v1:
- add missing cpu.c

resent due to wrong list mail ...

 arch/arm/cpu/arm920t/at91/Makefile          |    1 +
 arch/arm/cpu/arm920t/at91/cpu.c             |   14 ++++++++++++++
 arch/arm/include/asm/arch-at91/at91rm9200.h |    1 +
 include/configs/at91rm9200ek.h              |    3 +++
 include/configs/cpuat91.h                   |    5 +++--
 include/configs/eb_cpux9k2.h                |    4 ++--
 6 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/cpu/arm920t/at91/cpu.c

arch/arm/cpu/arm920t/at91/Makefile +1 -0

index 5c71b77..872461a 100644
@@ -28,6 +28,7 @@ LIB	= $(obj)lib$(SOC).o
 SOBJS	+= lowlevel_init.o
 COBJS	+= reset.o
 COBJS	+= timer.o
+COBJS	+= cpu.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

arch/arm/cpu/arm920t/at91/cpu.c new file +14 -0

new file mode 100644
index 0000000..b4c0175
@@ -0,0 +1,14 @@
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/clk.h>
+
+#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
+#define CONFIG_SYS_AT91_MAIN_CLOCK 0
+#endif
+
+int arch_cpu_init(void)
+{
+	return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+}
+

arch/arm/include/asm/arch-at91/at91rm9200.h +1 -0

index ff18014..979241e 100644
@@ -22,6 +22,7 @@
 #define __AT91RM9200_H__
 
 #define CONFIG_AT91FAMILY	/* it's a member of AT91 */
+#define CONFIG_ARCH_CPU_INIT	/* we need arch_cpu_init() for hw timers */
 #define CONFIG_ARM920T		/* This is an ARM920T Core	*/
 
 /* Periperial Identifiers */

include/configs/at91rm9200ek.h +3 -0

index 16cd214..ee199ab 100644
@@ -55,6 +55,7 @@
  * CONFIG_SYS_HZ is the tick rate for timer tc0
  */
 #define AT91C_XTAL_CLOCK		18432000
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 #define AT91C_MAIN_CLOCK		((AT91C_XTAL_CLOCK / 4) * 39)
 #define AT91C_MASTER_CLOCK		(AT91C_MAIN_CLOCK / 3 )
 #define CONFIG_SYS_HZ_CLOCK		(AT91C_MASTER_CLOCK / 2)

@@ -66,6 +67,8 @@
 #define CONFIG_CPUAT91
 #define USE_920T_MMU
 
+#include <asm/hardware.h>	/* needed for port definitions */
+
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

include/configs/cpuat91.h +3 -2

index cfaef15..2bda72b 100644
@@ -37,6 +37,7 @@
 #endif
 
 #define AT91C_XTAL_CLOCK		18432000
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 #define AT91C_MAIN_CLOCK		((AT91C_XTAL_CLOCK / 4) * 39)
 #define AT91C_MASTER_CLOCK		(AT91C_MAIN_CLOCK / 3)
 #define CONFIG_SYS_HZ_CLOCK		(AT91C_MASTER_CLOCK / 2)

@@ -45,11 +46,11 @@
 #define CONFIG_ARM920T
 #define CONFIG_AT91RM9200
 #define CONFIG_CPUAT91
-#define CONFIG_AT91FAMILY
-
 #undef CONFIG_USE_IRQ
 #define USE_920T_MMU
 
+#include <asm/hardware.h>	/* needed for port definitions */
+
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

include/configs/eb_cpux9k2.h +2 -2

index e12770a..25b28f5 100644
@@ -36,7 +36,7 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_IDENT_STRING	" on EB+CPUx9K2"
 
-#include <asm/arch/hardware.h>	/* needed for port definitions */
+#include <asm/hardware.h>	/* needed for port definitions */
 
 #define CONFIG_MISC_INIT_R

@@ -69,7 +69,7 @@
 #define CONFIG_SYS_HZ		1000
 #define CONFIG_SYS_HZ_CLOCK 	(AT91C_MASTER_CLOCK / 2)
 
-#define AT91_SLOW_CLOCK			32768		/* slow clock */
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock */
 
 #define CONFIG_CMDLINE_TAG		1
 #define CONFIG_SETUP_MEMORY_TAGS	1

Signature · 1 line

1.7.5.4

Jens Scharsig

2011-06-26 17:39 UTC #9 lore raw

PATCH v2 1/1 arm920t/at91: use new clock features from libat91-common

Am 08.06.2011 22:10, schrieb Andreas Bie?mann:

Quoted 14 lines

This patch enables the new clock features from new libat91-common. This is a required step to get at91rm9200_usart replaced by atmel_usart driver.
Signed-off-by Andreas Bie?mann<[email protected]>
Cc Jens Scharsig<[email protected]>
Cc Eric B?nard<[email protected]>
---
changes since v1:
- add missing cpu.c
resent due to wrong list mail ...

Quoted 9 lines

  arch/arm/cpu/arm920t/at91/Makefile          |    1 +
  arch/arm/cpu/arm920t/at91/cpu.c             |   14 ++++++++++++++
  arch/arm/include/asm/arch-at91/at91rm9200.h |    1 +
  include/configs/at91rm9200ek.h              |    3 +++
  include/configs/cpuat91.h                   |    5 +++--
  include/configs/eb_cpux9k2.h                |    4 ++--
  6 files changed, 24 insertions(+), 4 deletions(-)

create mode 100644 arch/arm/cpu/arm920t/at91/cpu.c

Acked-by Jens Scharsig<[email protected]>

Tested-by Jens Scharsig<[email protected]> (for eb_cpux9k2 board)

A message that is not in the archive (sent off-list or not yet received): [email protected]

Andreas Bießmann

author

2011-06-09 09:49 UTC #12 lore raw

PATCH v2 1/1 arm920t/at91: use new clock features from libat91-common

resent to right list ...

Dear Reinhard Meyer,

Am 09.06.2011 11:21, schrieb Reinhard Meyer:

Quoted 7 lines

Dear Andreas Bie?mann,
Quoted 6 lines
This patch enables the new clock features from new libat91-common. This is a required step to get at91rm9200_usart replaced by atmel_usart driver.
Signed-off-by Andreas Bie?mann <[email protected]>

Quoted 7 lines

Quoted 2 lines
Cc Jens Scharsig <[email protected]>
Cc Eric B?nard <[email protected]>
I think this should go into NEXT unleass it unbreaks that board right now. You mentioned in another mail that it would be ok to be in 2011.09. Is that OK?

I'm fine with that. The arm920t/at91 boards do build (with minor warnings in at91_emac and at91rm9200_usart) and work on real hardware since 9e8df9c4db7835152996c96cc432dc6dd70bb17c

The warnings are:
- 'at91_emac.c:487:2: warning: dereferencing type-punned pointer will

    break strict-aliasing rules' in at91_emac -> you know about that
   ... it is the same as in macb driver and will also be fixed soon.
 - 'at91rm9200_usart.c:39:2: warning: #warning Please update to use C
    structur SoC access !' -> at91rm9200_usart will be removed soon

Therefore I do not see any reason to remove those arm920t/at91 boards.

I will do some more testing with atmel_usart driver on atrm9200 devices and send for review this weekend. The big removal of old-style at91rm9200 boards can begin after that cause the deprecated at91rm9200_usart driver needs some outdated stuff which will also be removed in that step.

Besides that, I found out cpu.c (in that commit) is missing a GPL header and copyright notice. So please do not add this version.

regards

Andreas Bie?mann