Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
16c95ddb
Commit
16c95ddb
authored
Sep 15, 2009
by
Stephen Rothwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit 'cris/for-next'
parents
2f4f972d
62f589c5
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
35 additions
and
32 deletions
+35
-32
arch/cris/arch-v10/kernel/time.c
arch/cris/arch-v10/kernel/time.c
+0
-1
arch/cris/arch-v32/kernel/smp.c
arch/cris/arch-v32/kernel/smp.c
+0
-2
arch/cris/arch-v32/kernel/time.c
arch/cris/arch-v32/kernel/time.c
+0
-1
arch/cris/arch-v32/mach-a3/io.c
arch/cris/arch-v32/mach-a3/io.c
+1
-1
arch/cris/arch-v32/mach-fs/io.c
arch/cris/arch-v32/mach-fs/io.c
+1
-1
arch/cris/include/arch-v10/arch/mmu.h
arch/cris/include/arch-v10/arch/mmu.h
+5
-4
arch/cris/include/arch-v32/arch/mmu.h
arch/cris/include/arch-v32/arch/mmu.h
+6
-4
arch/cris/include/asm/hardirq.h
arch/cris/include/asm/hardirq.h
+2
-10
arch/cris/include/asm/pgtable.h
arch/cris/include/asm/pgtable.h
+2
-0
arch/cris/kernel/irq.c
arch/cris/kernel/irq.c
+0
-5
drivers/net/cris/eth_v10.c
drivers/net/cris/eth_v10.c
+17
-3
drivers/serial/crisv10.c
drivers/serial/crisv10.c
+1
-0
No files found.
arch/cris/arch-v10/kernel/time.c
View file @
16c95ddb
...
...
@@ -28,7 +28,6 @@
extern
void
update_xtime_from_cmos
(
void
);
extern
int
set_rtc_mmss
(
unsigned
long
nowtime
);
extern
int
setup_irq
(
int
,
struct
irqaction
*
);
extern
int
have_rtc
;
unsigned
long
get_ns_in_jiffie
(
void
)
...
...
arch/cris/arch-v32/kernel/smp.c
View file @
16c95ddb
...
...
@@ -52,8 +52,6 @@ static struct mm_struct* flush_mm;
static
struct
vm_area_struct
*
flush_vma
;
static
unsigned
long
flush_addr
;
extern
int
setup_irq
(
int
,
struct
irqaction
*
);
/* Mode registers */
static
unsigned
long
irq_regs
[
NR_CPUS
]
=
{
regi_irq
,
...
...
arch/cris/arch-v32/kernel/time.c
View file @
16c95ddb
...
...
@@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] =
extern
void
update_xtime_from_cmos
(
void
);
extern
int
set_rtc_mmss
(
unsigned
long
nowtime
);
extern
int
setup_irq
(
int
,
struct
irqaction
*
);
extern
int
have_rtc
;
#ifdef CONFIG_CPU_FREQ
...
...
arch/cris/arch-v32/mach-a3/io.c
View file @
16c95ddb
...
...
@@ -36,7 +36,7 @@ struct crisv32_ioport crisv32_ioports[] = {
},
};
#define NBR_OF_PORTS
sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport
)
#define NBR_OF_PORTS
ARRAY_SIZE(crisv32_ioports
)
struct
crisv32_iopin
crisv32_led_net0_green
;
struct
crisv32_iopin
crisv32_led_net0_red
;
...
...
arch/cris/arch-v32/mach-fs/io.c
View file @
16c95ddb
...
...
@@ -52,7 +52,7 @@ struct crisv32_ioport crisv32_ioports[] = {
}
};
#define NBR_OF_PORTS
sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport
)
#define NBR_OF_PORTS
ARRAY_SIZE(crisv32_ioports
)
struct
crisv32_iopin
crisv32_led_net0_green
;
struct
crisv32_iopin
crisv32_led_net0_red
;
...
...
arch/cris/include/arch-v10/arch/mmu.h
View file @
16c95ddb
...
...
@@ -33,10 +33,10 @@ typedef struct
/* CRIS PTE bits (see R_TLB_LO in the register description)
*
* Bit: 31
-13 12-------4 3 2 1 0
* ________________________________________________
* | pfn | reserved | global | valid | kernel | we |
* |_____|__________|________|_______|________|_____|
* Bit: 31
30-13 12-------4 3 2 1 0
* ________________________________________________
_______
* |
cache |
pfn | reserved | global | valid | kernel | we |
* |_____
__|____
|__________|________|_______|________|_____|
*
* (pfn = physical frame number)
*/
...
...
@@ -53,6 +53,7 @@ typedef struct
#define _PAGE_VALID (1<<2)
/* page is valid */
#define _PAGE_SILENT_READ (1<<2)
/* synonym */
#define _PAGE_GLOBAL (1<<3)
/* global page - context is ignored */
#define _PAGE_NO_CACHE (1<<31)
/* part of the uncached memory map */
/* Bits the HW doesn't care about but the kernel uses them in SW */
...
...
arch/cris/include/arch-v32/arch/mmu.h
View file @
16c95ddb
...
...
@@ -28,10 +28,10 @@ typedef struct
/*
* CRISv32 PTE bits:
*
* Bit:
31
-13 12-5 4 3 2 1 0
* +-----+------+--------+-------+--------+-------+---------+
* | pfn | zero | global | valid | kernel | write | execute |
* +-----+------+--------+-------+--------+-------+---------+
* Bit:
31 30
-13 12-5 4 3 2 1 0
* +-----
--+-----
+------+--------+-------+--------+-------+---------+
* |
cache |
pfn | zero | global | valid | kernel | write | execute |
* +-----
--+-----
+------+--------+-------+--------+-------+---------+
*/
/*
...
...
@@ -45,6 +45,8 @@ typedef struct
#define _PAGE_VALID (1 << 3)
/* Page is valid. */
#define _PAGE_SILENT_READ (1 << 3)
/* Same as above. */
#define _PAGE_GLOBAL (1 << 4)
/* Global page. */
#define _PAGE_NO_CACHE (1 << 31)
/* part of the uncached memory map */
/*
* The hardware doesn't care about these bits, but the kernel uses them in
...
...
arch/cris/include/asm/hardirq.h
View file @
16c95ddb
...
...
@@ -2,16 +2,6 @@
#define __ASM_HARDIRQ_H
#include <asm/irq.h>
#include <linux/threads.h>
#include <linux/cache.h>
typedef
struct
{
unsigned
int
__softirq_pending
;
}
____cacheline_aligned
irq_cpustat_t
;
#include <linux/irq_cpustat.h>
/* Standard mappings for irq_cpustat_t above */
void
ack_bad_irq
(
unsigned
int
irq
);
#define HARDIRQ_BITS 8
...
...
@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq);
# error HARDIRQ_BITS is too low!
#endif
#include <asm-generic/hardirq.h>
#endif
/* __ASM_HARDIRQ_H */
arch/cris/include/asm/pgtable.h
View file @
16c95ddb
...
...
@@ -197,6 +197,8 @@ static inline pte_t __mk_pte(void * page, pgprot_t pgprot)
static
inline
pte_t
pte_modify
(
pte_t
pte
,
pgprot_t
newprot
)
{
pte_val
(
pte
)
=
(
pte_val
(
pte
)
&
_PAGE_CHG_MASK
)
|
pgprot_val
(
newprot
);
return
pte
;
}
#define pgprot_noncached(prot) __pgprot((pgprot_val(prot) | _PAGE_NO_CACHE))
/* pte_val refers to a page in the 0x4xxxxxxx physical DRAM interval
* __pte_page(pte_val) refers to the "virtual" DRAM interval
...
...
arch/cris/kernel/irq.c
View file @
16c95ddb
...
...
@@ -38,11 +38,6 @@
#include <asm/io.h>
void
ack_bad_irq
(
unsigned
int
irq
)
{
printk
(
"unexpected IRQ trap at vector %02x
\n
"
,
irq
);
}
int
show_interrupts
(
struct
seq_file
*
p
,
void
*
v
)
{
int
i
=
*
(
loff_t
*
)
v
,
j
;
...
...
drivers/net/cris/eth_v10.c
View file @
16c95ddb
...
...
@@ -768,10 +768,24 @@ e100_negotiate(struct net_device* dev)
e100_set_mdio_reg
(
dev
,
np
->
mii_if
.
phy_id
,
MII_ADVERTISE
,
data
);
/* Renegotiate with link partner */
data
=
e100_get_mdio_reg
(
dev
,
np
->
mii_if
.
phy_id
,
MII_BMCR
);
if
(
autoneg_normal
)
{
data
=
e100_get_mdio_reg
(
dev
,
np
->
mii_if
.
phy_id
,
MII_BMCR
);
data
|=
BMCR_ANENABLE
|
BMCR_ANRESTART
;
/* Renegotiate with link partner */
data
|=
BMCR_ANENABLE
|
BMCR_ANRESTART
;
}
else
{
/* Don't negotiate speed or duplex */
data
&=
~
(
BMCR_ANENABLE
|
BMCR_ANRESTART
);
/* Set speed and duplex static */
if
(
current_speed_selection
==
10
)
data
&=
~
BMCR_SPEED100
;
else
data
|=
BMCR_SPEED100
;
if
(
current_duplex
!=
full
)
data
&=
~
BMCR_FULLDPLX
;
else
data
|=
BMCR_FULLDPLX
;
}
e100_set_mdio_reg
(
dev
,
np
->
mii_if
.
phy_id
,
MII_BMCR
,
data
);
}
...
...
drivers/serial/crisv10.c
View file @
16c95ddb
...
...
@@ -18,6 +18,7 @@ static char *serial_version = "$Revision: 1.25 $";
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/smp_lock.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/mm.h>
...
...
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