Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 20:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git

Browse Source
This commit is contained in:
Russell King 2008-08-26 23:16:39 +01:00 committed by Russell King
commit 9abc6461a3
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
View File

@ -48,11 +48,11 @@
#define S3C2443_CLKSRC_I2S_EPLLREF3 (3<<14)
#define S3C2443_CLKSRC_I2S_MASK (3<<14)
#define S3C2443_CLKSRC_EPLLREF_XTAL (2<<8)
#define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<8)
#define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<8)
#define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<8)
#define S3C2443_CLKSRC_EPLLREF_MASK (3<<8)
#define S3C2443_CLKSRC_EPLLREF_XTAL (2<<7)
#define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<7)
#define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<7)
#define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<7)
#define S3C2443_CLKSRC_EPLLREF_MASK (3<<7)
#define S3C2443_CLKSRC_ESYSCLK_EPLL (1<<6)
#define S3C2443_CLKSRC_MSYSCLK_MPLL (1<<4)

3
arch/arm/mach-s3c2410/nor-simtec.c
View File

@ -30,6 +30,7 @@
#include <mach/bast-map.h>
#include <mach/bast-cpld.h>
#include "nor-simtec.h"
static void simtec_nor_vpp(struct map_info *map, int vpp)
{
@ -50,7 +51,7 @@ static void simtec_nor_vpp(struct map_info *map, int vpp)
local_irq_restore(flags);
}
struct physmap_flash_data simtec_nor_pdata = {
static struct physmap_flash_data simtec_nor_pdata = {
.width = 2,
.set_vpp = simtec_nor_vpp,
.nr_parts = 0,

2
arch/arm/mach-s3c2412/mach-jive.c
View File

@ -395,7 +395,7 @@ static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs)
}
static struct s3c2410_spigpio_info jive_lcd_spi = {
.bus_num = 0,
.bus_num = 1,
.pin_clk = S3C2410_GPG8,
.pin_mosi = S3C2410_GPB8,
.chip_select = jive_lcd_spi_chipselect,

12
arch/arm/plat-s3c24xx/gpiolib.c
View File

@ -39,7 +39,7 @@ static inline struct s3c24xx_gpio_chip *to_s3c_chip(struct gpio_chip *gpc)
* drivers themsevles.
*/
int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset)
static int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset)
{
struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);
void __iomem *base = ourchip->base;
@ -58,7 +58,7 @@ int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset)
return 0;
}
int s3c24xx_gpiolib_output(struct gpio_chip *chip,
static int s3c24xx_gpiolib_output(struct gpio_chip *chip,
unsigned offset, int value)
{
struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);
@ -86,7 +86,8 @@ int s3c24xx_gpiolib_output(struct gpio_chip *chip,
return 0;
}
void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value)
static void s3c24xx_gpiolib_set(struct gpio_chip *chip,
unsigned offset, int value)
{
struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);
void __iomem *base = ourchip->base;
@ -104,7 +105,7 @@ void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value)
local_irq_restore(flags);
}
int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset)
static int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset)
{
struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip);
unsigned long val;
@ -150,8 +151,7 @@ static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip,
return 0;
}
struct s3c24xx_gpio_chip gpios[] = {
static struct s3c24xx_gpio_chip gpios[] = {
[0] = {
.base = S3C24XX_GPIO_BASE(S3C2410_GPA0),
.chip = {

6
arch/arm/plat-s3c24xx/pwm-clock.c
View File

@ -89,7 +89,7 @@ static unsigned long clk_pwm_scaler_getrate(struct clk *clk)
/* TODO - add set rate calls. */
struct clk clk_timer_scaler[] = {
static struct clk clk_timer_scaler[] = {
[0] = {
.name = "pwm-scaler0",
.id = -1,
@ -102,7 +102,7 @@ struct clk clk_timer_scaler[] = {
},
};
struct clk clk_timer_tclk[] = {
static struct clk clk_timer_tclk[] = {
[0] = {
.name = "pwm-tclk0",
.id = -1,
@ -232,7 +232,7 @@ static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate)
return 0;
}
struct pwm_tdiv_clk clk_timer_tdiv[] = {
static struct pwm_tdiv_clk clk_timer_tdiv[] = {
[0] = {
.clk = {
.name = "pwm-tdiv",

5
arch/arm/plat-s3c24xx/pwm.c
View File

@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/pwm.h>
#include <asm/plat-s3c24xx/devs.h>
#include <asm/plat-s3c/regs-timer.h>
struct pwm_device {
@ -38,7 +39,7 @@ struct pwm_device {
unsigned char pwm_id;
};
#define pwm_dbg(_pwm, msg...) dev_info(&(_pwm)->pdev->dev, msg)
#define pwm_dbg(_pwm, msg...) dev_dbg(&(_pwm)->pdev->dev, msg)
static struct clk *clk_scaler[2];
@ -168,7 +169,7 @@ void pwm_disable(struct pwm_device *pwm)
EXPORT_SYMBOL(pwm_disable);
unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq)
static unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq)
{
unsigned long tin_parent_rate;
unsigned int div;