Skip to contentSkip to conversation

Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

PATCH Superseded kevin.morfitt at fearnside-systems.co.uk 3 participants 6 messages Sep 26, 2009 – Oct 9, 2009 1 message not in the archive

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

Changes since v1:
- re-formatted patch to remove line wrapping

Note that patch 2/4 of this series has not changed.

This patch re-formats the code in cpu/arm920t and cpu/arm920t/23c24x0 in preparation for changes to add support for the Embest SBC2440-II Board.

The changes are as follows:
- re-indent the code using Lindent
- make sure register layouts are defined using a C struct
- replace the upper-case typedef'ed C struct names with lower case non-typedef'ed ones
- make sure registers are accessed using the proper accessor functions
- run checkpatch.pl and fix any error reports

Note that usb_ohci.c still has two lines that exceed 80 characters. This is because the statements on those lines lose readability when wrapped - the Linux coding style guidelines allow for this.

It assumes the following patch has been applied first:
- [U-Boot][PATCH-ARM] CONFIG_SYS_HZ fix for ARM902T S3C24X0 Boards, 05/09/2009

Tested on an Embest SBC2440-II Board with local u-boot patches as I don't have any s3c2400 or s3c2410 boards but need this patch applying before I can submit patches for the SBC2440-II Board. Also, ran MAKEALL for all ARM9 targets and no new warnings or errors were found.

---
 cpu/arm920t/s3c24x0/interrupts.c |    2 +-
 cpu/arm920t/s3c24x0/speed.c      |   42 +-
 cpu/arm920t/s3c24x0/timer.c      |   74 ++-
 cpu/arm920t/s3c24x0/usb.c        |   30 +-
 cpu/arm920t/s3c24x0/usb_ohci.c   | 1268 ++++++++++++++++++++------------------
 cpu/arm920t/s3c24x0/usb_ohci.h   |  187 +++---
 cpu/arm920t/start.S              |   63 +-
 7 files changed, 873 insertions(+), 793 deletions(-)
cpu/arm920t/s3c24x0/interrupts.c +1 -1
index 11ec95e..5a9256d 100644
@@ -40,7 +40,7 @@
 
 void do_irq (struct pt_regs *pt_regs)
 {
-	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
+	struct s3c24x0_interrupt * irq = s3c24x0_get_base_interrupt();
 	u_int32_t intpnd = irq->INTPND;
 
 }
cpu/arm920t/s3c24x0/speed.c +23 -19

78 lines not on this page · raw message

cpu/arm920t/s3c24x0/timer.c +41 -33

172 lines not on this page · raw message

cpu/arm920t/s3c24x0/usb.c +16 -14
index 9ccf575..b5ba8c4 100644
@@ -32,41 +32,43 @@
 # include <s3c2410.h>
 #endif
 
