From mboxrd@z Thu Jan 1 00:00:00 1970 From: kevin.morfitt at fearnside-systems.co.uk Date: Tue, 03 Nov 2009 11:13:01 +0000 Subject: [U-Boot] [PATCH ARM] Clean-up of s3c24x0 header files In-Reply-To: <1f3430fb0911030256p111cd58dufe6f7c08e372af@mail.gmail.com> References: <4AEFF339.9040309@fearnside-systems.co.uk> <1f3430fb0911030256p111cd58dufe6f7c08e372af@mail.gmail.com> Message-ID: <4AF0103D.3050102@fearnside-systems.co.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Minkyu Kang wrote: > Dear Kevin Morfitt > > 2009/11/3 kevin.morfitt at fearnside-systems.co.uk > : >> Cleans up the s3c24x0 header files: > > Thank you for patch > >> s4c24x0.h: removes the use of 'volatile' from the S3C24X0_REG8, >> S3C24X0_REG16 and S3C24X0_REG32 register typedef's. Registers are always >> accessed using the IO accessor functions which cast the register address >> as 'volatile' anyway so it isn't required here. >> >> s3c2400.h and s3c2410.h: insert a blank line between the static inline >> functions. >> >> Signed-off-by: Kevin Morfitt >> --- >> include/asm-arm/arch-s3c24x0/s3c2400.h | 16 ++++++++++++++++ >> include/asm-arm/arch-s3c24x0/s3c2410.h | 17 +++++++++++++++++ >> include/asm-arm/arch-s3c24x0/s3c24x0.h | 6 +++--- >> 3 files changed, 36 insertions(+), 3 deletions(-) >> >> diff --git a/include/asm-arm/arch-s3c24x0/s3c2400.h b/include/asm-arm/arch-s3c24x0/s3c2400.h >> index 26bd4e4..2678be1 100644 >> --- a/include/asm-arm/arch-s3c24x0/s3c2400.h >> +++ b/include/asm-arm/arch-s3c24x0/s3c2400.h >> @@ -67,67 +67,83 @@ static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void) >> { >> return (struct s3c24x0_memctl *)S3C24X0_MEMCTL_BASE; >> } >> + >> static inline struct s3c24x0_usb_host *s3c24x0_get_base_usb_host(void) >> { >> return (struct s3c24x0_usb_host *)S3C24X0_USB_HOST_BASE; >> } >> + >> static inline struct s3c24x0_interrupt *s3c24x0_get_base_interrupt(void) >> { >> return (struct s3c24x0_interrupt *)S3C24X0_INTERRUPT_BASE; >> } >> + >> static inline struct s3c24x0_dmas *s3c24x0_get_base_dmas(void) >> { >> return (struct s3c24x0_dmas *)S3C24X0_DMA_BASE; >> } >> + >> static inline struct s3c24x0_clock_power *s3c24x0_get_base_clock_power(void) >> { >> return (struct s3c24x0_clock_power *)S3C24X0_CLOCK_POWER_BASE; >> } >> + >> static inline struct s3c24x0_lcd *s3c24x0_get_base_lcd(void) >> { >> return (struct s3c24x0_lcd *)S3C24X0_LCD_BASE; >> } >> + >> static inline struct s3c24x0_uart >> *s3c24x0_get_base_uart(enum s3c24x0_uarts_nr n) >> { >> return (struct s3c24x0_uart *)(S3C24X0_UART_BASE + (n * 0x4000)); >> } >> + >> static inline struct s3c24x0_timers *s3c24x0_get_base_timers(void) >> { >> return (struct s3c24x0_timers *)S3C24X0_TIMER_BASE; >> } >> + >> static inline struct s3c24x0_usb_device *s3c24x0_get_base_usb_device(void) >> { >> return (struct s3c24x0_usb_device *)S3C24X0_USB_DEVICE_BASE; >> } >> + >> static inline struct s3c24x0_watchdog *s3c24x0_get_base_watchdog(void) >> { >> return (struct s3c24x0_watchdog *)S3C24X0_WATCHDOG_BASE; >> } >> + >> static inline struct s3c24x0_i2c *s3c24x0_get_base_i2c(void) >> { >> return (struct s3c24x0_i2c *)S3C24X0_I2C_BASE; >> } >> + >> static inline struct s3c24x0_i2s *s3c24x0_get_base_i2s(void) >> { >> return (struct s3c24x0_i2s *)S3C24X0_I2S_BASE; >> } >> + >> static inline struct s3c24x0_gpio *s3c24x0_get_base_gpio(void) >> { >> return (struct s3c24x0_gpio *)S3C24X0_GPIO_BASE; >> } >> + >> static inline struct s3c24x0_rtc *s3c24x0_get_base_rtc(void) >> { >> return (struct s3c24x0_rtc *)S3C24X0_RTC_BASE; >> } >> + >> static inline struct s3c2400_adc *s3c2400_get_base_adc(void) >> { >> return (struct s3c2400_adc *)S3C24X0_ADC_BASE; >> } >> + >> static inline struct s3c24x0_spi *s3c24x0_get_base_spi(void) >> { >> return (struct s3c24x0_spi *)S3C24X0_SPI_BASE; >> } >> + >> static inline struct s3c2400_mmc *s3c2400_get_base_mmc(void) >> { >> return (struct s3c2400_mmc *)S3C2400_MMC_BASE; >> diff --git a/include/asm-arm/arch-s3c24x0/s3c2410.h b/include/asm-arm/arch-s3c24x0/s3c2410.h >> index be2e76e..0543fe1 100644 >> --- a/include/asm-arm/arch-s3c24x0/s3c2410.h >> +++ b/include/asm-arm/arch-s3c24x0/s3c2410.h >> @@ -73,71 +73,88 @@ static inline struct s3c24x0_memctl *s3c24x0_get_base_memctl(void) >> { >> return (struct s3c24x0_memctl *)S3C24X0_MEMCTL_BASE; >> } >> + >> static inline struct s3c24x0_usb_host *s3c24x0_get_base_usb_host(void) >> { >> return (struct s3c24x0_usb_host *)S3C24X0_USB_HOST_BASE; >> } >> + >> static inline struct s3c24x0_interrupt *s3c24x0_get_base_interrupt(void) >> { >> return (struct s3c24x0_interrupt *)S3C24X0_INTERRUPT_BASE; >> } >> + >> static inline struct s3c24x0_dmas *s3c24x0_get_base_dmas(void) >> { >> return (struct s3c24x0_dmas *)S3C24X0_DMA_BASE; >> } >> + >> static inline struct s3c24x0_clock_power *s3c24x0_get_base_clock_power(void) >> { >> return (struct s3c24x0_clock_power *)S3C24X0_CLOCK_POWER_BASE; >> } >> + >> static inline struct s3c24x0_lcd *s3c24x0_get_base_lcd(void) >> { >> return (struct s3c24x0_lcd *)S3C24X0_LCD_BASE; >> } >> + >> static inline struct s3c2410_nand *s3c2410_get_base_nand(void) >> { >> return (struct s3c2410_nand *)S3C2410_NAND_BASE; >> } >> + >> static inline struct s3c24x0_uart >> *s3c24x0_get_base_uart(enum s3c24x0_uarts_nr n) >> { >> return (struct s3c24x0_uart *)(S3C24X0_UART_BASE + (n * 0x4000)); >> } >> + >> static inline struct s3c24x0_timers *s3c24x0_get_base_timers(void) >> { >> return (struct s3c24x0_timers *)S3C24X0_TIMER_BASE; >> } >> + >> static inline struct s3c24x0_usb_device *s3c24x0_get_base_usb_device(void) >> { >> return (struct s3c24x0_usb_device *)S3C24X0_USB_DEVICE_BASE; >> } >> + >> static inline struct s3c24x0_watchdog *s3c24x0_get_base_watchdog(void) >> { >> return (struct s3c24x0_watchdog *)S3C24X0_WATCHDOG_BASE; >> } >> + >> static inline struct s3c24x0_i2c *s3c24x0_get_base_i2c(void) >> { >> return (struct s3c24x0_i2c *)S3C24X0_I2C_BASE; >> } >> + >> static inline struct s3c24x0_i2s *s3c24x0_get_base_i2s(void) >> { >> return (struct s3c24x0_i2s *)S3C24X0_I2S_BASE; >> } >> + >> static inline struct s3c24x0_gpio *s3c24x0_get_base_gpio(void) >> { >> return (struct s3c24x0_gpio *)S3C24X0_GPIO_BASE; >> } >> + >> static inline struct s3c24x0_rtc *s3c24x0_get_base_rtc(void) >> { >> return (struct s3c24x0_rtc *)S3C24X0_RTC_BASE; >> } >> + >> static inline struct s3c2410_adc *s3c2410_get_base_adc(void) >> { >> return (struct s3c2410_adc *)S3C2410_ADC_BASE; >> } >> + >> static inline struct s3c24x0_spi *s3c24x0_get_base_spi(void) >> { >> return (struct s3c24x0_spi *)S3C24X0_SPI_BASE; >> } >> + >> static inline struct s3c2410_sdi *s3c2410_get_base_sdi(void) >> { >> return (struct s3c2410_sdi *)S3C2410_SDI_BASE; >> diff --git a/include/asm-arm/arch-s3c24x0/s3c24x0.h b/include/asm-arm/arch-s3c24x0/s3c24x0.h >> index 56a551a..c363afc 100644 >> --- a/include/asm-arm/arch-s3c24x0/s3c24x0.h >> +++ b/include/asm-arm/arch-s3c24x0/s3c24x0.h >> @@ -31,9 +31,9 @@ >> #ifndef __S3C24X0_H__ >> #define __S3C24X0_H__ >> >> -typedef volatile u8 S3C24X0_REG8; >> -typedef volatile u16 S3C24X0_REG16; >> -typedef volatile u32 S3C24X0_REG32; >> +typedef u8 S3C24X0_REG8; >> +typedef u16 S3C24X0_REG16; >> +typedef u32 S3C24X0_REG32; > > We can remove typedef also. > How about it? I guess so. I see the new s3c64x0 uses u8/16/32 instead. I'll modify it re-send the patch. > >> /* Memory controller (see manual chapter 5) */ >> struct s3c24x0_memctl { >> -- >> 1.6.0.6 >> >> > > Thanks > Minkyu Kang