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
0a2cdd88
Commit
0a2cdd88
authored
Oct 11, 2007
by
Josh Boyer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'virtex-for-2.6.24' of
git://git.secretlab.ca/git/linux-2.6-virtex
into for-2.6.24-4xx
parents
cdec12ae
17c5c209
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
203 additions
and
84 deletions
+203
-84
MAINTAINERS
MAINTAINERS
+1
-1
arch/powerpc/boot/uartlite.c
arch/powerpc/boot/uartlite.c
+2
-2
arch/powerpc/sysdev/Makefile
arch/powerpc/sysdev/Makefile
+1
-1
drivers/video/xilinxfb.c
drivers/video/xilinxfb.c
+199
-80
No files found.
MAINTAINERS
View file @
0a2cdd88
...
...
@@ -2306,7 +2306,7 @@ S: Maintained
LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
P: Grant Likely
M: grant.likely@secretlab.ca
W: http://w
ww.secretlab.ca/
W: http://w
iki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
L: linuxppc-dev@ozlabs.org
S: Maintained
...
...
arch/powerpc/boot/uartlite.c
View file @
0a2cdd88
...
...
@@ -45,8 +45,8 @@ static void uartlite_putc(unsigned char c)
static
unsigned
char
uartlite_getc
(
void
)
{
u32
reg
=
ULITE_STATUS_RXVALID
;
while
(
reg
&
ULITE_STATUS_RXVALID
)
/* spin on
RXVALID bit */
u32
reg
=
0
;
while
(
!
(
reg
&
ULITE_STATUS_RXVALID
))
/* spin waiting for
RXVALID bit */
reg
=
in_be32
(
reg_base
+
ULITE_STATUS
);
return
in_be32
(
reg_base
+
ULITE_RX
);
}
...
...
arch/powerpc/sysdev/Makefile
View file @
0a2cdd88
...
...
@@ -6,7 +6,6 @@ mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o
obj-$(CONFIG_MPIC)
+=
mpic.o
$
(
mpic-msi-obj-y
)
obj-$(CONFIG_PPC_MPC106)
+=
grackle.o
obj-$(CONFIG_PPC_DCR)
+=
dcr.o
obj-$(CONFIG_PPC_DCR_NATIVE)
+=
dcr-low.o
obj-$(CONFIG_PPC_PMI)
+=
pmi.o
obj-$(CONFIG_U3_DART)
+=
dart_iommu.o
...
...
@@ -33,6 +32,7 @@ endif
ifeq
($(ARCH),powerpc)
obj-$(CONFIG_CPM)
+=
cpm_common.o
obj-$(CONFIG_CPM2)
+=
cpm2_common.o cpm2_pic.o
obj-$(CONFIG_PPC_DCR)
+=
dcr.o
obj-$(CONFIG_8xx)
+=
mpc8xx_pic.o commproc.o
obj-$(CONFIG_UCODE_PATCH)
+=
micropatch.o
endif
drivers/video/xilinxfb.c
View file @
0a2cdd88
This diff is collapsed.
Click to expand it.
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