-int usb_cpu_init (void)
-{
+#include <asm/io.h>
 
-	S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
-	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+int usb_cpu_init(void)
+{
+	struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power();
+	struct s3c24x0_gpio *gpio = s3c24x0_get_base_gpio();
 
 	/*
 	 * Set the 48 MHz UPLL clocking. Values are taken from
 	 * "PLL value selection guide", 6-23, s3c2400_UM.pdf.
 	 */
-	clk_power->UPLLCON = ((40 << 12) + (1 << 4) + 2);
-	gpio->MISCCR |= 0x8; /* 1 = use pads related USB for USB host */
+	writel((40 << 12) + (1 << 4) + 2, &clk_power->UPLLCON);
+	/* 1 = use pads related USB for USB host */
+	writel(readl(&gpio->MISCCR) | 0x8, &gpio->MISCCR);
 
 	/*
 	 * Enable USB host clock.
 	 */
-	clk_power->CLKCON |= (1 << 4);
+	writel(readl(&clk_power->CLKCON) | (1 << 4), &clk_power->CLKCON);
 
 	return 0;
 }
 
-int usb_cpu_stop (void)
+int usb_cpu_stop(void)
 {
-	S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
+	struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power();
 	/* may not want to do this */
-	clk_power->CLKCON &= ~(1 << 4);
+	writel(readl(&clk_power->CLKCON) & ~(1 << 4), &clk_power->CLKCON);
 	return 0;
 }
 
-int usb_cpu_init_fail (void)
+int usb_cpu_init_fail(void)
 {
-	S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
-	clk_power->CLKCON &= ~(1 << 4);
+	struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power();
+	writel(readl(&clk_power->CLKCON) & ~(1 << 4), &clk_power->CLKCON);
 	return 0;
 }
 
-# endif /* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
+# endif	/* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
 #endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
cpu/arm920t/s3c24x0/usb_ohci.c +667 -601

2,032 lines not on this page · raw message

cpu/arm920t/s3c24x0/usb_ohci.h +92 -95

270 lines not on this page · raw message

cpu/arm920t/start.S +33 -30

133 lines not on this page · raw message

-- 1.6.1.2

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

#2 lore raw

PATCH v2 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

Dear kevin Morfitt

sorry for blank message

2009/9/30 Minkyu Kang <[email protected]>:

Quoted 43 lines

Dear Kevin Morfitt

2009/9/26 kevin.morfitt at fearnside-systems.co.uk <[email protected]>:

Quoted 39 lines

Changes since v1:
- re-formatted patch to remove line wrapping

Note that patch 2/4 of this series has not changed.

This patch re-formats the code in cpu/arm920t and cpu/arm920t/23c24x0 in preparation for changes to add support for the Embest SBC2440-II Board.

The changes are as follows:
- re-indent the code using Lindent
- make sure register layouts are defined using a C struct
- replace the upper-case typedef'ed C struct names with lower case ?non-typedef'ed ones
- make sure registers are accessed using the proper accessor functions
- run checkpatch.pl and fix any error reports

Note that usb_ohci.c still has two lines that exceed 80 characters. This is because the statements on those lines lose readability when wrapped - the Linux coding style guidelines allow for this.

It assumes the following patch has been applied first:
- [U-Boot][PATCH-ARM] CONFIG_SYS_HZ fix for ARM902T S3C24X0 Boards, 05/09/2009

Tested on an Embest SBC2440-II Board with local u-boot patches as I don't have any s3c2400 or s3c2410 boards but need this patch applying before I can submit patches for the SBC2440-II Board. Also, ran MAKEALL for all ARM9 targets and no new warnings or errors were found.

---

?cpu/arm920t/s3c24x0/interrupts.c | ? ?2 +-
?cpu/arm920t/s3c24x0/speed.c ? ? ?| ? 42 +-
?cpu/arm920t/s3c24x0/timer.c ? ? ?| ? 74 ++-
?cpu/arm920t/s3c24x0/usb.c ? ? ? ?| ? 30 +-
?cpu/arm920t/s3c24x0/usb_ohci.c ? | 1268 ++++++++++++++++++++------------------
?cpu/arm920t/s3c24x0/usb_ohci.h ? | ?187 +++---
?cpu/arm920t/start.S ? ? ? ? ? ? ?| ? 63 +-

?7 files changed, 873 insertions(+), 793 deletions(-)

I didn't see all of your patch.
But there are remained more works for cleaning
please use lower case name at C structure's members and functions

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net
#3 lore raw

PATCH v2 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

Quoted 49 lines · Minkyu Kang

Dear kevin Morfitt

sorry for blank message

2009/9/30 Minkyu Kang <[email protected]>:

Quoted 43 lines

Dear Kevin Morfitt

2009/9/26 kevin.morfitt at fearnside-systems.co.uk <[email protected]>:

Quoted 39 lines

Changes since v1:
- re-formatted patch to remove line wrapping

Note that patch 2/4 of this series has not changed.

This patch re-formats the code in cpu/arm920t and cpu/arm920t/23c24x0 in preparation for changes to add support for the Embest SBC2440-II Board.

The changes are as follows:
- re-indent the code using Lindent
- make sure register layouts are defined using a C struct
- replace the upper-case typedef'ed C struct names with lower case non-typedef'ed ones
- make sure registers are accessed using the proper accessor functions
- run checkpatch.pl and fix any error reports

Note that usb_ohci.c still has two lines that exceed 80 characters. This is because the statements on those lines lose readability when wrapped - the Linux coding style guidelines allow for this.

It assumes the following patch has been applied first:
- [U-Boot][PATCH-ARM] CONFIG_SYS_HZ fix for ARM902T S3C24X0 Boards, 05/09/2009

Tested on an Embest SBC2440-II Board with local u-boot patches as I don't have any s3c2400 or s3c2410 boards but need this patch applying before I can submit patches for the SBC2440-II Board. Also, ran MAKEALL for all ARM9 targets and no new warnings or errors were found.

---
 cpu/arm920t/s3c24x0/interrupts.c |    2 +-
 cpu/arm920t/s3c24x0/speed.c      |   42 +-
 cpu/arm920t/s3c24x0/timer.c      |   74 ++-
 cpu/arm920t/s3c24x0/usb.c        |   30 +-
 cpu/arm920t/s3c24x0/usb_ohci.c   | 1268 ++++++++++++++++++++------------------
 cpu/arm920t/s3c24x0/usb_ohci.h   |  187 +++---
 cpu/arm920t/start.S              |   63 +-
 7 files changed, 873 insertions(+), 793 deletions(-)
Quoted 1 line

I didn't see all of your patch.

Here are links to the patches and notes on their states:
- [U-boot] [PATCH-ARM] CONFIG_SYS_HZ change for cpu/arm920t/s3c24x0 boards:
http://lists.denx.de/pipermail/u-boot/2009-September/thread.html,
JP said it looked OK but needed testing, then it was tested by Wolfgang
- [U-Boot] [PATCH-ARM 1/4, v2] Clean-up of cpu/arm920t and cpu/arm920t/s3c24x0 code (this patch): one comment so far (your own)
- [U-Boot] [PATCH-ARM 2/4] Clean-up of s3c24x0 header files:
http://lists.denx.de/pipermail/u-boot/2009-September/060111.html,
no comments as yet
- [U-Boot] [PATCH-ARM 3/4, v2] Clean-up of s3c24x0 drivers excluding nand driver, http://lists.denx.de/pipermail/u-boot/2009-September/061583.html,
one comment by Gaye Abdoulaye Walsimou, fixed in v2
- [U-Boot] [PATCH-ARM 4/4, v2] Clean-up of s3c24x0 nand driver,
http://lists.denx.de/pipermail/u-boot/2009-September/061584.html,
v1 was Acked by Scott here -
http://lists.denx.de/pipermail/u-boot/2009-September/060580.html

Quoted 1 line

But there are remained more works for cleaning

My aim is to clean up just the s3c24x0 common code so I can later add support for the Embest SBC2440-II Board. I can see that the rest of the arm920t code also needs cleaning but this would be a much bigger job and could be done later - I'd rather limit these patches to s3c24x0 code.

Quoted 1 line

please use lower case name at C structure's members and functions

I think I have changed all structure names to lower case in the s3c24x0 code. I also think I've changed all function names to lower case except where the change would affect too many other areas - for example, if I change get_HCLK() to get_hclk() in cpu/arm920t/s3c24x0/speed.c I'd also need to change the same in include/common.h, cpu/lh7a40x, arm920t/imx and arm1176/s3c64xx and all functions that call get_HCLK() throughout u-boot. Again, this does need doing but could be done later.

Regards
Kevin

Quoted 3 lines

Thanks
Minkyu Kang

#4 lore raw

PATCH v2 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

kevin.morfitt at fearnside-systems.co.uk a ?crit :

Quoted 30 lines

Here are links to the patches and notes on their states:
- [U-boot] [PATCH-ARM] CONFIG_SYS_HZ change for cpu/arm920t/s3c24x0 boards:
http://lists.denx.de/pipermail/u-boot/2009-September/thread.html,
JP said it looked OK but needed testing, then it was tested by Wolfgang
- [U-Boot] [PATCH-ARM 1/4, v2] Clean-up of cpu/arm920t and cpu/arm920t/s3c24x0 code (this patch): one comment so far (your own)
- [U-Boot] [PATCH-ARM 2/4] Clean-up of s3c24x0 header files:
http://lists.denx.de/pipermail/u-boot/2009-September/060111.html,
no comments as yet
- [U-Boot] [PATCH-ARM 3/4, v2] Clean-up of s3c24x0 drivers excluding nand driver, http://lists.denx.de/pipermail/u-boot/2009-September/061583.html,
one comment by Gaye Abdoulaye Walsimou, fixed in v2
- [U-Boot] [PATCH-ARM 4/4, v2] Clean-up of s3c24x0 nand driver,
http://lists.denx.de/pipermail/u-boot/2009-September/061584.html,
v1 was Acked by Scott here -
http://lists.denx.de/pipermail/u-boot/2009-September/060580.html

Quoted 2 lines

But there are remained more works for cleaning

My aim is to clean up just the s3c24x0 common code so I can later add support for the Embest SBC2440-II Board. I can see that the rest of the arm920t code also needs cleaning but this would be a much bigger job and could be done later - I'd rather limit these patches to s3c24x0 code.

Quoted 2 lines

please use lower case name at C structure's members and functions

Quoted 8 lines

I think I have changed all structure names to lower case in the s3c24x0 code. I also think I've changed all function names to lower case except where the change would affect too many other areas - for example, if I change get_HCLK() to get_hclk() in cpu/arm920t/s3c24x0/speed.c I'd also need to change the same in include/common.h, cpu/lh7a40x, arm920t/imx and arm1176/s3c64xx and all functions that call get_HCLK() throughout u-boot. Again, this does need doing but could be done later.

Kevin,
As nobody seems to have an objection about your changes, I think you can just go ahead and make available
changes to support s3c2440 and your board.

Cheers,

#5 lore raw

PATCH v2 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

Quoted 37 lines · Abdoulaye Walsimou Gaye

kevin.morfitt at fearnside-systems.co.uk a ?crit :

Quoted 28 lines

Here are links to the patches and notes on their states:
- [U-boot] [PATCH-ARM] CONFIG_SYS_HZ change for cpu/arm920t/s3c24x0 boards:
http://lists.denx.de/pipermail/u-boot/2009-September/thread.html,
JP said it looked OK but needed testing, then it was tested by Wolfgang
- [U-Boot] [PATCH-ARM 1/4, v2] Clean-up of cpu/arm920t and cpu/arm920t/s3c24x0 code (this patch): one comment so far (your own)
- [U-Boot] [PATCH-ARM 2/4] Clean-up of s3c24x0 header files:
http://lists.denx.de/pipermail/u-boot/2009-September/060111.html,
no comments as yet
- [U-Boot] [PATCH-ARM 3/4, v2] Clean-up of s3c24x0 drivers excluding nand driver, http://lists.denx.de/pipermail/u-boot/2009-September/061583.html,
one comment by Gaye Abdoulaye Walsimou, fixed in v2
- [U-Boot] [PATCH-ARM 4/4, v2] Clean-up of s3c24x0 nand driver,
http://lists.denx.de/pipermail/u-boot/2009-September/061584.html,
v1 was Acked by Scott here -
http://lists.denx.de/pipermail/u-boot/2009-September/060580.html

Quoted 2 lines

But there are remained more works for cleaning

My aim is to clean up just the s3c24x0 common code so I can later add support for the Embest SBC2440-II Board. I can see that the rest of the arm920t code also needs cleaning but this would be a much bigger job and could be done later - I'd rather limit these patches to s3c24x0 code.

Quoted 2 lines

please use lower case name at C structure's members and functions

Quoted 8 lines

I think I have changed all structure names to lower case in the s3c24x0 code. I also think I've changed all function names to lower case except where the change would affect too many other areas - for example, if I change get_HCLK() to get_hclk() in cpu/arm920t/s3c24x0/speed.c I'd also need to change the same in include/common.h, cpu/lh7a40x, arm920t/imx and arm1176/s3c64xx and all functions that call get_HCLK() throughout u-boot. Again, this does need doing but could be done later.

Quoted 5 lines

Kevin,
As nobody seems to have an objection about your changes, I think you can just go ahead and make available
changes to support s3c2440 and your board.

I've missed the merge window for this u-boot release so I may as well submit the s3c2440 and sbc2440-ii board patches after this release.

So far only 1 of the 5 existing patches has been Ack-ed and 1 tested so I need to get them all accepted by the Samsung ARM custodian for this release.

Quoted 4 lines

Cheers,

#6 lore raw

PATCH v2 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code

Dear kevin.morfitt

2009/10/6 kevin.morfitt at fearnside-systems.co.uk <[email protected]>:

Quoted 45 lines
Quoted 37 lines · Abdoulaye Walsimou Gaye

kevin.morfitt at fearnside-systems.co.uk a ?crit :

Quoted 28 lines

Here are links to the patches and notes on their states:
- [U-boot] [PATCH-ARM] CONFIG_SYS_HZ change for cpu/arm920t/s3c24x0 boards:
? http://lists.denx.de/pipermail/u-boot/2009-September/thread.html,
? JP said it looked OK but needed testing, then it was tested by Wolfgang
- [U-Boot] [PATCH-ARM 1/4, v2] Clean-up of cpu/arm920t and
? cpu/arm920t/s3c24x0 code (this patch): one comment so far (your own)
- [U-Boot] [PATCH-ARM 2/4] Clean-up of s3c24x0 header files:
? http://lists.denx.de/pipermail/u-boot/2009-September/060111.html,
? no comments as yet
- [U-Boot] [PATCH-ARM 3/4, v2] Clean-up of s3c24x0 drivers excluding nand ? driver, http://lists.denx.de/pipermail/u-boot/2009-September/061583.html,
? one comment by Gaye Abdoulaye Walsimou, fixed in v2
- [U-Boot] [PATCH-ARM 4/4, v2] Clean-up of s3c24x0 nand driver, ? http://lists.denx.de/pipermail/u-boot/2009-September/061584.html,
? v1 was Acked by Scott here -
? http://lists.denx.de/pipermail/u-boot/2009-September/060580.html

Quoted 2 lines

But there are remained more works for cleaning

My aim is to clean up just the s3c24x0 common code so I can later add support for the Embest SBC2440-II Board. I can see that the rest of the arm920t code also needs cleaning but this would be a much bigger job and could be done later - I'd rather limit these patches to s3c24x0 code.

Quoted 2 lines

please use lower case name at C structure's members and functions

Quoted 8 lines

I think I have changed all structure names to lower case in the s3c24x0 code. I also think I've changed all function names to lower case except where the change would affect too many other areas - for example, if I change get_HCLK() to get_hclk() in cpu/arm920t/s3c24x0/speed.c I'd also need to change the same in include/common.h, cpu/lh7a40x, arm920t/imx and arm1176/s3c64xx and all functions that call get_HCLK() throughout u-boot. Again, this does need doing but could be done later.

Quoted 5 lines

Kevin,
As nobody seems to have an objection about your changes, I think you can just go ahead and make available
changes to support s3c2440 and your board.

Quoted 13 lines

I've missed the merge window for this u-boot release so I may as well submit the s3c2440 and sbc2440-ii board patches after this release.

So far only 1 of the 5 existing patches has been Ack-ed and 1 tested so I need to get them all accepted by the Samsung ARM custodian for this release.

Quoted 4 lines

Cheers,

You said "run checkpatch.pl and fix any error reports". but there are still remained error.
And please move down to the change log under the "---". change log is not commit message.
This comments are equally to the your other patches.

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net