Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code
PATCH v3 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code
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
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.
---
Changes in v2: re-formatted patch to remove line wrapping Changes in v3: removed checkpatch.pl errors
moved change log
cpu/arm920t/s3c24x0/interrupts.c | 4 +- cpu/arm920t/s3c24x0/speed.c | 42 +- cpu/arm920t/s3c24x0/timer.c | 74 ++- cpu/arm920t/s3c24x0/usb.c | 30 +- cpu/arm920t/s3c24x0/usb_ohci.c | 1323 ++++++++++++++++++++------------------ cpu/arm920t/s3c24x0/usb_ohci.h | 209 +++--- cpu/arm920t/start.S | 63 +- 7 files changed, 915 insertions(+), 830 deletions(-)
cpu/arm920t/s3c24x0/interrupts.c +2 -2
@@ -40,7 +40,7 @@void do_irq (struct pt_regs *pt_regs) { -S3C24X0_INTERRUPT * irq =S3C24X0_GetBase_INTERRUPT (); -u_int32_t intpnd = irq->INTPND; +struct s3c24x0_interrupt *irq =s3c24x0_get_base_interrupt (); +u_int32_t intpnd =readl (&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
@@ -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 +698 -625
2,099 lines not on this page · raw message
cpu/arm920t/s3c24x0/usb_ohci.h +102 -107
315 lines not on this page · raw message
cpu/arm920t/start.S +33 -30
133 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH v3 1/4 Clean-up of cpu_arm920t and cpu_arm920t_s3c24x0 code
Dear kevin.morfitt
2009/10/10 kevin.morfitt at fearnside-systems.co.uk <[email protected]>:
Quoted 26 lines
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 reportsIt assumes the following patch has been applied first:
- [U-Boot][PATCH-ARM]CONFIG_SYS_HZfix for ARM902T S3C24X0 Boards, 05/09/2009Tested 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.
Signed-off-by Kevin Morfitt <[email protected]>---
Changes in v2: re-formatted patch to remove line wrapping Changes in v3: removed checkpatch.pl errors
? ? ? ? ? ? ? moved change log
Quoted 9 lines
?cpu/arm920t/s3c24x0/interrupts.c | ? ?4 +- ?cpu/arm920t/s3c24x0/speed.c ? ? ?| ? 42 +- ?cpu/arm920t/s3c24x0/timer.c ? ? ?| ? 74 ++- ?cpu/arm920t/s3c24x0/usb.c ? ? ? ?| ? 30 +- ?cpu/arm920t/s3c24x0/usb_ohci.c ? | 1323 ++++++++++++++++++++------------------ ?cpu/arm920t/s3c24x0/usb_ohci.h ? | ?209 +++--- ?cpu/arm920t/start.S ? ? ? ? ? ? ?| ? 63 +-?7 files changed, 915 insertions(+), 830 deletions(-)
applied to u-boot-samsung
Thanks
Minkyu Kang
Signature · 2 lines
from. prom. www.promsoft.net