Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9abc6461
Commit
9abc6461
authored
Aug 26, 2008
by
Russell King
Committed by
Russell King
Aug 26, 2008
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 's3c2410' of
git://aeryn.fluff.org.uk/bjdooks/linux.git
parents
f8787fdc
78af4735
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
18 deletions
+20
-18
arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
+5
-5
arch/arm/mach-s3c2410/nor-simtec.c
arch/arm/mach-s3c2410/nor-simtec.c
+2
-1
arch/arm/mach-s3c2412/mach-jive.c
arch/arm/mach-s3c2412/mach-jive.c
+1
-1
arch/arm/plat-s3c24xx/gpiolib.c
arch/arm/plat-s3c24xx/gpiolib.c
+6
-6
arch/arm/plat-s3c24xx/pwm-clock.c
arch/arm/plat-s3c24xx/pwm-clock.c
+3
-3
arch/arm/plat-s3c24xx/pwm.c
arch/arm/plat-s3c24xx/pwm.c
+3
-2
No files found.
arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
View file @
9abc6461
...
...
@@ -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)
...
...
arch/arm/mach-s3c2410/nor-simtec.c
View file @
9abc6461
...
...
@@ -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
=
{
st
atic
st
ruct
physmap_flash_data
simtec_nor_pdata
=
{
.
width
=
2
,
.
set_vpp
=
simtec_nor_vpp
,
.
nr_parts
=
0
,
...
...
arch/arm/mach-s3c2412/mach-jive.c
View file @
9abc6461
...
...
@@ -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
,
...
...
arch/arm/plat-s3c24xx/gpiolib.c
View file @
9abc6461
...
...
@@ -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
=
{
...
...
arch/arm/plat-s3c24xx/pwm-clock.c
View file @
9abc6461
...
...
@@ -89,7 +89,7 @@ static unsigned long clk_pwm_scaler_getrate(struct clk *clk)
/* TODO - add set rate calls. */
struct
clk
clk_timer_scaler
[]
=
{
st
atic
st
ruct
clk
clk_timer_scaler
[]
=
{
[
0
]
=
{
.
name
=
"pwm-scaler0"
,
.
id
=
-
1
,
...
...
@@ -102,7 +102,7 @@ struct clk clk_timer_scaler[] = {
},
};
struct
clk
clk_timer_tclk
[]
=
{
st
atic
st
ruct
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
[]
=
{
st
atic
st
ruct
pwm_tdiv_clk
clk_timer_tdiv
[]
=
{
[
0
]
=
{
.
clk
=
{
.
name
=
"pwm-tdiv"
,
...
...
arch/arm/plat-s3c24xx/pwm.c
View file @
9abc6461
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment