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
24e71ef6
Commit
24e71ef6
authored
Dec 06, 2011
by
Arnd Bergmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixes' of
git://gitorious.org/linux-davinci/linux-davinci
into fixes
parents
af726172
45fc4cce
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
16 deletions
+18
-16
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/board-da850-evm.c
+1
-1
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/mach-davinci/board-dm365-evm.c
+1
-1
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-davinci/board-dm646x-evm.c
+3
-3
arch/arm/mach-davinci/dm646x.c
arch/arm/mach-davinci/dm646x.c
+0
-1
arch/arm/mach-davinci/include/mach/psc.h
arch/arm/mach-davinci/include/mach/psc.h
+4
-1
arch/arm/mach-davinci/psc.c
arch/arm/mach-davinci/psc.c
+9
-9
No files found.
arch/arm/mach-davinci/board-da850-evm.c
View file @
24e71ef6
...
...
@@ -753,7 +753,7 @@ static struct snd_platform_data da850_evm_snd_data = {
.
num_serializer
=
ARRAY_SIZE
(
da850_iis_serializer_direction
),
.
tdm_slots
=
2
,
.
serial_dir
=
da850_iis_serializer_direction
,
.
asp_chan_q
=
EVENTQ_
1
,
.
asp_chan_q
=
EVENTQ_
0
,
.
version
=
MCASP_VERSION_2
,
.
txnumevt
=
1
,
.
rxnumevt
=
1
,
...
...
arch/arm/mach-davinci/board-dm365-evm.c
View file @
24e71ef6
...
...
@@ -107,7 +107,7 @@ static struct mtd_partition davinci_nand_partitions[] = {
/* UBL (a few copies) plus U-Boot */
.
name
=
"bootloader"
,
.
offset
=
0
,
.
size
=
28
*
NAND_BLOCK_SIZE
,
.
size
=
30
*
NAND_BLOCK_SIZE
,
.
mask_flags
=
MTD_WRITEABLE
,
/* force read-only */
},
{
/* U-Boot environment */
...
...
arch/arm/mach-davinci/board-dm646x-evm.c
View file @
24e71ef6
...
...
@@ -564,7 +564,7 @@ static int setup_vpif_input_channel_mode(int mux_mode)
int
val
;
u32
value
;
if
(
!
vpif_v
sclkdis
_reg
||
!
cpld_client
)
if
(
!
vpif_v
idclkctl
_reg
||
!
cpld_client
)
return
-
ENXIO
;
val
=
i2c_smbus_read_byte
(
cpld_client
);
...
...
@@ -572,7 +572,7 @@ static int setup_vpif_input_channel_mode(int mux_mode)
return
val
;
spin_lock_irqsave
(
&
vpif_reg_lock
,
flags
);
value
=
__raw_readl
(
vpif_v
sclkdis
_reg
);
value
=
__raw_readl
(
vpif_v
idclkctl
_reg
);
if
(
mux_mode
)
{
val
&=
VPIF_INPUT_TWO_CHANNEL
;
value
|=
VIDCH1CLK
;
...
...
@@ -580,7 +580,7 @@ static int setup_vpif_input_channel_mode(int mux_mode)
val
|=
VPIF_INPUT_ONE_CHANNEL
;
value
&=
~
VIDCH1CLK
;
}
__raw_writel
(
value
,
vpif_v
sclkdis
_reg
);
__raw_writel
(
value
,
vpif_v
idclkctl
_reg
);
spin_unlock_irqrestore
(
&
vpif_reg_lock
,
flags
);
err
=
i2c_smbus_write_byte
(
cpld_client
,
val
);
...
...
arch/arm/mach-davinci/dm646x.c
View file @
24e71ef6
...
...
@@ -161,7 +161,6 @@ static struct clk dsp_clk = {
.
name
=
"dsp"
,
.
parent
=
&
pll1_sysclk1
,
.
lpsc
=
DM646X_LPSC_C64X_CPU
,
.
flags
=
PSC_DSP
,
.
usecount
=
1
,
/* REVISIT how to disable? */
};
...
...
arch/arm/mach-davinci/include/mach/psc.h
View file @
24e71ef6
...
...
@@ -233,7 +233,7 @@
#define PTCMD 0x120
#define PTSTAT 0x128
#define PDSTAT 0x200
#define PDCTL
1 0x304
#define PDCTL
0x300
#define MDSTAT 0x800
#define MDCTL 0xA00
...
...
@@ -244,7 +244,10 @@
#define PSC_STATE_ENABLE 3
#define MDSTAT_STATE_MASK 0x3f
#define PDSTAT_STATE_MASK 0x1f
#define MDCTL_FORCE BIT(31)
#define PDCTL_NEXT BIT(1)
#define PDCTL_EPCGOOD BIT(8)
#ifndef __ASSEMBLER__
...
...
arch/arm/mach-davinci/psc.c
View file @
24e71ef6
...
...
@@ -52,7 +52,7 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id)
void
davinci_psc_config
(
unsigned
int
domain
,
unsigned
int
ctlr
,
unsigned
int
id
,
bool
enable
,
u32
flags
)
{
u32
epcpr
,
ptcmd
,
ptstat
,
pdstat
,
pdctl
1
,
mdstat
,
mdctl
;
u32
epcpr
,
ptcmd
,
ptstat
,
pdstat
,
pdctl
,
mdstat
,
mdctl
;
void
__iomem
*
psc_base
;
struct
davinci_soc_info
*
soc_info
=
&
davinci_soc_info
;
u32
next_state
=
PSC_STATE_ENABLE
;
...
...
@@ -79,11 +79,11 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr,
mdctl
|=
MDCTL_FORCE
;
__raw_writel
(
mdctl
,
psc_base
+
MDCTL
+
4
*
id
);
pdstat
=
__raw_readl
(
psc_base
+
PDSTAT
);
if
((
pdstat
&
0x00000001
)
==
0
)
{
pdctl
1
=
__raw_readl
(
psc_base
+
PDCTL1
);
pdctl
1
|=
0x1
;
__raw_writel
(
pdctl
1
,
psc_base
+
PDCTL1
);
pdstat
=
__raw_readl
(
psc_base
+
PDSTAT
+
4
*
domain
);
if
((
pdstat
&
PDSTAT_STATE_MASK
)
==
0
)
{
pdctl
=
__raw_readl
(
psc_base
+
PDCTL
+
4
*
domain
);
pdctl
|=
PDCTL_NEXT
;
__raw_writel
(
pdctl
,
psc_base
+
PDCTL
+
4
*
domain
);
ptcmd
=
1
<<
domain
;
__raw_writel
(
ptcmd
,
psc_base
+
PTCMD
);
...
...
@@ -92,9 +92,9 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr,
epcpr
=
__raw_readl
(
psc_base
+
EPCPR
);
}
while
((((
epcpr
>>
domain
)
&
1
)
==
0
));
pdctl
1
=
__raw_readl
(
psc_base
+
PDCTL1
);
pdctl
1
|=
0x100
;
__raw_writel
(
pdctl
1
,
psc_base
+
PDCTL1
);
pdctl
=
__raw_readl
(
psc_base
+
PDCTL
+
4
*
domain
);
pdctl
|=
PDCTL_EPCGOOD
;
__raw_writel
(
pdctl
,
psc_base
+
PDCTL
+
4
*
domain
);
}
else
{
ptcmd
=
1
<<
domain
;
__raw_writel
(
ptcmd
,
psc_base
+
PTCMD
);
...
...
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