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
255bae73
Commit
255bae73
authored
Mar 28, 2011
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
into fixes
parents
a737823d
dc7b602d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
13 deletions
+17
-13
arch/arm/mach-dove/include/mach/dove.h
arch/arm/mach-dove/include/mach/dove.h
+1
-1
arch/arm/mach-dove/mpp.c
arch/arm/mach-dove/mpp.c
+0
-3
arch/arm/mach-kirkwood/sheevaplug-setup.c
arch/arm/mach-kirkwood/sheevaplug-setup.c
+7
-0
arch/arm/mach-orion5x/ts78xx-setup.c
arch/arm/mach-orion5x/ts78xx-setup.c
+9
-9
No files found.
arch/arm/mach-dove/include/mach/dove.h
View file @
255bae73
...
...
@@ -136,7 +136,7 @@
#define DOVE_MPP_GENERAL_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe803c)
#define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1)
#define DOVE_NAND_GPIO_EN (1 << 0)
#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_VIRT_BASE + 0x40)
#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_
LO_
VIRT_BASE + 0x40)
#define DOVE_SPI_GPIO_SEL (1 << 5)
#define DOVE_UART1_GPIO_SEL (1 << 4)
#define DOVE_AU1_GPIO_SEL (1 << 3)
...
...
arch/arm/mach-dove/mpp.c
View file @
255bae73
...
...
@@ -147,9 +147,6 @@ void __init dove_mpp_conf(unsigned int *mpp_list)
u32
pmu_sig_ctrl
[
PMU_SIG_REGS
];
int
i
;
/* Initialize gpiolib. */
orion_gpio_init
();
for
(
i
=
0
;
i
<
MPP_NR_REGS
;
i
++
)
mpp_ctrl
[
i
]
=
readl
(
MPP_CTRL
(
i
));
...
...
arch/arm/mach-kirkwood/sheevaplug-setup.c
View file @
255bae73
...
...
@@ -57,6 +57,12 @@ static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
};
static
struct
gpio_led
sheevaplug_led_pins
[]
=
{
{
.
name
=
"plug:red:misc"
,
.
default_trigger
=
"none"
,
.
gpio
=
46
,
.
active_low
=
1
,
},
{
.
name
=
"plug:green:health"
,
.
default_trigger
=
"default-on"
,
...
...
@@ -80,6 +86,7 @@ static struct platform_device sheevaplug_leds = {
static
unsigned
int
sheevaplug_mpp_config
[]
__initdata
=
{
MPP29_GPIO
,
/* USB Power Enable */
MPP46_GPIO
,
/* LED Red */
MPP49_GPIO
,
/* LED */
0
};
...
...
arch/arm/mach-orion5x/ts78xx-setup.c
View file @
255bae73
...
...
@@ -402,7 +402,7 @@ static void ts78xx_fpga_supports(void)
/* enable devices if magic matches */
switch
((
ts78xx_fpga
.
id
>>
8
)
&
0xffffff
)
{
case
TS7800_FPGA_MAGIC
:
pr
intk
(
KERN_WARNING
"TS-7800 FPGA: unrecognized revision 0x%.2x
\n
"
,
pr
_warning
(
"TS-7800 FPGA: unrecognized revision 0x%.2x
\n
"
,
ts78xx_fpga
.
id
&
0xff
);
ts78xx_fpga
.
supports
.
ts_rtc
.
present
=
1
;
ts78xx_fpga
.
supports
.
ts_nand
.
present
=
1
;
...
...
@@ -423,7 +423,7 @@ static int ts78xx_fpga_load_devices(void)
if
(
ts78xx_fpga
.
supports
.
ts_rtc
.
present
==
1
)
{
tmp
=
ts78xx_ts_rtc_load
();
if
(
tmp
)
{
pr
intk
(
KERN_INFO
"TS-78xx: RTC not registered
\n
"
);
pr
_info
(
"TS-78xx: RTC not registered
\n
"
);
ts78xx_fpga
.
supports
.
ts_rtc
.
present
=
0
;
}
ret
|=
tmp
;
...
...
@@ -431,7 +431,7 @@ static int ts78xx_fpga_load_devices(void)
if
(
ts78xx_fpga
.
supports
.
ts_nand
.
present
==
1
)
{
tmp
=
ts78xx_ts_nand_load
();
if
(
tmp
)
{
pr
intk
(
KERN_INFO
"TS-78xx: NAND not registered
\n
"
);
pr
_info
(
"TS-78xx: NAND not registered
\n
"
);
ts78xx_fpga
.
supports
.
ts_nand
.
present
=
0
;
}
ret
|=
tmp
;
...
...
@@ -439,7 +439,7 @@ static int ts78xx_fpga_load_devices(void)
if
(
ts78xx_fpga
.
supports
.
ts_rng
.
present
==
1
)
{
tmp
=
ts78xx_ts_rng_load
();
if
(
tmp
)
{
pr
intk
(
KERN_INFO
"TS-78xx: RNG not registered
\n
"
);
pr
_info
(
"TS-78xx: RNG not registered
\n
"
);
ts78xx_fpga
.
supports
.
ts_rng
.
present
=
0
;
}
ret
|=
tmp
;
...
...
@@ -466,7 +466,7 @@ static int ts78xx_fpga_load(void)
{
ts78xx_fpga
.
id
=
readl
(
TS78XX_FPGA_REGS_VIRT_BASE
);
pr
intk
(
KERN_INFO
"TS-78xx FPGA: magic=0x%.6x, rev=0x%.2x
\n
"
,
pr
_info
(
"TS-78xx FPGA: magic=0x%.6x, rev=0x%.2x
\n
"
,
(
ts78xx_fpga
.
id
>>
8
)
&
0xffffff
,
ts78xx_fpga
.
id
&
0xff
);
...
...
@@ -494,7 +494,7 @@ static int ts78xx_fpga_unload(void)
* UrJTAG SVN since r1381 can be used to reprogram the FPGA
*/
if
(
ts78xx_fpga
.
id
!=
fpga_id
)
{
pr
intk
(
KERN_ERR
"TS-78xx FPGA: magic/rev mismatch
\n
"
pr
_err
(
"TS-78xx FPGA: magic/rev mismatch
\n
"
"TS-78xx FPGA: was 0x%.6x/%.2x but now 0x%.6x/%.2x
\n
"
,
(
ts78xx_fpga
.
id
>>
8
)
&
0xffffff
,
ts78xx_fpga
.
id
&
0xff
,
(
fpga_id
>>
8
)
&
0xffffff
,
fpga_id
&
0xff
);
...
...
@@ -525,7 +525,7 @@ static ssize_t ts78xx_fpga_store(struct kobject *kobj,
int
value
,
ret
;
if
(
ts78xx_fpga
.
state
<
0
)
{
pr
intk
(
KERN_ERR
"TS-78xx FPGA: borked, you must powercycle asap
\n
"
);
pr
_err
(
"TS-78xx FPGA: borked, you must powercycle asap
\n
"
);
return
-
EBUSY
;
}
...
...
@@ -534,7 +534,7 @@ static ssize_t ts78xx_fpga_store(struct kobject *kobj,
else
if
(
strncmp
(
buf
,
"offline"
,
sizeof
(
"offline"
)
-
1
)
==
0
)
value
=
0
;
else
{
pr
intk
(
KERN_ERR
"ts78xx_fpga_store: Invalid value
\n
"
);
pr
_err
(
"ts78xx_fpga_store: Invalid value
\n
"
);
return
-
EINVAL
;
}
...
...
@@ -616,7 +616,7 @@ static void __init ts78xx_init(void)
ret
=
ts78xx_fpga_load
();
ret
=
sysfs_create_file
(
power_kobj
,
&
ts78xx_fpga_attr
.
attr
);
if
(
ret
)
pr
intk
(
KERN_ERR
"sysfs_create_file failed: %d
\n
"
,
ret
);
pr
_err
(
"sysfs_create_file failed: %d
\n
"
,
ret
);
}
MACHINE_START
(
TS78XX
,
"Technologic Systems TS-78xx SBC"
)
...
...
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