Merge branch 'sh/urgent' into sh-latest
This commit is contained in:
commit
7d0dbea312
|
@ -0,0 +1,22 @@
|
||||||
|
What: /proc/<pid>/oom_adj
|
||||||
|
When: August 2012
|
||||||
|
Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's
|
||||||
|
badness heuristic used to determine which task to kill when the kernel
|
||||||
|
is out of memory.
|
||||||
|
|
||||||
|
The badness heuristic has since been rewritten since the introduction of
|
||||||
|
this tunable such that its meaning is deprecated. The value was
|
||||||
|
implemented as a bitshift on a score generated by the badness()
|
||||||
|
function that did not have any precise units of measure. With the
|
||||||
|
rewrite, the score is given as a proportion of available memory to the
|
||||||
|
task allocating pages, so using a bitshift which grows the score
|
||||||
|
exponentially is, thus, impossible to tune with fine granularity.
|
||||||
|
|
||||||
|
A much more powerful interface, /proc/<pid>/oom_score_adj, was
|
||||||
|
introduced with the oom killer rewrite that allows users to increase or
|
||||||
|
decrease the badness() score linearly. This interface will replace
|
||||||
|
/proc/<pid>/oom_adj.
|
||||||
|
|
||||||
|
A warning will be emitted to the kernel log if an application uses this
|
||||||
|
deprecated interface. After it is printed once, future warnings will be
|
||||||
|
suppressed until the kernel is rebooted.
|
|
@ -79,10 +79,6 @@
|
||||||
</sect2>
|
</sect2>
|
||||||
</sect1>
|
</sect1>
|
||||||
</chapter>
|
</chapter>
|
||||||
<chapter id="clk">
|
|
||||||
<title>Clock Framework Extensions</title>
|
|
||||||
!Iinclude/linux/sh_clk.h
|
|
||||||
</chapter>
|
|
||||||
<chapter id="mach">
|
<chapter id="mach">
|
||||||
<title>Machine Specific Interfaces</title>
|
<title>Machine Specific Interfaces</title>
|
||||||
<sect1 id="dreamcast">
|
<sect1 id="dreamcast">
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
</orgname>
|
</orgname>
|
||||||
|
|
||||||
<address>
|
<address>
|
||||||
<email>hjk@linutronix.de</email>
|
<email>hjk@hansjkoch.de</email>
|
||||||
</address>
|
</address>
|
||||||
</affiliation>
|
</affiliation>
|
||||||
</author>
|
</author>
|
||||||
|
@ -114,7 +114,7 @@ GPL version 2.
|
||||||
|
|
||||||
<para>If you know of any translations for this document, or you are
|
<para>If you know of any translations for this document, or you are
|
||||||
interested in translating it, please email me
|
interested in translating it, please email me
|
||||||
<email>hjk@linutronix.de</email>.
|
<email>hjk@hansjkoch.de</email>.
|
||||||
</para>
|
</para>
|
||||||
</sect1>
|
</sect1>
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ interested in translating it, please email me
|
||||||
<title>Feedback</title>
|
<title>Feedback</title>
|
||||||
<para>Find something wrong with this document? (Or perhaps something
|
<para>Find something wrong with this document? (Or perhaps something
|
||||||
right?) I would love to hear from you. Please email me at
|
right?) I would love to hear from you. Please email me at
|
||||||
<email>hjk@linutronix.de</email>.</para>
|
<email>hjk@hansjkoch.de</email>.</para>
|
||||||
</sect1>
|
</sect1>
|
||||||
</chapter>
|
</chapter>
|
||||||
|
|
||||||
|
|
|
@ -255,9 +255,10 @@ framebuffer parameters.
|
||||||
Kernel boot arguments
|
Kernel boot arguments
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
vram=<size>
|
vram=<size>[,<physaddr>]
|
||||||
- Amount of total VRAM to preallocate. For example, "10M". omapfb
|
- Amount of total VRAM to preallocate and optionally a physical start
|
||||||
allocates memory for framebuffers from VRAM.
|
memory address. For example, "10M". omapfb allocates memory for
|
||||||
|
framebuffers from VRAM.
|
||||||
|
|
||||||
omapfb.mode=<display>:<mode>[,...]
|
omapfb.mode=<display>:<mode>[,...]
|
||||||
- Default video mode for specified displays. For example,
|
- Default video mode for specified displays. For example,
|
||||||
|
|
|
@ -16,7 +16,7 @@ you can do so by typing:
|
||||||
As of the Linux 2.6.10 kernel, it is now possible to change the
|
As of the Linux 2.6.10 kernel, it is now possible to change the
|
||||||
IO scheduler for a given block device on the fly (thus making it possible,
|
IO scheduler for a given block device on the fly (thus making it possible,
|
||||||
for instance, to set the CFQ scheduler for the system default, but
|
for instance, to set the CFQ scheduler for the system default, but
|
||||||
set a specific device to use the anticipatory or noop schedulers - which
|
set a specific device to use the deadline or noop schedulers - which
|
||||||
can improve that device's throughput).
|
can improve that device's throughput).
|
||||||
|
|
||||||
To set a specific scheduler, simply do this:
|
To set a specific scheduler, simply do this:
|
||||||
|
@ -31,7 +31,7 @@ a "cat /sys/block/DEV/queue/scheduler" - the list of valid names
|
||||||
will be displayed, with the currently selected scheduler in brackets:
|
will be displayed, with the currently selected scheduler in brackets:
|
||||||
|
|
||||||
# cat /sys/block/hda/queue/scheduler
|
# cat /sys/block/hda/queue/scheduler
|
||||||
noop anticipatory deadline [cfq]
|
noop deadline [cfq]
|
||||||
# echo anticipatory > /sys/block/hda/queue/scheduler
|
# echo deadline > /sys/block/hda/queue/scheduler
|
||||||
# cat /sys/block/hda/queue/scheduler
|
# cat /sys/block/hda/queue/scheduler
|
||||||
noop [anticipatory] deadline cfq
|
noop [deadline] cfq
|
||||||
|
|
|
@ -154,7 +154,7 @@ The stages that a patch goes through are, generally:
|
||||||
inclusion, it should be accepted by a relevant subsystem maintainer -
|
inclusion, it should be accepted by a relevant subsystem maintainer -
|
||||||
though this acceptance is not a guarantee that the patch will make it
|
though this acceptance is not a guarantee that the patch will make it
|
||||||
all the way to the mainline. The patch will show up in the maintainer's
|
all the way to the mainline. The patch will show up in the maintainer's
|
||||||
subsystem tree and into the staging trees (described below). When the
|
subsystem tree and into the -next trees (described below). When the
|
||||||
process works, this step leads to more extensive review of the patch and
|
process works, this step leads to more extensive review of the patch and
|
||||||
the discovery of any problems resulting from the integration of this
|
the discovery of any problems resulting from the integration of this
|
||||||
patch with work being done by others.
|
patch with work being done by others.
|
||||||
|
@ -236,7 +236,7 @@ finding the right maintainer. Sending patches directly to Linus is not
|
||||||
normally the right way to go.
|
normally the right way to go.
|
||||||
|
|
||||||
|
|
||||||
2.4: STAGING TREES
|
2.4: NEXT TREES
|
||||||
|
|
||||||
The chain of subsystem trees guides the flow of patches into the kernel,
|
The chain of subsystem trees guides the flow of patches into the kernel,
|
||||||
but it also raises an interesting question: what if somebody wants to look
|
but it also raises an interesting question: what if somebody wants to look
|
||||||
|
@ -250,7 +250,7 @@ changes land in the mainline kernel. One could pull changes from all of
|
||||||
the interesting subsystem trees, but that would be a big and error-prone
|
the interesting subsystem trees, but that would be a big and error-prone
|
||||||
job.
|
job.
|
||||||
|
|
||||||
The answer comes in the form of staging trees, where subsystem trees are
|
The answer comes in the form of -next trees, where subsystem trees are
|
||||||
collected for testing and review. The older of these trees, maintained by
|
collected for testing and review. The older of these trees, maintained by
|
||||||
Andrew Morton, is called "-mm" (for memory management, which is how it got
|
Andrew Morton, is called "-mm" (for memory management, which is how it got
|
||||||
started). The -mm tree integrates patches from a long list of subsystem
|
started). The -mm tree integrates patches from a long list of subsystem
|
||||||
|
@ -275,7 +275,7 @@ directory at:
|
||||||
Use of the MMOTM tree is likely to be a frustrating experience, though;
|
Use of the MMOTM tree is likely to be a frustrating experience, though;
|
||||||
there is a definite chance that it will not even compile.
|
there is a definite chance that it will not even compile.
|
||||||
|
|
||||||
The other staging tree, started more recently, is linux-next, maintained by
|
The other -next tree, started more recently, is linux-next, maintained by
|
||||||
Stephen Rothwell. The linux-next tree is, by design, a snapshot of what
|
Stephen Rothwell. The linux-next tree is, by design, a snapshot of what
|
||||||
the mainline is expected to look like after the next merge window closes.
|
the mainline is expected to look like after the next merge window closes.
|
||||||
Linux-next trees are announced on the linux-kernel and linux-next mailing
|
Linux-next trees are announced on the linux-kernel and linux-next mailing
|
||||||
|
@ -303,12 +303,25 @@ volatility of linux-next tends to make it a difficult development target.
|
||||||
See http://lwn.net/Articles/289013/ for more information on this topic, and
|
See http://lwn.net/Articles/289013/ for more information on this topic, and
|
||||||
stay tuned; much is still in flux where linux-next is involved.
|
stay tuned; much is still in flux where linux-next is involved.
|
||||||
|
|
||||||
Besides the mmotm and linux-next trees, the kernel source tree now contains
|
2.4.1: STAGING TREES
|
||||||
the drivers/staging/ directory and many sub-directories for drivers or
|
|
||||||
filesystems that are on their way to being added to the kernel tree
|
|
||||||
proper, but they remain in drivers/staging/ while they still need more
|
|
||||||
work.
|
|
||||||
|
|
||||||
|
The kernel source tree now contains the drivers/staging/ directory, where
|
||||||
|
many sub-directories for drivers or filesystems that are on their way to
|
||||||
|
being added to the kernel tree live. They remain in drivers/staging while
|
||||||
|
they still need more work; once complete, they can be moved into the
|
||||||
|
kernel proper. This is a way to keep track of drivers that aren't
|
||||||
|
up to Linux kernel coding or quality standards, but people may want to use
|
||||||
|
them and track development.
|
||||||
|
|
||||||
|
Greg Kroah-Hartman currently (as of 2.6.36) maintains the staging tree.
|
||||||
|
Drivers that still need work are sent to him, with each driver having
|
||||||
|
its own subdirectory in drivers/staging/. Along with the driver source
|
||||||
|
files, a TODO file should be present in the directory as well. The TODO
|
||||||
|
file lists the pending work that the driver needs for acceptance into
|
||||||
|
the kernel proper, as well as a list of people that should be Cc'd for any
|
||||||
|
patches to the driver. Staging drivers that don't currently build should
|
||||||
|
have their config entries depend upon CONFIG_BROKEN. Once they can
|
||||||
|
be successfully built without outside patches, CONFIG_BROKEN can be removed.
|
||||||
|
|
||||||
2.5: TOOLS
|
2.5: TOOLS
|
||||||
|
|
||||||
|
|
|
@ -4,33 +4,41 @@ please mail me.
|
||||||
Geert Uytterhoeven <geert@linux-m68k.org>
|
Geert Uytterhoeven <geert@linux-m68k.org>
|
||||||
|
|
||||||
00-INDEX
|
00-INDEX
|
||||||
- this file
|
- this file.
|
||||||
arkfb.txt
|
arkfb.txt
|
||||||
- info on the fbdev driver for ARK Logic chips.
|
- info on the fbdev driver for ARK Logic chips.
|
||||||
aty128fb.txt
|
aty128fb.txt
|
||||||
- info on the ATI Rage128 frame buffer driver.
|
- info on the ATI Rage128 frame buffer driver.
|
||||||
cirrusfb.txt
|
cirrusfb.txt
|
||||||
- info on the driver for Cirrus Logic chipsets.
|
- info on the driver for Cirrus Logic chipsets.
|
||||||
|
cmap_xfbdev.txt
|
||||||
|
- an introduction to fbdev's cmap structures.
|
||||||
deferred_io.txt
|
deferred_io.txt
|
||||||
- an introduction to deferred IO.
|
- an introduction to deferred IO.
|
||||||
|
efifb.txt
|
||||||
|
- info on the EFI platform driver for Intel based Apple computers.
|
||||||
|
ep93xx-fb.txt
|
||||||
|
- info on the driver for EP93xx LCD controller.
|
||||||
fbcon.txt
|
fbcon.txt
|
||||||
- intro to and usage guide for the framebuffer console (fbcon).
|
- intro to and usage guide for the framebuffer console (fbcon).
|
||||||
framebuffer.txt
|
framebuffer.txt
|
||||||
- introduction to frame buffer devices.
|
- introduction to frame buffer devices.
|
||||||
imacfb.txt
|
gxfb.txt
|
||||||
- info on the generic EFI platform driver for Intel based Macs.
|
- info on the framebuffer driver for AMD Geode GX2 based processors.
|
||||||
intel810.txt
|
intel810.txt
|
||||||
- documentation for the Intel 810/815 framebuffer driver.
|
- documentation for the Intel 810/815 framebuffer driver.
|
||||||
intelfb.txt
|
intelfb.txt
|
||||||
- docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver.
|
- docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver.
|
||||||
internals.txt
|
internals.txt
|
||||||
- quick overview of frame buffer device internals.
|
- quick overview of frame buffer device internals.
|
||||||
|
lxfb.txt
|
||||||
|
- info on the framebuffer driver for AMD Geode LX based processors.
|
||||||
matroxfb.txt
|
matroxfb.txt
|
||||||
- info on the Matrox framebuffer driver for Alpha, Intel and PPC.
|
- info on the Matrox framebuffer driver for Alpha, Intel and PPC.
|
||||||
|
metronomefb.txt
|
||||||
|
- info on the driver for the Metronome display controller.
|
||||||
modedb.txt
|
modedb.txt
|
||||||
- info on the video mode database.
|
- info on the video mode database.
|
||||||
matroxfb.txt
|
|
||||||
- info on the Matrox frame buffer driver.
|
|
||||||
pvr2fb.txt
|
pvr2fb.txt
|
||||||
- info on the PowerVR 2 frame buffer driver.
|
- info on the PowerVR 2 frame buffer driver.
|
||||||
pxafb.txt
|
pxafb.txt
|
||||||
|
@ -39,13 +47,23 @@ s3fb.txt
|
||||||
- info on the fbdev driver for S3 Trio/Virge chips.
|
- info on the fbdev driver for S3 Trio/Virge chips.
|
||||||
sa1100fb.txt
|
sa1100fb.txt
|
||||||
- information about the driver for the SA-1100 LCD controller.
|
- information about the driver for the SA-1100 LCD controller.
|
||||||
|
sh7760fb.txt
|
||||||
|
- info on the SH7760/SH7763 integrated LCDC Framebuffer driver.
|
||||||
sisfb.txt
|
sisfb.txt
|
||||||
- info on the framebuffer device driver for various SiS chips.
|
- info on the framebuffer device driver for various SiS chips.
|
||||||
sstfb.txt
|
sstfb.txt
|
||||||
- info on the frame buffer driver for 3dfx' Voodoo Graphics boards.
|
- info on the frame buffer driver for 3dfx' Voodoo Graphics boards.
|
||||||
tgafb.txt
|
tgafb.txt
|
||||||
- info on the TGA (DECChip 21030) frame buffer driver
|
- info on the TGA (DECChip 21030) frame buffer driver.
|
||||||
|
tridentfb.txt
|
||||||
|
info on the framebuffer driver for some Trident chip based cards.
|
||||||
|
uvesafb.txt
|
||||||
|
- info on the userspace VESA (VBE2+ compliant) frame buffer device.
|
||||||
vesafb.txt
|
vesafb.txt
|
||||||
- info on the VESA frame buffer device
|
- info on the VESA frame buffer device.
|
||||||
|
viafb.modes
|
||||||
|
- list of modes for VIA Integration Graphic Chip.
|
||||||
|
viafb.txt
|
||||||
|
- info on the VIA Integration Graphic Chip console framebuffer driver.
|
||||||
vt8623fb.txt
|
vt8623fb.txt
|
||||||
- info on the fb driver for the graphics core in VIA VT8623 chipsets.
|
- info on the fb driver for the graphics core in VIA VT8623 chipsets.
|
||||||
|
|
|
@ -554,3 +554,13 @@ Why: This is a legacy interface which have been replaced by a more
|
||||||
Who: NeilBrown <neilb@suse.de>
|
Who: NeilBrown <neilb@suse.de>
|
||||||
|
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
|
What: i2c_adapter.id
|
||||||
|
When: June 2011
|
||||||
|
Why: This field is deprecated. I2C device drivers shouldn't change their
|
||||||
|
behavior based on the underlying I2C adapter. Instead, the I2C
|
||||||
|
adapter driver should instantiate the I2C devices and provide the
|
||||||
|
needed platform-specific information.
|
||||||
|
Who: Jean Delvare <khali@linux-fr.org>
|
||||||
|
|
||||||
|
----------------------------
|
||||||
|
|
|
@ -89,7 +89,7 @@ static ssize_t childless_storeme_write(struct childless *childless,
|
||||||
char *p = (char *) page;
|
char *p = (char *) page;
|
||||||
|
|
||||||
tmp = simple_strtoul(p, &p, 10);
|
tmp = simple_strtoul(p, &p, 10);
|
||||||
if (!p || (*p && (*p != '\n')))
|
if ((*p != '\0') && (*p != '\n'))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (tmp > INT_MAX)
|
if (tmp > INT_MAX)
|
||||||
|
|
|
@ -794,17 +794,6 @@ designed.
|
||||||
|
|
||||||
Roadmap:
|
Roadmap:
|
||||||
|
|
||||||
2.6.37 Remove experimental tag from mount option
|
|
||||||
=> should be roughly 6 months after initial merge
|
|
||||||
=> enough time to:
|
|
||||||
=> gain confidence and fix problems reported by early
|
|
||||||
adopters (a.k.a. guinea pigs)
|
|
||||||
=> address worst performance regressions and undesired
|
|
||||||
behaviours
|
|
||||||
=> start tuning/optimising code for parallelism
|
|
||||||
=> start tuning/optimising algorithms consuming
|
|
||||||
excessive CPU time
|
|
||||||
|
|
||||||
2.6.39 Switch default mount option to use delayed logging
|
2.6.39 Switch default mount option to use delayed logging
|
||||||
=> should be roughly 12 months after initial merge
|
=> should be roughly 12 months after initial merge
|
||||||
=> enough time to shake out remaining problems before next round of
|
=> enough time to shake out remaining problems before next round of
|
||||||
|
|
|
@ -617,6 +617,16 @@ and have the following read/write attributes:
|
||||||
is configured as an output, this value may be written;
|
is configured as an output, this value may be written;
|
||||||
any nonzero value is treated as high.
|
any nonzero value is treated as high.
|
||||||
|
|
||||||
|
If the pin can be configured as interrupt-generating interrupt
|
||||||
|
and if it has been configured to generate interrupts (see the
|
||||||
|
description of "edge"), you can poll(2) on that file and
|
||||||
|
poll(2) will return whenever the interrupt was triggered. If
|
||||||
|
you use poll(2), set the events POLLPRI and POLLERR. If you
|
||||||
|
use select(2), set the file descriptor in exceptfds. After
|
||||||
|
poll(2) returns, either lseek(2) to the beginning of the sysfs
|
||||||
|
file and read the new value or close the file and re-open it
|
||||||
|
to read the value.
|
||||||
|
|
||||||
"edge" ... reads as either "none", "rising", "falling", or
|
"edge" ... reads as either "none", "rising", "falling", or
|
||||||
"both". Write these strings to select the signal edge(s)
|
"both". Write these strings to select the signal edge(s)
|
||||||
that will make poll(2) on the "value" file return.
|
that will make poll(2) on the "value" file return.
|
||||||
|
|
|
@ -11,7 +11,7 @@ Authors:
|
||||||
Mark M. Hoffman <mhoffman@lightlink.com>
|
Mark M. Hoffman <mhoffman@lightlink.com>
|
||||||
Ported to 2.6 by Eric J. Bowersox <ericb@aspsys.com>
|
Ported to 2.6 by Eric J. Bowersox <ericb@aspsys.com>
|
||||||
Adapted to 2.6.20 by Carsten Emde <ce@osadl.org>
|
Adapted to 2.6.20 by Carsten Emde <ce@osadl.org>
|
||||||
Modified for mainline integration by Hans J. Koch <hjk@linutronix.de>
|
Modified for mainline integration by Hans J. Koch <hjk@hansjkoch.de>
|
||||||
|
|
||||||
Module Parameters
|
Module Parameters
|
||||||
-----------------
|
-----------------
|
||||||
|
|
|
@ -8,7 +8,7 @@ Supported chips:
|
||||||
Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf
|
Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf
|
||||||
|
|
||||||
Authors:
|
Authors:
|
||||||
Hans J. Koch <hjk@linutronix.de>
|
Hans J. Koch <hjk@hansjkoch.de>
|
||||||
John Morris <john.morris@spirentcom.com>
|
John Morris <john.morris@spirentcom.com>
|
||||||
Claus Gindhart <claus.gindhart@kontron.com>
|
Claus Gindhart <claus.gindhart@kontron.com>
|
||||||
|
|
||||||
|
|
|
@ -706,7 +706,7 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
arch/x86/kernel/cpu/cpufreq/elanfreq.c.
|
arch/x86/kernel/cpu/cpufreq/elanfreq.c.
|
||||||
|
|
||||||
elevator= [IOSCHED]
|
elevator= [IOSCHED]
|
||||||
Format: {"anticipatory" | "cfq" | "deadline" | "noop"}
|
Format: {"cfq" | "deadline" | "noop"}
|
||||||
See Documentation/block/as-iosched.txt and
|
See Documentation/block/as-iosched.txt and
|
||||||
Documentation/block/deadline-iosched.txt for details.
|
Documentation/block/deadline-iosched.txt for details.
|
||||||
|
|
||||||
|
@ -2385,6 +2385,11 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
improve throughput, but will also increase the
|
improve throughput, but will also increase the
|
||||||
amount of memory reserved for use by the client.
|
amount of memory reserved for use by the client.
|
||||||
|
|
||||||
|
swapaccount[=0|1]
|
||||||
|
[KNL] Enable accounting of swap in memory resource
|
||||||
|
controller if no parameter or 1 is given or disable
|
||||||
|
it if 0 is given (See Documentation/cgroups/memory.txt)
|
||||||
|
|
||||||
swiotlb= [IA-64] Number of I/O TLB slabs
|
swiotlb= [IA-64] Number of I/O TLB slabs
|
||||||
|
|
||||||
switches= [HW,M68k]
|
switches= [HW,M68k]
|
||||||
|
|
|
@ -60,15 +60,18 @@ Hardware accelerated blink of LEDs
|
||||||
|
|
||||||
Some LEDs can be programmed to blink without any CPU interaction. To
|
Some LEDs can be programmed to blink without any CPU interaction. To
|
||||||
support this feature, a LED driver can optionally implement the
|
support this feature, a LED driver can optionally implement the
|
||||||
blink_set() function (see <linux/leds.h>). If implemented, triggers can
|
blink_set() function (see <linux/leds.h>). To set an LED to blinking,
|
||||||
attempt to use it before falling back to software timers. The blink_set()
|
however, it is better to use use the API function led_blink_set(),
|
||||||
function should return 0 if the blink setting is supported, or -EINVAL
|
as it will check and implement software fallback if necessary.
|
||||||
otherwise, which means that LED blinking will be handled by software.
|
|
||||||
|
|
||||||
The blink_set() function should choose a user friendly blinking
|
To turn off blinking again, use the API function led_brightness_set()
|
||||||
value if it is called with *delay_on==0 && *delay_off==0 parameters. In
|
as that will not just set the LED brightness but also stop any software
|
||||||
this case the driver should give back the chosen value through delay_on
|
timers that may have been required for blinking.
|
||||||
and delay_off parameters to the leds subsystem.
|
|
||||||
|
The blink_set() function should choose a user friendly blinking value
|
||||||
|
if it is called with *delay_on==0 && *delay_off==0 parameters. In this
|
||||||
|
case the driver should give back the chosen value through delay_on and
|
||||||
|
delay_off parameters to the leds subsystem.
|
||||||
|
|
||||||
Setting the brightness to zero with brightness_set() callback function
|
Setting the brightness to zero with brightness_set() callback function
|
||||||
should completely turn off the LED and cancel the previously programmed
|
should completely turn off the LED and cancel the previously programmed
|
||||||
|
|
|
@ -0,0 +1,88 @@
|
||||||
|
Kernel driver for lp5521
|
||||||
|
========================
|
||||||
|
|
||||||
|
* National Semiconductor LP5521 led driver chip
|
||||||
|
* Datasheet: http://www.national.com/pf/LP/LP5521.html
|
||||||
|
|
||||||
|
Authors: Mathias Nyman, Yuri Zaporozhets, Samu Onkalo
|
||||||
|
Contact: Samu Onkalo (samu.p.onkalo-at-nokia.com)
|
||||||
|
|
||||||
|
Description
|
||||||
|
-----------
|
||||||
|
|
||||||
|
LP5521 can drive up to 3 channels. Leds can be controlled directly via
|
||||||
|
the led class control interface. Channels have generic names:
|
||||||
|
lp5521:channelx, where x is 0 .. 2
|
||||||
|
|
||||||
|
All three channels can be also controlled using the engine micro programs.
|
||||||
|
More details of the instructions can be found from the public data sheet.
|
||||||
|
|
||||||
|
Control interface for the engines:
|
||||||
|
x is 1 .. 3
|
||||||
|
enginex_mode : disabled, load, run
|
||||||
|
enginex_load : store program (visible only in engine load mode)
|
||||||
|
|
||||||
|
Example (start to blink the channel 2 led):
|
||||||
|
cd /sys/class/leds/lp5521:channel2/device
|
||||||
|
echo "load" > engine3_mode
|
||||||
|
echo "037f4d0003ff6000" > engine3_load
|
||||||
|
echo "run" > engine3_mode
|
||||||
|
|
||||||
|
stop the engine:
|
||||||
|
echo "disabled" > engine3_mode
|
||||||
|
|
||||||
|
sysfs contains a selftest entry.
|
||||||
|
The test communicates with the chip and checks that
|
||||||
|
the clock mode is automatically set to the requested one.
|
||||||
|
|
||||||
|
Each channel has its own led current settings.
|
||||||
|
/sys/class/leds/lp5521:channel0/led_current - RW
|
||||||
|
/sys/class/leds/lp5521:channel0/max_current - RO
|
||||||
|
Format: 10x mA i.e 10 means 1.0 mA
|
||||||
|
|
||||||
|
example platform data:
|
||||||
|
|
||||||
|
Note: chan_nr can have values between 0 and 2.
|
||||||
|
|
||||||
|
static struct lp5521_led_config lp5521_led_config[] = {
|
||||||
|
{
|
||||||
|
.chan_nr = 0,
|
||||||
|
.led_current = 50,
|
||||||
|
.max_current = 130,
|
||||||
|
}, {
|
||||||
|
.chan_nr = 1,
|
||||||
|
.led_current = 0,
|
||||||
|
.max_current = 130,
|
||||||
|
}, {
|
||||||
|
.chan_nr = 2,
|
||||||
|
.led_current = 0,
|
||||||
|
.max_current = 130,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static int lp5521_setup(void)
|
||||||
|
{
|
||||||
|
/* setup HW resources */
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lp5521_release(void)
|
||||||
|
{
|
||||||
|
/* Release HW resources */
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lp5521_enable(bool state)
|
||||||
|
{
|
||||||
|
/* Control of chip enable signal */
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct lp5521_platform_data lp5521_platform_data = {
|
||||||
|
.led_config = lp5521_led_config,
|
||||||
|
.num_channels = ARRAY_SIZE(lp5521_led_config),
|
||||||
|
.clock_mode = LP5521_CLOCK_EXT,
|
||||||
|
.setup_resources = lp5521_setup,
|
||||||
|
.release_resources = lp5521_release,
|
||||||
|
.enable = lp5521_enable,
|
||||||
|
};
|
||||||
|
|
||||||
|
If the current is set to 0 in the platform data, that channel is
|
||||||
|
disabled and it is not visible in the sysfs.
|
|
@ -0,0 +1,83 @@
|
||||||
|
Kernel driver for lp5523
|
||||||
|
========================
|
||||||
|
|
||||||
|
* National Semiconductor LP5523 led driver chip
|
||||||
|
* Datasheet: http://www.national.com/pf/LP/LP5523.html
|
||||||
|
|
||||||
|
Authors: Mathias Nyman, Yuri Zaporozhets, Samu Onkalo
|
||||||
|
Contact: Samu Onkalo (samu.p.onkalo-at-nokia.com)
|
||||||
|
|
||||||
|
Description
|
||||||
|
-----------
|
||||||
|
LP5523 can drive up to 9 channels. Leds can be controlled directly via
|
||||||
|
the led class control interface. Channels have generic names:
|
||||||
|
lp5523:channelx where x is 0...8
|
||||||
|
|
||||||
|
The chip provides 3 engines. Each engine can control channels without
|
||||||
|
interaction from the main CPU. Details of the micro engine code can be found
|
||||||
|
from the public data sheet. Leds can be muxed to different channels.
|
||||||
|
|
||||||
|
Control interface for the engines:
|
||||||
|
x is 1 .. 3
|
||||||
|
enginex_mode : disabled, load, run
|
||||||
|
enginex_load : microcode load (visible only in load mode)
|
||||||
|
enginex_leds : led mux control (visible only in load mode)
|
||||||
|
|
||||||
|
cd /sys/class/leds/lp5523:channel2/device
|
||||||
|
echo "load" > engine3_mode
|
||||||
|
echo "9d80400004ff05ff437f0000" > engine3_load
|
||||||
|
echo "111111111" > engine3_leds
|
||||||
|
echo "run" > engine3_mode
|
||||||
|
|
||||||
|
sysfs contains a selftest entry. It measures each channel
|
||||||
|
voltage level and checks if it looks reasonable. If the level is too high,
|
||||||
|
the led is missing; if the level is too low, there is a short circuit.
|
||||||
|
|
||||||
|
Selftest uses always the current from the platform data.
|
||||||
|
|
||||||
|
Each channel contains led current settings.
|
||||||
|
/sys/class/leds/lp5523:channel2/led_current - RW
|
||||||
|
/sys/class/leds/lp5523:channel2/max_current - RO
|
||||||
|
Format: 10x mA i.e 10 means 1.0 mA
|
||||||
|
|
||||||
|
Example platform data:
|
||||||
|
|
||||||
|
Note - chan_nr can have values between 0 and 8.
|
||||||
|
|
||||||
|
static struct lp5523_led_config lp5523_led_config[] = {
|
||||||
|
{
|
||||||
|
.chan_nr = 0,
|
||||||
|
.led_current = 50,
|
||||||
|
.max_current = 130,
|
||||||
|
},
|
||||||
|
...
|
||||||
|
}, {
|
||||||
|
.chan_nr = 8,
|
||||||
|
.led_current = 50,
|
||||||
|
.max_current = 130,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static int lp5523_setup(void)
|
||||||
|
{
|
||||||
|
/* Setup HW resources */
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lp5523_release(void)
|
||||||
|
{
|
||||||
|
/* Release HW resources */
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lp5523_enable(bool state)
|
||||||
|
{
|
||||||
|
/* Control chip enable signal */
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct lp5523_platform_data lp5523_platform_data = {
|
||||||
|
.led_config = lp5523_led_config,
|
||||||
|
.num_channels = ARRAY_SIZE(lp5523_led_config),
|
||||||
|
.clock_mode = LP5523_CLOCK_EXT,
|
||||||
|
.setup_resources = lp5523_setup,
|
||||||
|
.release_resources = lp5523_release,
|
||||||
|
.enable = lp5523_enable,
|
||||||
|
};
|
|
@ -20,6 +20,15 @@ ip_no_pmtu_disc - BOOLEAN
|
||||||
min_pmtu - INTEGER
|
min_pmtu - INTEGER
|
||||||
default 562 - minimum discovered Path MTU
|
default 562 - minimum discovered Path MTU
|
||||||
|
|
||||||
|
route/max_size - INTEGER
|
||||||
|
Maximum number of routes allowed in the kernel. Increase
|
||||||
|
this when using large numbers of interfaces and/or routes.
|
||||||
|
|
||||||
|
neigh/default/gc_thresh3 - INTEGER
|
||||||
|
Maximum number of neighbor entries allowed. Increase this
|
||||||
|
when using large numbers of interfaces and when communicating
|
||||||
|
with large numbers of directly-connected peers.
|
||||||
|
|
||||||
mtu_expires - INTEGER
|
mtu_expires - INTEGER
|
||||||
Time, in seconds, that cached PMTU information is kept.
|
Time, in seconds, that cached PMTU information is kept.
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,9 @@ Typical usage of the OPP library is as follows:
|
||||||
SoC framework -> modifies on required cases certain OPPs -> OPP layer
|
SoC framework -> modifies on required cases certain OPPs -> OPP layer
|
||||||
-> queries to search/retrieve information ->
|
-> queries to search/retrieve information ->
|
||||||
|
|
||||||
|
Architectures that provide a SoC framework for OPP should select ARCH_HAS_OPP
|
||||||
|
to make the OPP layer available.
|
||||||
|
|
||||||
OPP layer expects each domain to be represented by a unique device pointer. SoC
|
OPP layer expects each domain to be represented by a unique device pointer. SoC
|
||||||
framework registers a set of initial OPPs per device with the OPP layer. This
|
framework registers a set of initial OPPs per device with the OPP layer. This
|
||||||
list is expected to be an optimally small number typically around 5 per device.
|
list is expected to be an optimally small number typically around 5 per device.
|
||||||
|
|
|
@ -21,8 +21,8 @@ three rotations, respectively, to balance the tree), with slightly slower
|
||||||
To quote Linux Weekly News:
|
To quote Linux Weekly News:
|
||||||
|
|
||||||
There are a number of red-black trees in use in the kernel.
|
There are a number of red-black trees in use in the kernel.
|
||||||
The anticipatory, deadline, and CFQ I/O schedulers all employ
|
The deadline and CFQ I/O schedulers employ rbtrees to
|
||||||
rbtrees to track requests; the packet CD/DVD driver does the same.
|
track requests; the packet CD/DVD driver does the same.
|
||||||
The high-resolution timer code uses an rbtree to organize outstanding
|
The high-resolution timer code uses an rbtree to organize outstanding
|
||||||
timer requests. The ext3 filesystem tracks directory entries in a
|
timer requests. The ext3 filesystem tracks directory entries in a
|
||||||
red-black tree. Virtual memory areas (VMAs) are tracked with red-black
|
red-black tree. Virtual memory areas (VMAs) are tracked with red-black
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
Clock framework on SuperH architecture
|
|
||||||
|
|
||||||
The framework on SH extends existing API by the function clk_set_rate_ex,
|
|
||||||
which prototype is as follows:
|
|
||||||
|
|
||||||
clk_set_rate_ex (struct clk *clk, unsigned long rate, int algo_id)
|
|
||||||
|
|
||||||
The algo_id parameter is used to specify algorithm used to recalculate clocks,
|
|
||||||
adjanced to clock, specified as first argument. It is assumed that algo_id==0
|
|
||||||
means no changes to adjanced clock
|
|
||||||
|
|
||||||
Internally, the clk_set_rate_ex forwards request to clk->ops->set_rate method,
|
|
||||||
if it is present in ops structure. The method should set the clock rate and adjust
|
|
||||||
all needed clocks according to the passed algo_id.
|
|
||||||
Exact values for algo_id are machine-dependent. For the sh7722, the following
|
|
||||||
values are defined:
|
|
||||||
|
|
||||||
NO_CHANGE = 0,
|
|
||||||
IUS_N1_N1, /* I:U = N:1, U:Sh = N:1 */
|
|
||||||
IUS_322, /* I:U:Sh = 3:2:2 */
|
|
||||||
IUS_522, /* I:U:Sh = 5:2:2 */
|
|
||||||
IUS_N11, /* I:U:Sh = N:1:1 */
|
|
||||||
SB_N1, /* Sh:B = N:1 */
|
|
||||||
SB3_N1, /* Sh:B3 = N:1 */
|
|
||||||
SB3_32, /* Sh:B3 = 3:2 */
|
|
||||||
SB3_43, /* Sh:B3 = 4:3 */
|
|
||||||
SB3_54, /* Sh:B3 = 5:4 */
|
|
||||||
BP_N1, /* B:P = N:1 */
|
|
||||||
IP_N1 /* I:P = N:1 */
|
|
||||||
|
|
||||||
Each of these constants means relation between clocks that can be set via the FRQCR
|
|
||||||
register
|
|
|
@ -28,6 +28,7 @@ show up in /proc/sys/kernel:
|
||||||
- core_uses_pid
|
- core_uses_pid
|
||||||
- ctrl-alt-del
|
- ctrl-alt-del
|
||||||
- dentry-state
|
- dentry-state
|
||||||
|
- dmesg_restrict
|
||||||
- domainname
|
- domainname
|
||||||
- hostname
|
- hostname
|
||||||
- hotplug
|
- hotplug
|
||||||
|
@ -213,6 +214,19 @@ to decide what to do with it.
|
||||||
|
|
||||||
==============================================================
|
==============================================================
|
||||||
|
|
||||||
|
dmesg_restrict:
|
||||||
|
|
||||||
|
This toggle indicates whether unprivileged users are prevented from using
|
||||||
|
dmesg(8) to view messages from the kernel's log buffer. When
|
||||||
|
dmesg_restrict is set to (0) there are no restrictions. When
|
||||||
|
dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use
|
||||||
|
dmesg(8).
|
||||||
|
|
||||||
|
The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default
|
||||||
|
value of dmesg_restrict.
|
||||||
|
|
||||||
|
==============================================================
|
||||||
|
|
||||||
domainname & hostname:
|
domainname & hostname:
|
||||||
|
|
||||||
These files can be used to set the NIS/YP domainname and the
|
These files can be used to set the NIS/YP domainname and the
|
||||||
|
|
36
MAINTAINERS
36
MAINTAINERS
|
@ -161,7 +161,7 @@ M: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
L: linux-serial@vger.kernel.org
|
L: linux-serial@vger.kernel.org
|
||||||
W: http://serial.sourceforge.net
|
W: http://serial.sourceforge.net
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
|
||||||
F: drivers/serial/8250*
|
F: drivers/serial/8250*
|
||||||
F: include/linux/serial_8250.h
|
F: include/linux/serial_8250.h
|
||||||
|
|
||||||
|
@ -945,7 +945,7 @@ M: Magnus Damm <magnus.damm@gmail.com>
|
||||||
L: linux-sh@vger.kernel.org
|
L: linux-sh@vger.kernel.org
|
||||||
W: http://oss.renesas.com
|
W: http://oss.renesas.com
|
||||||
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/arm/mach-shmobile/
|
F: arch/arm/mach-shmobile/
|
||||||
F: drivers/sh/
|
F: drivers/sh/
|
||||||
|
@ -1359,7 +1359,7 @@ F: include/net/bluetooth/
|
||||||
|
|
||||||
BONDING DRIVER
|
BONDING DRIVER
|
||||||
M: Jay Vosburgh <fubar@us.ibm.com>
|
M: Jay Vosburgh <fubar@us.ibm.com>
|
||||||
L: bonding-devel@lists.sourceforge.net
|
L: netdev@vger.kernel.org
|
||||||
W: http://sourceforge.net/projects/bonding/
|
W: http://sourceforge.net/projects/bonding/
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/net/bonding/
|
F: drivers/net/bonding/
|
||||||
|
@ -1829,6 +1829,13 @@ W: http://www.chelsio.com
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/net/cxgb4vf/
|
F: drivers/net/cxgb4vf/
|
||||||
|
|
||||||
|
STMMAC ETHERNET DRIVER
|
||||||
|
M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
|
||||||
|
L: netdev@vger.kernel.org
|
||||||
|
W: http://www.stlinux.com
|
||||||
|
S: Supported
|
||||||
|
F: drivers/net/stmmac/
|
||||||
|
|
||||||
CYBERPRO FB DRIVER
|
CYBERPRO FB DRIVER
|
||||||
M: Russell King <linux@arm.linux.org.uk>
|
M: Russell King <linux@arm.linux.org.uk>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
|
@ -2008,6 +2015,7 @@ F: drivers/hwmon/dme1737.c
|
||||||
DOCBOOK FOR DOCUMENTATION
|
DOCBOOK FOR DOCUMENTATION
|
||||||
M: Randy Dunlap <rdunlap@xenotime.net>
|
M: Randy Dunlap <rdunlap@xenotime.net>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
F: scripts/kernel-doc
|
||||||
|
|
||||||
DOCKING STATION DRIVER
|
DOCKING STATION DRIVER
|
||||||
M: Shaohua Li <shaohua.li@intel.com>
|
M: Shaohua Li <shaohua.li@intel.com>
|
||||||
|
@ -2018,6 +2026,7 @@ F: drivers/acpi/dock.c
|
||||||
DOCUMENTATION
|
DOCUMENTATION
|
||||||
M: Randy Dunlap <rdunlap@xenotime.net>
|
M: Randy Dunlap <rdunlap@xenotime.net>
|
||||||
L: linux-doc@vger.kernel.org
|
L: linux-doc@vger.kernel.org
|
||||||
|
T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/
|
F: Documentation/
|
||||||
|
|
||||||
|
@ -2435,9 +2444,12 @@ F: drivers/net/wan/sdla.c
|
||||||
FRAMEBUFFER LAYER
|
FRAMEBUFFER LAYER
|
||||||
L: linux-fbdev@vger.kernel.org
|
L: linux-fbdev@vger.kernel.org
|
||||||
W: http://linux-fbdev.sourceforge.net/
|
W: http://linux-fbdev.sourceforge.net/
|
||||||
|
Q: http://patchwork.kernel.org/project/linux-fbdev/list/
|
||||||
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
|
||||||
S: Orphan
|
S: Orphan
|
||||||
F: Documentation/fb/
|
F: Documentation/fb/
|
||||||
F: drivers/video/fb*
|
F: drivers/video/
|
||||||
|
F: include/video/
|
||||||
F: include/linux/fb.h
|
F: include/linux/fb.h
|
||||||
|
|
||||||
FREESCALE DMA DRIVER
|
FREESCALE DMA DRIVER
|
||||||
|
@ -5676,7 +5688,7 @@ S: Maintained
|
||||||
|
|
||||||
STAGING SUBSYSTEM
|
STAGING SUBSYSTEM
|
||||||
M: Greg Kroah-Hartman <gregkh@suse.de>
|
M: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
|
||||||
L: devel@driverdev.osuosl.org
|
L: devel@driverdev.osuosl.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/staging/
|
F: drivers/staging/
|
||||||
|
@ -5705,7 +5717,7 @@ M: Paul Mundt <lethal@linux-sh.org>
|
||||||
L: linux-sh@vger.kernel.org
|
L: linux-sh@vger.kernel.org
|
||||||
W: http://www.linux-sh.org
|
W: http://www.linux-sh.org
|
||||||
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
|
||||||
S: Supported
|
S: Supported
|
||||||
F: Documentation/sh/
|
F: Documentation/sh/
|
||||||
F: arch/sh/
|
F: arch/sh/
|
||||||
|
@ -5827,6 +5839,8 @@ M: Chris Metcalf <cmetcalf@tilera.com>
|
||||||
W: http://www.tilera.com/scm/
|
W: http://www.tilera.com/scm/
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/tile/
|
F: arch/tile/
|
||||||
|
F: drivers/char/hvc_tile.c
|
||||||
|
F: drivers/net/tile/
|
||||||
|
|
||||||
TLAN NETWORK DRIVER
|
TLAN NETWORK DRIVER
|
||||||
M: Samuel Chessman <chessman@tux.org>
|
M: Samuel Chessman <chessman@tux.org>
|
||||||
|
@ -5910,7 +5924,7 @@ S: Maintained
|
||||||
TTY LAYER
|
TTY LAYER
|
||||||
M: Greg Kroah-Hartman <gregkh@suse.de>
|
M: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
|
||||||
F: drivers/char/tty_*
|
F: drivers/char/tty_*
|
||||||
F: drivers/serial/serial_core.c
|
F: drivers/serial/serial_core.c
|
||||||
F: include/linux/serial_core.h
|
F: include/linux/serial_core.h
|
||||||
|
@ -6233,7 +6247,7 @@ USB SUBSYSTEM
|
||||||
M: Greg Kroah-Hartman <gregkh@suse.de>
|
M: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
L: linux-usb@vger.kernel.org
|
L: linux-usb@vger.kernel.org
|
||||||
W: http://www.linux-usb.org
|
W: http://www.linux-usb.org
|
||||||
T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
|
||||||
S: Supported
|
S: Supported
|
||||||
F: Documentation/usb/
|
F: Documentation/usb/
|
||||||
F: drivers/net/usb/
|
F: drivers/net/usb/
|
||||||
|
@ -6598,14 +6612,14 @@ F: drivers/platform/x86
|
||||||
|
|
||||||
XEN PCI SUBSYSTEM
|
XEN PCI SUBSYSTEM
|
||||||
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||||||
L: xen-devel@lists.xensource.com
|
L: xen-devel@lists.xensource.com (moderated for non-subscribers)
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/x86/pci/*xen*
|
F: arch/x86/pci/*xen*
|
||||||
F: drivers/pci/*xen*
|
F: drivers/pci/*xen*
|
||||||
|
|
||||||
XEN SWIOTLB SUBSYSTEM
|
XEN SWIOTLB SUBSYSTEM
|
||||||
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||||||
L: xen-devel@lists.xensource.com
|
L: xen-devel@lists.xensource.com (moderated for non-subscribers)
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/x86/xen/*swiotlb*
|
F: arch/x86/xen/*swiotlb*
|
||||||
F: drivers/xen/*swiotlb*
|
F: drivers/xen/*swiotlb*
|
||||||
|
@ -6613,7 +6627,7 @@ F: drivers/xen/*swiotlb*
|
||||||
XEN HYPERVISOR INTERFACE
|
XEN HYPERVISOR INTERFACE
|
||||||
M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
|
M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
|
||||||
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||||||
L: xen-devel@lists.xen.org
|
L: xen-devel@lists.xensource.com (moderated for non-subscribers)
|
||||||
L: virtualization@lists.osdl.org
|
L: virtualization@lists.osdl.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/x86/xen/
|
F: arch/x86/xen/
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
VERSION = 2
|
VERSION = 2
|
||||||
PATCHLEVEL = 6
|
PATCHLEVEL = 6
|
||||||
SUBLEVEL = 37
|
SUBLEVEL = 37
|
||||||
EXTRAVERSION = -rc1
|
EXTRAVERSION = -rc3
|
||||||
NAME = Flesh-Eating Bats with Fangs
|
NAME = Flesh-Eating Bats with Fangs
|
||||||
|
|
||||||
# *DOCUMENTATION*
|
# *DOCUMENTATION*
|
||||||
|
|
|
@ -6,7 +6,7 @@ config ARM
|
||||||
select HAVE_MEMBLOCK
|
select HAVE_MEMBLOCK
|
||||||
select RTC_LIB
|
select RTC_LIB
|
||||||
select SYS_SUPPORTS_APM_EMULATION
|
select SYS_SUPPORTS_APM_EMULATION
|
||||||
select GENERIC_ATOMIC64 if (!CPU_32v6K)
|
select GENERIC_ATOMIC64 if (!CPU_32v6K || !AEABI)
|
||||||
select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
|
select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
|
||||||
select HAVE_ARCH_KGDB
|
select HAVE_ARCH_KGDB
|
||||||
select HAVE_KPROBES if (!XIP_KERNEL)
|
select HAVE_KPROBES if (!XIP_KERNEL)
|
||||||
|
@ -646,7 +646,7 @@ config ARCH_S3C2410
|
||||||
select ARCH_HAS_CPUFREQ
|
select ARCH_HAS_CPUFREQ
|
||||||
select HAVE_CLK
|
select HAVE_CLK
|
||||||
select ARCH_USES_GETTIMEOFFSET
|
select ARCH_USES_GETTIMEOFFSET
|
||||||
select HAVE_S3C2410_I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
help
|
help
|
||||||
Samsung S3C2410X CPU based systems, such as the Simtec Electronics
|
Samsung S3C2410X CPU based systems, such as the Simtec Electronics
|
||||||
BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
|
BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
|
||||||
|
@ -676,8 +676,8 @@ config ARCH_S3C64XX
|
||||||
select S3C_DEV_NAND
|
select S3C_DEV_NAND
|
||||||
select USB_ARCH_HAS_OHCI
|
select USB_ARCH_HAS_OHCI
|
||||||
select SAMSUNG_GPIOLIB_4BIT
|
select SAMSUNG_GPIOLIB_4BIT
|
||||||
select HAVE_S3C2410_I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
help
|
help
|
||||||
Samsung S3C64XX series based systems
|
Samsung S3C64XX series based systems
|
||||||
|
|
||||||
|
@ -686,10 +686,10 @@ config ARCH_S5P64X0
|
||||||
select CPU_V6
|
select CPU_V6
|
||||||
select GENERIC_GPIO
|
select GENERIC_GPIO
|
||||||
select HAVE_CLK
|
select HAVE_CLK
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
select ARCH_USES_GETTIMEOFFSET
|
select ARCH_USES_GETTIMEOFFSET
|
||||||
select HAVE_S3C2410_I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
select HAVE_S3C_RTC
|
select HAVE_S3C_RTC if RTC_CLASS
|
||||||
help
|
help
|
||||||
Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
|
Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
|
||||||
SMDK6450.
|
SMDK6450.
|
||||||
|
@ -700,7 +700,7 @@ config ARCH_S5P6442
|
||||||
select GENERIC_GPIO
|
select GENERIC_GPIO
|
||||||
select HAVE_CLK
|
select HAVE_CLK
|
||||||
select ARCH_USES_GETTIMEOFFSET
|
select ARCH_USES_GETTIMEOFFSET
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
help
|
help
|
||||||
Samsung S5P6442 CPU based systems
|
Samsung S5P6442 CPU based systems
|
||||||
|
|
||||||
|
@ -711,9 +711,9 @@ config ARCH_S5PC100
|
||||||
select CPU_V7
|
select CPU_V7
|
||||||
select ARM_L1_CACHE_SHIFT_6
|
select ARM_L1_CACHE_SHIFT_6
|
||||||
select ARCH_USES_GETTIMEOFFSET
|
select ARCH_USES_GETTIMEOFFSET
|
||||||
select HAVE_S3C2410_I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
select HAVE_S3C_RTC
|
select HAVE_S3C_RTC if RTC_CLASS
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
help
|
help
|
||||||
Samsung S5PC100 series based systems
|
Samsung S5PC100 series based systems
|
||||||
|
|
||||||
|
@ -726,9 +726,9 @@ config ARCH_S5PV210
|
||||||
select ARM_L1_CACHE_SHIFT_6
|
select ARM_L1_CACHE_SHIFT_6
|
||||||
select ARCH_HAS_CPUFREQ
|
select ARCH_HAS_CPUFREQ
|
||||||
select ARCH_USES_GETTIMEOFFSET
|
select ARCH_USES_GETTIMEOFFSET
|
||||||
select HAVE_S3C2410_I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
select HAVE_S3C_RTC
|
select HAVE_S3C_RTC if RTC_CLASS
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
help
|
help
|
||||||
Samsung S5PV210/S5PC110 series based systems
|
Samsung S5PV210/S5PC110 series based systems
|
||||||
|
|
||||||
|
@ -739,9 +739,9 @@ config ARCH_S5PV310
|
||||||
select GENERIC_GPIO
|
select GENERIC_GPIO
|
||||||
select HAVE_CLK
|
select HAVE_CLK
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
select HAVE_S3C_RTC
|
select HAVE_S3C_RTC if RTC_CLASS
|
||||||
select HAVE_S3C2410_I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
help
|
help
|
||||||
Samsung S5PV310 series based systems
|
Samsung S5PV310 series based systems
|
||||||
|
|
||||||
|
|
|
@ -1084,6 +1084,6 @@ memdump: mov r12, r0
|
||||||
reloc_end:
|
reloc_end:
|
||||||
|
|
||||||
.align
|
.align
|
||||||
.section ".stack", "w"
|
.section ".stack", "aw", %nobits
|
||||||
user_stack: .space 4096
|
user_stack: .space 4096
|
||||||
user_stack_end:
|
user_stack_end:
|
||||||
|
|
|
@ -57,7 +57,7 @@ SECTIONS
|
||||||
.bss : { *(.bss) }
|
.bss : { *(.bss) }
|
||||||
_end = .;
|
_end = .;
|
||||||
|
|
||||||
.stack (NOLOAD) : { *(.stack) }
|
.stack : { *(.stack) }
|
||||||
|
|
||||||
.stab 0 : { *(.stab) }
|
.stab 0 : { *(.stab) }
|
||||||
.stabstr 0 : { *(.stabstr) }
|
.stabstr 0 : { *(.stabstr) }
|
||||||
|
|
|
@ -251,15 +251,16 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
|
||||||
writel(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);
|
writel(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set priority on all interrupts.
|
* Set priority on all global interrupts.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < max_irq; i += 4)
|
for (i = 32; i < max_irq; i += 4)
|
||||||
writel(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);
|
writel(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Disable all interrupts.
|
* Disable all interrupts. Leave the PPI and SGIs alone
|
||||||
|
* as these enables are banked registers.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < max_irq; i += 32)
|
for (i = 32; i < max_irq; i += 32)
|
||||||
writel(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);
|
writel(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -277,11 +278,30 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
|
||||||
|
|
||||||
void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base)
|
void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base)
|
||||||
{
|
{
|
||||||
|
void __iomem *dist_base;
|
||||||
|
int i;
|
||||||
|
|
||||||
if (gic_nr >= MAX_GIC_NR)
|
if (gic_nr >= MAX_GIC_NR)
|
||||||
BUG();
|
BUG();
|
||||||
|
|
||||||
|
dist_base = gic_data[gic_nr].dist_base;
|
||||||
|
BUG_ON(!dist_base);
|
||||||
|
|
||||||
gic_data[gic_nr].cpu_base = base;
|
gic_data[gic_nr].cpu_base = base;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Deal with the banked PPI and SGI interrupts - disable all
|
||||||
|
* PPI interrupts, ensure all SGI interrupts are enabled.
|
||||||
|
*/
|
||||||
|
writel(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);
|
||||||
|
writel(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set priority on PPI and SGI interrupts
|
||||||
|
*/
|
||||||
|
for (i = 0; i < 32; i += 4)
|
||||||
|
writel(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);
|
||||||
|
|
||||||
writel(0xf0, base + GIC_CPU_PRIMASK);
|
writel(0xf0, base + GIC_CPU_PRIMASK);
|
||||||
writel(1, base + GIC_CPU_CTRL);
|
writel(1, base + GIC_CPU_CTRL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -238,7 +238,7 @@
|
||||||
@ Slightly optimised to avoid incrementing the pointer twice
|
@ Slightly optimised to avoid incrementing the pointer twice
|
||||||
usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort
|
usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort
|
||||||
.if \rept == 2
|
.if \rept == 2
|
||||||
usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort
|
usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
add\cond \ptr, #\rept * \inc
|
add\cond \ptr, #\rept * \inc
|
||||||
|
|
|
@ -75,7 +75,7 @@ extern unsigned long it8152_base_address;
|
||||||
IT8152_PD_IRQ(1) USB (USBR)
|
IT8152_PD_IRQ(1) USB (USBR)
|
||||||
IT8152_PD_IRQ(0) Audio controller (ACR)
|
IT8152_PD_IRQ(0) Audio controller (ACR)
|
||||||
*/
|
*/
|
||||||
#define IT8152_IRQ(x) (IRQ_BOARD_END + (x))
|
#define IT8152_IRQ(x) (IRQ_BOARD_START + (x))
|
||||||
|
|
||||||
/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */
|
/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */
|
||||||
#define IT8152_LD_IRQ_COUNT 9
|
#define IT8152_LD_IRQ_COUNT 9
|
||||||
|
|
|
@ -13,6 +13,10 @@ typedef struct {
|
||||||
|
|
||||||
#ifdef CONFIG_CPU_HAS_ASID
|
#ifdef CONFIG_CPU_HAS_ASID
|
||||||
#define ASID(mm) ((mm)->context.id & 255)
|
#define ASID(mm) ((mm)->context.id & 255)
|
||||||
|
|
||||||
|
/* init_mm.context.id_lock should be initialized. */
|
||||||
|
#define INIT_MM_CONTEXT(name) \
|
||||||
|
.context.id_lock = __SPIN_LOCK_UNLOCKED(name.context.id_lock),
|
||||||
#else
|
#else
|
||||||
#define ASID(mm) (0)
|
#define ASID(mm) (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -374,6 +374,9 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)
|
||||||
|
|
||||||
#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd)))
|
#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd)))
|
||||||
|
|
||||||
|
/* we don't need complex calculations here as the pmd is folded into the pgd */
|
||||||
|
#define pmd_addr_end(addr,end) (end)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Conversion functions: convert a page and protection to a page entry,
|
* Conversion functions: convert a page and protection to a page entry,
|
||||||
* and a page entry and page directory to the page they refer to.
|
* and a page entry and page directory to the page they refer to.
|
||||||
|
|
|
@ -748,8 +748,7 @@ static int hw_breakpoint_pending(unsigned long addr, unsigned int fsr,
|
||||||
breakpoint_handler(addr, regs);
|
breakpoint_handler(addr, regs);
|
||||||
break;
|
break;
|
||||||
case ARM_ENTRY_ASYNC_WATCHPOINT:
|
case ARM_ENTRY_ASYNC_WATCHPOINT:
|
||||||
WARN_ON("Asynchronous watchpoint exception taken. "
|
WARN(1, "Asynchronous watchpoint exception taken. Debugging results may be unreliable\n");
|
||||||
"Debugging results may be unreliable");
|
|
||||||
case ARM_ENTRY_SYNC_WATCHPOINT:
|
case ARM_ENTRY_SYNC_WATCHPOINT:
|
||||||
watchpoint_handler(addr, regs);
|
watchpoint_handler(addr, regs);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1749,7 +1749,7 @@ static inline int armv7_pmnc_has_overflowed(unsigned long pmnc)
|
||||||
static inline int armv7_pmnc_counter_has_overflowed(unsigned long pmnc,
|
static inline int armv7_pmnc_counter_has_overflowed(unsigned long pmnc,
|
||||||
enum armv7_counters counter)
|
enum armv7_counters counter)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret = 0;
|
||||||
|
|
||||||
if (counter == ARMV7_CYCLE_COUNTER)
|
if (counter == ARMV7_CYCLE_COUNTER)
|
||||||
ret = pmnc & ARMV7_FLAG_C;
|
ret = pmnc & ARMV7_FLAG_C;
|
||||||
|
|
|
@ -28,7 +28,7 @@ int notrace unwind_frame(struct stackframe *frame)
|
||||||
|
|
||||||
/* only go to a higher address on the stack */
|
/* only go to a higher address on the stack */
|
||||||
low = frame->sp;
|
low = frame->sp;
|
||||||
high = ALIGN(low, THREAD_SIZE) + THREAD_SIZE;
|
high = ALIGN(low, THREAD_SIZE);
|
||||||
|
|
||||||
/* check current frame pointer is within bounds */
|
/* check current frame pointer is within bounds */
|
||||||
if (fp < (low + 12) || fp + 4 >= high)
|
if (fp < (low + 12) || fp + 4 >= high)
|
||||||
|
|
|
@ -53,10 +53,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
|
||||||
void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
|
void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_KALLSYMS
|
#ifdef CONFIG_KALLSYMS
|
||||||
char sym1[KSYM_SYMBOL_LEN], sym2[KSYM_SYMBOL_LEN];
|
printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
|
||||||
sprint_symbol(sym1, where);
|
|
||||||
sprint_symbol(sym2, from);
|
|
||||||
printk("[<%08lx>] (%s) from [<%08lx>] (%s)\n", where, sym1, from, sym2);
|
|
||||||
#else
|
#else
|
||||||
printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
|
printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -279,7 +279,7 @@ int unwind_frame(struct stackframe *frame)
|
||||||
|
|
||||||
/* only go to a higher address on the stack */
|
/* only go to a higher address on the stack */
|
||||||
low = frame->sp;
|
low = frame->sp;
|
||||||
high = ALIGN(low, THREAD_SIZE) + THREAD_SIZE;
|
high = ALIGN(low, THREAD_SIZE);
|
||||||
|
|
||||||
pr_debug("%s(pc = %08lx lr = %08lx sp = %08lx)\n", __func__,
|
pr_debug("%s(pc = %08lx lr = %08lx sp = %08lx)\n", __func__,
|
||||||
frame->pc, frame->lr, frame->sp);
|
frame->pc, frame->lr, frame->sp);
|
||||||
|
|
|
@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be)
|
||||||
*/
|
*/
|
||||||
.L_found:
|
.L_found:
|
||||||
#if __LINUX_ARM_ARCH__ >= 5
|
#if __LINUX_ARM_ARCH__ >= 5
|
||||||
rsb r1, r3, #0
|
rsb r0, r3, #0
|
||||||
and r3, r3, r1
|
and r3, r3, r0
|
||||||
clz r3, r3
|
clz r3, r3
|
||||||
rsb r3, r3, #31
|
rsb r3, r3, #31
|
||||||
add r0, r2, r3
|
add r0, r2, r3
|
||||||
|
@ -190,5 +190,7 @@ ENDPROC(_find_next_bit_be)
|
||||||
addeq r2, r2, #1
|
addeq r2, r2, #1
|
||||||
mov r0, r2
|
mov r0, r2
|
||||||
#endif
|
#endif
|
||||||
|
cmp r1, r0 @ Clamp to maxbit
|
||||||
|
movlo r0, r1
|
||||||
mov pc, lr
|
mov pc, lr
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,6 @@
|
||||||
#ifndef __ASM_ARCH_VMALLOC_H
|
#ifndef __ASM_ARCH_VMALLOC_H
|
||||||
#define __ASM_ARCH_VMALLOC_H
|
#define __ASM_ARCH_VMALLOC_H
|
||||||
|
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_VMALLOC_H */
|
#endif /* __ASM_ARCH_VMALLOC_H */
|
||||||
|
|
|
@ -22,4 +22,4 @@
|
||||||
* 0xe0000000 to 0xefffffff. This gives us 256 MB of vm space and handles
|
* 0xe0000000 to 0xefffffff. This gives us 256 MB of vm space and handles
|
||||||
* larger physical memory designs better.
|
* larger physical memory designs better.
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xf0000000
|
#define VMALLOC_END 0xf0000000UL
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
|
@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = {
|
||||||
CLK(NULL, "uart1", &uart1_clk),
|
CLK(NULL, "uart1", &uart1_clk),
|
||||||
CLK(NULL, "uart2", &uart2_clk),
|
CLK(NULL, "uart2", &uart2_clk),
|
||||||
CLK("i2c_davinci.1", NULL, &i2c_clk),
|
CLK("i2c_davinci.1", NULL, &i2c_clk),
|
||||||
CLK("davinci-asp.0", NULL, &asp0_clk),
|
CLK("davinci-mcbsp.0", NULL, &asp0_clk),
|
||||||
CLK("davinci-asp.1", NULL, &asp1_clk),
|
CLK("davinci-mcbsp.1", NULL, &asp1_clk),
|
||||||
CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
|
CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
|
||||||
CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
|
CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
|
||||||
CLK("spi_davinci.0", NULL, &spi0_clk),
|
CLK("spi_davinci.0", NULL, &spi0_clk),
|
||||||
|
@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device dm355_asp1_device = {
|
static struct platform_device dm355_asp1_device = {
|
||||||
.name = "davinci-asp",
|
.name = "davinci-mcbsp",
|
||||||
.id = 1,
|
.id = 1,
|
||||||
.num_resources = ARRAY_SIZE(dm355_asp1_resources),
|
.num_resources = ARRAY_SIZE(dm355_asp1_resources),
|
||||||
.resource = dm355_asp1_resources,
|
.resource = dm355_asp1_resources,
|
||||||
|
|
|
@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = {
|
||||||
CLK(NULL, "usb", &usb_clk),
|
CLK(NULL, "usb", &usb_clk),
|
||||||
CLK("davinci_emac.1", NULL, &emac_clk),
|
CLK("davinci_emac.1", NULL, &emac_clk),
|
||||||
CLK("davinci_voicecodec", NULL, &voicecodec_clk),
|
CLK("davinci_voicecodec", NULL, &voicecodec_clk),
|
||||||
CLK("davinci-asp.0", NULL, &asp0_clk),
|
CLK("davinci-mcbsp", NULL, &asp0_clk),
|
||||||
CLK(NULL, "rto", &rto_clk),
|
CLK(NULL, "rto", &rto_clk),
|
||||||
CLK(NULL, "mjcp", &mjcp_clk),
|
CLK(NULL, "mjcp", &mjcp_clk),
|
||||||
CLK(NULL, NULL, NULL),
|
CLK(NULL, NULL, NULL),
|
||||||
|
@ -922,8 +922,8 @@ static struct resource dm365_asp_resources[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device dm365_asp_device = {
|
static struct platform_device dm365_asp_device = {
|
||||||
.name = "davinci-asp",
|
.name = "davinci-mcbsp",
|
||||||
.id = 0,
|
.id = -1,
|
||||||
.num_resources = ARRAY_SIZE(dm365_asp_resources),
|
.num_resources = ARRAY_SIZE(dm365_asp_resources),
|
||||||
.resource = dm365_asp_resources,
|
.resource = dm365_asp_resources,
|
||||||
};
|
};
|
||||||
|
|
|
@ -302,7 +302,7 @@ static struct clk_lookup dm644x_clks[] = {
|
||||||
CLK("davinci_emac.1", NULL, &emac_clk),
|
CLK("davinci_emac.1", NULL, &emac_clk),
|
||||||
CLK("i2c_davinci.1", NULL, &i2c_clk),
|
CLK("i2c_davinci.1", NULL, &i2c_clk),
|
||||||
CLK("palm_bk3710", NULL, &ide_clk),
|
CLK("palm_bk3710", NULL, &ide_clk),
|
||||||
CLK("davinci-asp", NULL, &asp_clk),
|
CLK("davinci-mcbsp", NULL, &asp_clk),
|
||||||
CLK("davinci_mmc.0", NULL, &mmcsd_clk),
|
CLK("davinci_mmc.0", NULL, &mmcsd_clk),
|
||||||
CLK(NULL, "spi", &spi_clk),
|
CLK(NULL, "spi", &spi_clk),
|
||||||
CLK(NULL, "gpio", &gpio_clk),
|
CLK(NULL, "gpio", &gpio_clk),
|
||||||
|
@ -580,7 +580,7 @@ static struct resource dm644x_asp_resources[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device dm644x_asp_device = {
|
static struct platform_device dm644x_asp_device = {
|
||||||
.name = "davinci-asp",
|
.name = "davinci-mcbsp",
|
||||||
.id = -1,
|
.id = -1,
|
||||||
.num_resources = ARRAY_SIZE(dm644x_asp_resources),
|
.num_resources = ARRAY_SIZE(dm644x_asp_resources),
|
||||||
.resource = dm644x_asp_resources,
|
.resource = dm644x_asp_resources,
|
||||||
|
|
|
@ -7,4 +7,4 @@
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xdf000000
|
#define VMALLOC_END 0xdf000000UL
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
/*
|
/**
|
||||||
* arch/arm/mach-ep93xx/include/mach/dma.h
|
* DOC: EP93xx DMA M2P memory to peripheral and peripheral to memory engine
|
||||||
|
*
|
||||||
|
* The EP93xx DMA M2P subsystem handles DMA transfers between memory and
|
||||||
|
* peripherals. DMA M2P channels are available for audio, UARTs and IrDA.
|
||||||
|
* See chapter 10 of the EP93xx users guide for full details on the DMA M2P
|
||||||
|
* engine.
|
||||||
|
*
|
||||||
|
* See sound/soc/ep93xx/ep93xx-pcm.c for an example use of the DMA M2P code.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_DMA_H
|
#ifndef __ASM_ARCH_DMA_H
|
||||||
|
@ -8,12 +16,34 @@
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct ep93xx_dma_buffer - Information about a buffer to be transferred
|
||||||
|
* using the DMA M2P engine
|
||||||
|
*
|
||||||
|
* @list: Entry in DMA buffer list
|
||||||
|
* @bus_addr: Physical address of the buffer
|
||||||
|
* @size: Size of the buffer in bytes
|
||||||
|
*/
|
||||||
struct ep93xx_dma_buffer {
|
struct ep93xx_dma_buffer {
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
u32 bus_addr;
|
u32 bus_addr;
|
||||||
u16 size;
|
u16 size;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct ep93xx_dma_m2p_client - Information about a DMA M2P client
|
||||||
|
*
|
||||||
|
* @name: Unique name for this client
|
||||||
|
* @flags: Client flags
|
||||||
|
* @cookie: User data to pass to callback functions
|
||||||
|
* @buffer_started: Non NULL function to call when a transfer is started.
|
||||||
|
* The arguments are the user data cookie and the DMA
|
||||||
|
* buffer which is starting.
|
||||||
|
* @buffer_finished: Non NULL function to call when a transfer is completed.
|
||||||
|
* The arguments are the user data cookie, the DMA buffer
|
||||||
|
* which has completed, and a boolean flag indicating if
|
||||||
|
* the transfer had an error.
|
||||||
|
*/
|
||||||
struct ep93xx_dma_m2p_client {
|
struct ep93xx_dma_m2p_client {
|
||||||
char *name;
|
char *name;
|
||||||
u8 flags;
|
u8 flags;
|
||||||
|
@ -24,10 +54,11 @@ struct ep93xx_dma_m2p_client {
|
||||||
struct ep93xx_dma_buffer *buf,
|
struct ep93xx_dma_buffer *buf,
|
||||||
int bytes, int error);
|
int bytes, int error);
|
||||||
|
|
||||||
/* Internal to the DMA code. */
|
/* private: Internal use only */
|
||||||
void *channel;
|
void *channel;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* DMA M2P ports */
|
||||||
#define EP93XX_DMA_M2P_PORT_I2S1 0x00
|
#define EP93XX_DMA_M2P_PORT_I2S1 0x00
|
||||||
#define EP93XX_DMA_M2P_PORT_I2S2 0x01
|
#define EP93XX_DMA_M2P_PORT_I2S2 0x01
|
||||||
#define EP93XX_DMA_M2P_PORT_AAC1 0x02
|
#define EP93XX_DMA_M2P_PORT_AAC1 0x02
|
||||||
|
@ -39,18 +70,80 @@ struct ep93xx_dma_m2p_client {
|
||||||
#define EP93XX_DMA_M2P_PORT_UART3 0x08
|
#define EP93XX_DMA_M2P_PORT_UART3 0x08
|
||||||
#define EP93XX_DMA_M2P_PORT_IRDA 0x09
|
#define EP93XX_DMA_M2P_PORT_IRDA 0x09
|
||||||
#define EP93XX_DMA_M2P_PORT_MASK 0x0f
|
#define EP93XX_DMA_M2P_PORT_MASK 0x0f
|
||||||
#define EP93XX_DMA_M2P_TX 0x00
|
|
||||||
#define EP93XX_DMA_M2P_RX 0x10
|
|
||||||
#define EP93XX_DMA_M2P_ABORT_ON_ERROR 0x20
|
|
||||||
#define EP93XX_DMA_M2P_IGNORE_ERROR 0x40
|
|
||||||
#define EP93XX_DMA_M2P_ERROR_MASK 0x60
|
|
||||||
|
|
||||||
int ep93xx_dma_m2p_client_register(struct ep93xx_dma_m2p_client *m2p);
|
/* DMA M2P client flags */
|
||||||
|
#define EP93XX_DMA_M2P_TX 0x00 /* Memory to peripheral */
|
||||||
|
#define EP93XX_DMA_M2P_RX 0x10 /* Peripheral to memory */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* DMA M2P client error handling flags. See the EP93xx users guide
|
||||||
|
* documentation on the DMA M2P CONTROL register for more details
|
||||||
|
*/
|
||||||
|
#define EP93XX_DMA_M2P_ABORT_ON_ERROR 0x20 /* Abort on peripheral error */
|
||||||
|
#define EP93XX_DMA_M2P_IGNORE_ERROR 0x40 /* Ignore peripheral errors */
|
||||||
|
#define EP93XX_DMA_M2P_ERROR_MASK 0x60 /* Mask of error bits */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ep93xx_dma_m2p_client_register - Register a client with the DMA M2P
|
||||||
|
* subsystem
|
||||||
|
*
|
||||||
|
* @m2p: Client information to register
|
||||||
|
* returns 0 on success
|
||||||
|
*
|
||||||
|
* The DMA M2P subsystem allocates a channel and an interrupt line for the DMA
|
||||||
|
* client
|
||||||
|
*/
|
||||||
|
int ep93xx_dma_m2p_client_register(struct ep93xx_dma_m2p_client *m2p);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ep93xx_dma_m2p_client_unregister - Unregister a client from the DMA M2P
|
||||||
|
* subsystem
|
||||||
|
*
|
||||||
|
* @m2p: Client to unregister
|
||||||
|
*
|
||||||
|
* Any transfers currently in progress will be completed in hardware, but
|
||||||
|
* ignored in software.
|
||||||
|
*/
|
||||||
void ep93xx_dma_m2p_client_unregister(struct ep93xx_dma_m2p_client *m2p);
|
void ep93xx_dma_m2p_client_unregister(struct ep93xx_dma_m2p_client *m2p);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ep93xx_dma_m2p_submit - Submit a DMA M2P transfer
|
||||||
|
*
|
||||||
|
* @m2p: DMA Client to submit the transfer on
|
||||||
|
* @buf: DMA Buffer to submit
|
||||||
|
*
|
||||||
|
* If the current or next transfer positions are free on the M2P client then
|
||||||
|
* the transfer is started immediately. If not, the transfer is added to the
|
||||||
|
* list of pending transfers. This function must not be called from the
|
||||||
|
* buffer_finished callback for an M2P channel.
|
||||||
|
*
|
||||||
|
*/
|
||||||
void ep93xx_dma_m2p_submit(struct ep93xx_dma_m2p_client *m2p,
|
void ep93xx_dma_m2p_submit(struct ep93xx_dma_m2p_client *m2p,
|
||||||
struct ep93xx_dma_buffer *buf);
|
struct ep93xx_dma_buffer *buf);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ep93xx_dma_m2p_submit_recursive - Put a DMA transfer on the pending list
|
||||||
|
* for an M2P channel
|
||||||
|
*
|
||||||
|
* @m2p: DMA Client to submit the transfer on
|
||||||
|
* @buf: DMA Buffer to submit
|
||||||
|
*
|
||||||
|
* This function must only be called from the buffer_finished callback for an
|
||||||
|
* M2P channel. It is commonly used to add the next transfer in a chained list
|
||||||
|
* of DMA transfers.
|
||||||
|
*/
|
||||||
void ep93xx_dma_m2p_submit_recursive(struct ep93xx_dma_m2p_client *m2p,
|
void ep93xx_dma_m2p_submit_recursive(struct ep93xx_dma_m2p_client *m2p,
|
||||||
struct ep93xx_dma_buffer *buf);
|
struct ep93xx_dma_buffer *buf);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ep93xx_dma_m2p_flush - Flush all pending transfers on a DMA M2P client
|
||||||
|
*
|
||||||
|
* @m2p: DMA client to flush transfers on
|
||||||
|
*
|
||||||
|
* Any transfers currently in progress will be completed in hardware, but
|
||||||
|
* ignored in software.
|
||||||
|
*
|
||||||
|
*/
|
||||||
void ep93xx_dma_m2p_flush(struct ep93xx_dma_m2p_client *m2p);
|
void ep93xx_dma_m2p_flush(struct ep93xx_dma_m2p_client *m2p);
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_DMA_H */
|
#endif /* __ASM_ARCH_DMA_H */
|
||||||
|
|
|
@ -7,4 +7,4 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#define VMALLOC_END 0xf0000000
|
#define VMALLOC_END 0xf0000000UL
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
#ifndef __ARCH_ARM_VMALLOC_H
|
#ifndef __ARCH_ARM_VMALLOC_H
|
||||||
#define __ARCH_ARM_VMALLOC_H
|
#define __ARCH_ARM_VMALLOC_H
|
||||||
|
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -250,9 +250,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
|
||||||
.flags = IMXUART_HAVE_RTSCTS,
|
.flags = IMXUART_HAVE_RTSCTS,
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_TOUCHSCREEN_ADS7846) \
|
|
||||||
|| defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
|
|
||||||
|
|
||||||
#define ADS7846_PENDOWN (GPIO_PORTD | 25)
|
#define ADS7846_PENDOWN (GPIO_PORTD | 25)
|
||||||
|
|
||||||
static void ads7846_dev_init(void)
|
static void ads7846_dev_init(void)
|
||||||
|
@ -273,9 +270,7 @@ static struct ads7846_platform_data ads7846_config __initdata = {
|
||||||
.get_pendown_state = ads7846_get_pendown_state,
|
.get_pendown_state = ads7846_get_pendown_state,
|
||||||
.keep_vref_on = 1,
|
.keep_vref_on = 1,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
|
|
||||||
static struct spi_board_info eukrea_mbimx27_spi_board_info[] __initdata = {
|
static struct spi_board_info eukrea_mbimx27_spi_board_info[] __initdata = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.modalias = "ads7846",
|
.modalias = "ads7846",
|
||||||
|
@ -294,7 +289,6 @@ static const struct spi_imx_master eukrea_mbimx27_spi0_data __initconst = {
|
||||||
.chipselect = eukrea_mbimx27_spi_cs,
|
.chipselect = eukrea_mbimx27_spi_cs,
|
||||||
.num_chipselect = ARRAY_SIZE(eukrea_mbimx27_spi_cs),
|
.num_chipselect = ARRAY_SIZE(eukrea_mbimx27_spi_cs),
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = {
|
static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = {
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
|
@ -854,10 +854,9 @@ int __init kirkwood_find_tclk(void)
|
||||||
|
|
||||||
kirkwood_pcie_id(&dev, &rev);
|
kirkwood_pcie_id(&dev, &rev);
|
||||||
|
|
||||||
if ((dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 ||
|
if (dev == MV88F6281_DEV_ID || dev == MV88F6282_DEV_ID)
|
||||||
rev == MV88F6281_REV_A1)) ||
|
if (((readl(SAMPLE_AT_RESET) >> 21) & 1) == 0)
|
||||||
(dev == MV88F6282_DEV_ID))
|
return 200000000;
|
||||||
return 200000000;
|
|
||||||
|
|
||||||
return 166666667;
|
return 166666667;
|
||||||
}
|
}
|
||||||
|
|
|
@ -225,5 +225,5 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
|
||||||
.init_machine = d2net_v2_init,
|
.init_machine = d2net_v2_init,
|
||||||
.map_io = kirkwood_map_io,
|
.map_io = kirkwood_map_io,
|
||||||
.init_irq = kirkwood_init_irq,
|
.init_irq = kirkwood_init_irq,
|
||||||
.timer = &lacie_v2_timer,
|
.timer = &kirkwood_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -111,17 +111,3 @@ void __init lacie_v2_hdd_power_init(int hdd_num)
|
||||||
pr_err("Failed to power up HDD%d\n", i + 1);
|
pr_err("Failed to power up HDD%d\n", i + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
* Timer
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
static void lacie_v2_timer_init(void)
|
|
||||||
{
|
|
||||||
kirkwood_tclk = 166666667;
|
|
||||||
orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct sys_timer lacie_v2_timer = {
|
|
||||||
.init = lacie_v2_timer_init,
|
|
||||||
};
|
|
||||||
|
|
|
@ -13,6 +13,4 @@ void lacie_v2_register_flash(void);
|
||||||
void lacie_v2_register_i2c_devices(void);
|
void lacie_v2_register_i2c_devices(void);
|
||||||
void lacie_v2_hdd_power_init(int hdd_num);
|
void lacie_v2_hdd_power_init(int hdd_num);
|
||||||
|
|
||||||
extern struct sys_timer lacie_v2_timer;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -59,7 +59,7 @@ void __init kirkwood_mpp_conf(unsigned int *mpp_list)
|
||||||
}
|
}
|
||||||
printk("\n");
|
printk("\n");
|
||||||
|
|
||||||
while (*mpp_list) {
|
for ( ; *mpp_list; mpp_list++) {
|
||||||
unsigned int num = MPP_NUM(*mpp_list);
|
unsigned int num = MPP_NUM(*mpp_list);
|
||||||
unsigned int sel = MPP_SEL(*mpp_list);
|
unsigned int sel = MPP_SEL(*mpp_list);
|
||||||
int shift, gpio_mode;
|
int shift, gpio_mode;
|
||||||
|
@ -88,8 +88,6 @@ void __init kirkwood_mpp_conf(unsigned int *mpp_list)
|
||||||
if (sel != 0)
|
if (sel != 0)
|
||||||
gpio_mode = 0;
|
gpio_mode = 0;
|
||||||
orion_gpio_set_valid(num, gpio_mode);
|
orion_gpio_set_valid(num, gpio_mode);
|
||||||
|
|
||||||
mpp_list++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
printk(KERN_DEBUG " final MPP regs:");
|
printk(KERN_DEBUG " final MPP regs:");
|
||||||
|
|
|
@ -262,7 +262,7 @@ MACHINE_START(NETSPACE_V2, "LaCie Network Space v2")
|
||||||
.init_machine = netspace_v2_init,
|
.init_machine = netspace_v2_init,
|
||||||
.map_io = kirkwood_map_io,
|
.map_io = kirkwood_map_io,
|
||||||
.init_irq = kirkwood_init_irq,
|
.init_irq = kirkwood_init_irq,
|
||||||
.timer = &lacie_v2_timer,
|
.timer = &kirkwood_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -272,7 +272,7 @@ MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2")
|
||||||
.init_machine = netspace_v2_init,
|
.init_machine = netspace_v2_init,
|
||||||
.map_io = kirkwood_map_io,
|
.map_io = kirkwood_map_io,
|
||||||
.init_irq = kirkwood_init_irq,
|
.init_irq = kirkwood_init_irq,
|
||||||
.timer = &lacie_v2_timer,
|
.timer = &kirkwood_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -282,6 +282,6 @@ MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2")
|
||||||
.init_machine = netspace_v2_init,
|
.init_machine = netspace_v2_init,
|
||||||
.map_io = kirkwood_map_io,
|
.map_io = kirkwood_map_io,
|
||||||
.init_irq = kirkwood_init_irq,
|
.init_irq = kirkwood_init_irq,
|
||||||
.timer = &lacie_v2_timer,
|
.timer = &kirkwood_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -403,7 +403,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2")
|
||||||
.init_machine = netxbig_v2_init,
|
.init_machine = netxbig_v2_init,
|
||||||
.map_io = kirkwood_map_io,
|
.map_io = kirkwood_map_io,
|
||||||
.init_irq = kirkwood_init_irq,
|
.init_irq = kirkwood_init_irq,
|
||||||
.timer = &lacie_v2_timer,
|
.timer = &kirkwood_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -413,6 +413,6 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2")
|
||||||
.init_machine = netxbig_v2_init,
|
.init_machine = netxbig_v2_init,
|
||||||
.map_io = kirkwood_map_io,
|
.map_io = kirkwood_map_io,
|
||||||
.init_irq = kirkwood_init_irq,
|
.init_irq = kirkwood_init_irq,
|
||||||
.timer = &lacie_v2_timer,
|
.timer = &kirkwood_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -27,6 +27,10 @@
|
||||||
#include "mpp.h"
|
#include "mpp.h"
|
||||||
#include "tsx1x-common.h"
|
#include "tsx1x-common.h"
|
||||||
|
|
||||||
|
/* for the PCIe reset workaround */
|
||||||
|
#include <plat/pcie.h>
|
||||||
|
|
||||||
|
|
||||||
#define QNAP_TS41X_JUMPER_JP1 45
|
#define QNAP_TS41X_JUMPER_JP1 45
|
||||||
|
|
||||||
static struct i2c_board_info __initdata qnap_ts41x_i2c_rtc = {
|
static struct i2c_board_info __initdata qnap_ts41x_i2c_rtc = {
|
||||||
|
@ -140,8 +144,16 @@ static void __init qnap_ts41x_init(void)
|
||||||
|
|
||||||
static int __init ts41x_pci_init(void)
|
static int __init ts41x_pci_init(void)
|
||||||
{
|
{
|
||||||
if (machine_is_ts41x())
|
if (machine_is_ts41x()) {
|
||||||
|
/*
|
||||||
|
* Without this explicit reset, the PCIe SATA controller
|
||||||
|
* (Marvell 88sx7042/sata_mv) is known to stop working
|
||||||
|
* after a few minutes.
|
||||||
|
*/
|
||||||
|
orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE);
|
||||||
|
|
||||||
kirkwood_pcie_init(KW_PCIE0);
|
kirkwood_pcie_init(KW_PCIE0);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,8 @@ static inline int cpu_is_pxa910(void)
|
||||||
#ifdef CONFIG_CPU_MMP2
|
#ifdef CONFIG_CPU_MMP2
|
||||||
static inline int cpu_is_mmp2(void)
|
static inline int cpu_is_mmp2(void)
|
||||||
{
|
{
|
||||||
return (((cpu_readid_id() >> 8) & 0xff) == 0x58);
|
return (((read_cpuid_id() >> 8) & 0xff) == 0x58);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
#define cpu_is_mmp2() (0)
|
#define cpu_is_mmp2() (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#ifndef __ASM_ARCH_MSM_VMALLOC_H
|
#ifndef __ASM_ARCH_MSM_VMALLOC_H
|
||||||
#define __ASM_ARCH_MSM_VMALLOC_H
|
#define __ASM_ARCH_MSM_VMALLOC_H
|
||||||
|
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
|
||||||
}
|
}
|
||||||
printk("\n");
|
printk("\n");
|
||||||
|
|
||||||
while (*mpp_list) {
|
for ( ; *mpp_list; mpp_list++) {
|
||||||
unsigned int num = MPP_NUM(*mpp_list);
|
unsigned int num = MPP_NUM(*mpp_list);
|
||||||
unsigned int sel = MPP_SEL(*mpp_list);
|
unsigned int sel = MPP_SEL(*mpp_list);
|
||||||
int shift, gpio_mode;
|
int shift, gpio_mode;
|
||||||
|
@ -83,8 +83,6 @@ void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
|
||||||
if (sel != 0)
|
if (sel != 0)
|
||||||
gpio_mode = 0;
|
gpio_mode = 0;
|
||||||
orion_gpio_set_valid(num, gpio_mode);
|
orion_gpio_set_valid(num, gpio_mode);
|
||||||
|
|
||||||
mpp_list++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
printk(KERN_DEBUG " final MPP regs:");
|
printk(KERN_DEBUG " final MPP regs:");
|
||||||
|
|
|
@ -42,9 +42,9 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;
|
||||||
#define imx25_add_mxc_nand(pdata) \
|
#define imx25_add_mxc_nand(pdata) \
|
||||||
imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
|
imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
|
||||||
|
|
||||||
extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
|
extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
|
||||||
#define imx25_add_spi_imx(id, pdata) \
|
#define imx25_add_spi_imx(id, pdata) \
|
||||||
imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
|
imx_add_spi_imx(&imx25_cspi_data[id], pdata)
|
||||||
#define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata)
|
#define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata)
|
||||||
#define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
|
#define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
|
||||||
#define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)
|
#define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
|
|
||||||
#include <mach/common.h>
|
#include <mach/common.h>
|
||||||
#include <mach/iomux-mx3.h>
|
#include <mach/iomux-mx3.h>
|
||||||
|
#include <mach/spi.h>
|
||||||
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
|
|
||||||
|
@ -59,14 +60,12 @@ static struct spi_board_info pcm037_spi_dev[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Platform Data for MXC CSPI */
|
/* Platform Data for MXC CSPI */
|
||||||
#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
|
|
||||||
static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)};
|
static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)};
|
||||||
|
|
||||||
static const struct spi_imx_master pcm037_spi1_pdata __initconst = {
|
static const struct spi_imx_master pcm037_spi1_pdata __initconst = {
|
||||||
.chipselect = pcm037_spi1_cs,
|
.chipselect = pcm037_spi1_cs,
|
||||||
.num_chipselect = ARRAY_SIZE(pcm037_spi1_cs),
|
.num_chipselect = ARRAY_SIZE(pcm037_spi1_cs),
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
/* GPIO-keys input device */
|
/* GPIO-keys input device */
|
||||||
static struct gpio_keys_button pcm037_gpio_keys[] = {
|
static struct gpio_keys_button pcm037_gpio_keys[] = {
|
||||||
|
@ -171,7 +170,7 @@ static struct platform_device pcm037_gpio_keys_device = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static int eet_init_devices(void)
|
static int __init eet_init_devices(void)
|
||||||
{
|
{
|
||||||
if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET)
|
if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -16,4 +16,4 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
|
@ -321,10 +321,9 @@ static struct platform_device omap_wdt_device = {
|
||||||
static int __init omap_init_wdt(void)
|
static int __init omap_init_wdt(void)
|
||||||
{
|
{
|
||||||
if (!cpu_is_omap16xx())
|
if (!cpu_is_omap16xx())
|
||||||
return;
|
return -ENODEV;
|
||||||
|
|
||||||
platform_device_register(&omap_wdt_device);
|
return platform_device_register(&omap_wdt_device);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
subsys_initcall(omap_init_wdt);
|
subsys_initcall(omap_init_wdt);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#ifndef __ASM_ARCH_CAMERA_H_
|
#ifndef __ASM_ARCH_CAMERA_H_
|
||||||
#define __ASM_ARCH_CAMERA_H_
|
#define __ASM_ARCH_CAMERA_H_
|
||||||
|
|
||||||
|
#include <media/omap1_camera.h>
|
||||||
|
|
||||||
void omap1_camera_init(void *);
|
void omap1_camera_init(void *);
|
||||||
|
|
||||||
static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info)
|
static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info)
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd8000000
|
#define VMALLOC_END 0xd8000000UL
|
||||||
|
|
|
@ -242,9 +242,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
|
||||||
mmc[0].gpio_cd = gpio + 0;
|
mmc[0].gpio_cd = gpio + 0;
|
||||||
omap2_hsmmc_init(mmc);
|
omap2_hsmmc_init(mmc);
|
||||||
|
|
||||||
/* link regulators to MMC adapters */
|
|
||||||
devkit8000_vmmc1_supply.dev = mmc[0].dev;
|
|
||||||
|
|
||||||
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
|
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
|
||||||
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
|
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
|
||||||
|
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xf8000000
|
#define VMALLOC_END 0xf8000000UL
|
||||||
|
|
|
@ -127,7 +127,7 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
|
||||||
/* Initialize gpiolib. */
|
/* Initialize gpiolib. */
|
||||||
orion_gpio_init();
|
orion_gpio_init();
|
||||||
|
|
||||||
while (mode->mpp >= 0) {
|
for ( ; mode->mpp >= 0; mode++) {
|
||||||
u32 *reg;
|
u32 *reg;
|
||||||
int num_type;
|
int num_type;
|
||||||
int shift;
|
int shift;
|
||||||
|
@ -160,8 +160,6 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
|
||||||
orion_gpio_set_unused(mode->mpp);
|
orion_gpio_set_unused(mode->mpp);
|
||||||
|
|
||||||
orion_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO));
|
orion_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO));
|
||||||
|
|
||||||
mode++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
writel(mpp_0_7_ctrl, MPP_0_7_CTRL);
|
writel(mpp_0_7_ctrl, MPP_0_7_CTRL);
|
||||||
|
|
|
@ -239,7 +239,7 @@ static struct platform_nand_data ts78xx_ts_nand_data = {
|
||||||
static struct resource ts78xx_ts_nand_resources = {
|
static struct resource ts78xx_ts_nand_resources = {
|
||||||
.start = TS_NAND_DATA,
|
.start = TS_NAND_DATA,
|
||||||
.end = TS_NAND_DATA + 4,
|
.end = TS_NAND_DATA + 4,
|
||||||
.flags = IORESOURCE_IO,
|
.flags = IORESOURCE_MEM,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device ts78xx_ts_nand_device = {
|
static struct platform_device ts78xx_ts_nand_device = {
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
* The vmalloc() routines leaves a hole of 4kB between each vmalloced
|
* The vmalloc() routines leaves a hole of 4kB between each vmalloced
|
||||||
* area for the same reason. ;)
|
* area for the same reason. ;)
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
|
@ -476,8 +476,6 @@ static void __init cmx2xx_init(void)
|
||||||
|
|
||||||
static void __init cmx2xx_init_irq(void)
|
static void __init cmx2xx_init_irq(void)
|
||||||
{
|
{
|
||||||
pxa27x_init_irq();
|
|
||||||
|
|
||||||
if (cpu_is_pxa25x()) {
|
if (cpu_is_pxa25x()) {
|
||||||
pxa25x_init_irq();
|
pxa25x_init_irq();
|
||||||
cmx2xx_pci_init_irq(CMX255_GPIO_IT8152_IRQ);
|
cmx2xx_pci_init_irq(CMX255_GPIO_IT8152_IRQ);
|
||||||
|
|
|
@ -116,7 +116,7 @@ static struct platform_device smc91x_device = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULE)
|
#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
|
||||||
static uint16_t lcd_power_on[] = {
|
static uint16_t lcd_power_on[] = {
|
||||||
/* single frame */
|
/* single frame */
|
||||||
SMART_CMD_NOOP,
|
SMART_CMD_NOOP,
|
||||||
|
|
|
@ -7,4 +7,4 @@
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xdc000000
|
#define VMALLOC_END 0xdc000000UL
|
||||||
|
|
|
@ -143,7 +143,7 @@ config MACH_SMDK6410
|
||||||
select S3C_DEV_USB_HSOTG
|
select S3C_DEV_USB_HSOTG
|
||||||
select S3C_DEV_WDT
|
select S3C_DEV_WDT
|
||||||
select SAMSUNG_DEV_KEYPAD
|
select SAMSUNG_DEV_KEYPAD
|
||||||
select HAVE_S3C2410_WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
select S3C64XX_SETUP_SDHCI
|
select S3C64XX_SETUP_SDHCI
|
||||||
select S3C64XX_SETUP_I2C1
|
select S3C64XX_SETUP_I2C1
|
||||||
select S3C64XX_SETUP_IDE
|
select S3C64XX_SETUP_IDE
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* arch/arm/mach-shark/include/mach/vmalloc.h
|
* arch/arm/mach-shark/include/mach/vmalloc.h
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd0000000
|
#define VMALLOC_END 0xd0000000UL
|
||||||
|
|
|
@ -163,11 +163,13 @@ static struct mtd_partition nor_flash_partitions[] = {
|
||||||
.name = "loader",
|
.name = "loader",
|
||||||
.offset = 0x00000000,
|
.offset = 0x00000000,
|
||||||
.size = 512 * 1024,
|
.size = 512 * 1024,
|
||||||
|
.mask_flags = MTD_WRITEABLE,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "bootenv",
|
.name = "bootenv",
|
||||||
.offset = MTDPART_OFS_APPEND,
|
.offset = MTDPART_OFS_APPEND,
|
||||||
.size = 512 * 1024,
|
.size = 512 * 1024,
|
||||||
|
.mask_flags = MTD_WRITEABLE,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "kernel_ro",
|
.name = "kernel_ro",
|
||||||
|
@ -581,6 +583,10 @@ static int fsi_set_rate(int is_porta, int rate)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
switch (rate) {
|
switch (rate) {
|
||||||
|
case 44100:
|
||||||
|
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 11283000));
|
||||||
|
ret = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
|
||||||
|
break;
|
||||||
case 48000:
|
case 48000:
|
||||||
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));
|
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));
|
||||||
clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));
|
clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));
|
||||||
|
|
|
@ -220,8 +220,7 @@ static void pllc2_disable(struct clk *clk)
|
||||||
__raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR);
|
__raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pllc2_set_rate(struct clk *clk,
|
static int pllc2_set_rate(struct clk *clk, unsigned long rate)
|
||||||
unsigned long rate, int algo_id)
|
|
||||||
{
|
{
|
||||||
unsigned long value;
|
unsigned long value;
|
||||||
int idx;
|
int idx;
|
||||||
|
@ -463,8 +462,7 @@ static int fsidiv_enable(struct clk *clk)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsidiv_set_rate(struct clk *clk,
|
static int fsidiv_set_rate(struct clk *clk, unsigned long rate)
|
||||||
unsigned long rate, int algo_id)
|
|
||||||
{
|
{
|
||||||
int idx;
|
int idx;
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ static struct intc_vect intca_vectors[] __initdata = {
|
||||||
INTC_VECT(IRQ14A, 0x03c0), INTC_VECT(IRQ15A, 0x03e0),
|
INTC_VECT(IRQ14A, 0x03c0), INTC_VECT(IRQ15A, 0x03e0),
|
||||||
INTC_VECT(IRQ16A, 0x3200), INTC_VECT(IRQ17A, 0x3220),
|
INTC_VECT(IRQ16A, 0x3200), INTC_VECT(IRQ17A, 0x3220),
|
||||||
INTC_VECT(IRQ18A, 0x3240), INTC_VECT(IRQ19A, 0x3260),
|
INTC_VECT(IRQ18A, 0x3240), INTC_VECT(IRQ19A, 0x3260),
|
||||||
INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ31A, 0x32a0),
|
INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ21A, 0x32a0),
|
||||||
INTC_VECT(IRQ22A, 0x32c0), INTC_VECT(IRQ23A, 0x32e0),
|
INTC_VECT(IRQ22A, 0x32c0), INTC_VECT(IRQ23A, 0x32e0),
|
||||||
INTC_VECT(IRQ24A, 0x3300), INTC_VECT(IRQ25A, 0x3320),
|
INTC_VECT(IRQ24A, 0x3300), INTC_VECT(IRQ25A, 0x3320),
|
||||||
INTC_VECT(IRQ26A, 0x3340), INTC_VECT(IRQ27A, 0x3360),
|
INTC_VECT(IRQ26A, 0x3340), INTC_VECT(IRQ27A, 0x3360),
|
||||||
|
|
|
@ -75,14 +75,14 @@ void __init ux500_init_irq(void)
|
||||||
static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask)
|
static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask)
|
||||||
{
|
{
|
||||||
/* wait for the operation to complete */
|
/* wait for the operation to complete */
|
||||||
while (readl(reg) & mask)
|
while (readl_relaxed(reg) & mask)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ux500_cache_sync(void)
|
static inline void ux500_cache_sync(void)
|
||||||
{
|
{
|
||||||
void __iomem *base = __io_address(UX500_L2CC_BASE);
|
void __iomem *base = __io_address(UX500_L2CC_BASE);
|
||||||
writel(0, base + L2X0_CACHE_SYNC);
|
writel_relaxed(0, base + L2X0_CACHE_SYNC);
|
||||||
ux500_cache_wait(base + L2X0_CACHE_SYNC, 1);
|
ux500_cache_wait(base + L2X0_CACHE_SYNC, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ static void ux500_l2x0_inv_all(void)
|
||||||
uint32_t l2x0_way_mask = (1<<16) - 1; /* Bitmask of active ways */
|
uint32_t l2x0_way_mask = (1<<16) - 1; /* Bitmask of active ways */
|
||||||
|
|
||||||
/* invalidate all ways */
|
/* invalidate all ways */
|
||||||
writel(l2x0_way_mask, l2x0_base + L2X0_INV_WAY);
|
writel_relaxed(l2x0_way_mask, l2x0_base + L2X0_INV_WAY);
|
||||||
ux500_cache_wait(l2x0_base + L2X0_INV_WAY, l2x0_way_mask);
|
ux500_cache_wait(l2x0_base + L2X0_INV_WAY, l2x0_way_mask);
|
||||||
ux500_cache_sync();
|
ux500_cache_sync();
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,4 +18,4 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#define VMALLOC_END 0xd8000000
|
#define VMALLOC_END 0xd8000000UL
|
||||||
|
|
|
@ -54,7 +54,9 @@ static struct map_desc ct_ca9x4_io_desc[] __initdata = {
|
||||||
|
|
||||||
static void __init ct_ca9x4_map_io(void)
|
static void __init ct_ca9x4_map_io(void)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_LOCAL_TIMERS
|
||||||
twd_base = MMIO_P2V(A9_MPCORE_TWD);
|
twd_base = MMIO_P2V(A9_MPCORE_TWD);
|
||||||
|
#endif
|
||||||
v2m_map_io(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
|
v2m_map_io(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -198,7 +198,7 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot)
|
||||||
* fragmentation of the DMA space, and also prevents allocations
|
* fragmentation of the DMA space, and also prevents allocations
|
||||||
* smaller than a section from crossing a section boundary.
|
* smaller than a section from crossing a section boundary.
|
||||||
*/
|
*/
|
||||||
bit = fls(size - 1) + 1;
|
bit = fls(size - 1);
|
||||||
if (bit > SECTION_SHIFT)
|
if (bit > SECTION_SHIFT)
|
||||||
bit = SECTION_SHIFT;
|
bit = SECTION_SHIFT;
|
||||||
align = 1 << bit;
|
align = 1 << bit;
|
||||||
|
|
|
@ -206,8 +206,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
|
||||||
*/
|
*/
|
||||||
if (pfn_valid(pfn)) {
|
if (pfn_valid(pfn)) {
|
||||||
printk(KERN_WARNING "BUG: Your driver calls ioremap() on system memory. This leads\n"
|
printk(KERN_WARNING "BUG: Your driver calls ioremap() on system memory. This leads\n"
|
||||||
KERN_WARNING "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n"
|
"to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n"
|
||||||
KERN_WARNING "will fail in the next kernel release. Please fix your driver.\n");
|
"will fail in the next kernel release. Please fix your driver.\n");
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,15 +12,7 @@
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/devices-common.h>
|
#include <mach/devices-common.h>
|
||||||
#ifdef SDMA_IS_MERGED
|
|
||||||
#include <mach/sdma.h>
|
#include <mach/sdma.h>
|
||||||
#else
|
|
||||||
struct sdma_platform_data {
|
|
||||||
int sdma_version;
|
|
||||||
char *cpu_name;
|
|
||||||
int to_version;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct imx_imx_sdma_data {
|
struct imx_imx_sdma_data {
|
||||||
resource_size_t iobase;
|
resource_size_t iobase;
|
||||||
|
|
|
@ -27,6 +27,7 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = {
|
||||||
imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)
|
imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)
|
||||||
imx21_cspi_data_entry(0, 1),
|
imx21_cspi_data_entry(0, 1),
|
||||||
imx21_cspi_data_entry(1, 2),
|
imx21_cspi_data_entry(1, 2),
|
||||||
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_MX25
|
#ifdef CONFIG_ARCH_MX25
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008 STMicroelectronics
|
* Copyright (C) 2008 STMicroelectronics
|
||||||
* Copyright (C) 2010 Alessandro Rubini
|
* Copyright (C) 2010 Alessandro Rubini
|
||||||
|
* Copyright (C) 2010 Linus Walleij for ST-Ericsson
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License version 2, as
|
* it under the terms of the GNU General Public License version 2, as
|
||||||
|
@ -16,11 +17,13 @@
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
#include <linux/jiffies.h>
|
#include <linux/jiffies.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
#include <linux/cnt32_to_63.h>
|
||||||
|
#include <linux/timer.h>
|
||||||
#include <asm/mach/time.h>
|
#include <asm/mach/time.h>
|
||||||
|
|
||||||
#include <plat/mtu.h>
|
#include <plat/mtu.h>
|
||||||
|
|
||||||
void __iomem *mtu_base; /* ssigned by machine code */
|
void __iomem *mtu_base; /* Assigned by machine code */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Kernel assumes that sched_clock can be called early
|
* Kernel assumes that sched_clock can be called early
|
||||||
|
@ -48,16 +51,82 @@ static struct clocksource nmdk_clksrc = {
|
||||||
/*
|
/*
|
||||||
* Override the global weak sched_clock symbol with this
|
* Override the global weak sched_clock symbol with this
|
||||||
* local implementation which uses the clocksource to get some
|
* local implementation which uses the clocksource to get some
|
||||||
* better resolution when scheduling the kernel. We accept that
|
* better resolution when scheduling the kernel.
|
||||||
* this wraps around for now, since it is just a relative time
|
*
|
||||||
* stamp. (Inspired by OMAP implementation.)
|
* Because the hardware timer period may be quite short
|
||||||
|
* (32.3 secs on the 133 MHz MTU timer selection on ux500)
|
||||||
|
* and because cnt32_to_63() needs to be called at least once per
|
||||||
|
* half period to work properly, a kernel keepwarm() timer is set up
|
||||||
|
* to ensure this requirement is always met.
|
||||||
|
*
|
||||||
|
* Also the sched_clock timer will wrap around at some point,
|
||||||
|
* here we set it to run continously for a year.
|
||||||
*/
|
*/
|
||||||
|
#define SCHED_CLOCK_MIN_WRAP 3600*24*365
|
||||||
|
static struct timer_list cnt32_to_63_keepwarm_timer;
|
||||||
|
static u32 sched_mult;
|
||||||
|
static u32 sched_shift;
|
||||||
|
|
||||||
unsigned long long notrace sched_clock(void)
|
unsigned long long notrace sched_clock(void)
|
||||||
{
|
{
|
||||||
return clocksource_cyc2ns(nmdk_clksrc.read(
|
u64 cycles;
|
||||||
&nmdk_clksrc),
|
|
||||||
nmdk_clksrc.mult,
|
if (unlikely(!mtu_base))
|
||||||
nmdk_clksrc.shift);
|
return 0;
|
||||||
|
|
||||||
|
cycles = cnt32_to_63(-readl(mtu_base + MTU_VAL(0)));
|
||||||
|
/*
|
||||||
|
* sched_mult is guaranteed to be even so will
|
||||||
|
* shift out bit 63
|
||||||
|
*/
|
||||||
|
return (cycles * sched_mult) >> sched_shift;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Just kick sched_clock every so often */
|
||||||
|
static void cnt32_to_63_keepwarm(unsigned long data)
|
||||||
|
{
|
||||||
|
mod_timer(&cnt32_to_63_keepwarm_timer, round_jiffies(jiffies + data));
|
||||||
|
(void) sched_clock();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set up a timer to keep sched_clock():s 32_to_63 algorithm warm
|
||||||
|
* once in half a 32bit timer wrap interval.
|
||||||
|
*/
|
||||||
|
static void __init nmdk_sched_clock_init(unsigned long rate)
|
||||||
|
{
|
||||||
|
u32 v;
|
||||||
|
unsigned long delta;
|
||||||
|
u64 days;
|
||||||
|
|
||||||
|
/* Find the apropriate mult and shift factors */
|
||||||
|
clocks_calc_mult_shift(&sched_mult, &sched_shift,
|
||||||
|
rate, NSEC_PER_SEC, SCHED_CLOCK_MIN_WRAP);
|
||||||
|
/* We need to multiply by an even number to get rid of bit 63 */
|
||||||
|
if (sched_mult & 1)
|
||||||
|
sched_mult++;
|
||||||
|
|
||||||
|
/* Let's see what we get, take max counter and scale it */
|
||||||
|
days = (0xFFFFFFFFFFFFFFFFLLU * sched_mult) >> sched_shift;
|
||||||
|
do_div(days, NSEC_PER_SEC);
|
||||||
|
do_div(days, (3600*24));
|
||||||
|
|
||||||
|
pr_info("sched_clock: using %d bits @ %lu Hz wrap in %lu days\n",
|
||||||
|
(64 - sched_shift), rate, (unsigned long) days);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Program a timer to kick us at half 32bit wraparound
|
||||||
|
* Formula: seconds per wrap = (2^32) / f
|
||||||
|
*/
|
||||||
|
v = 0xFFFFFFFFUL / rate;
|
||||||
|
/* We want half of the wrap time to keep cnt32_to_63 warm */
|
||||||
|
v /= 2;
|
||||||
|
pr_debug("sched_clock: prescaled timer rate: %lu Hz, "
|
||||||
|
"initialize keepwarm timer every %d seconds\n", rate, v);
|
||||||
|
/* Convert seconds to jiffies */
|
||||||
|
delta = msecs_to_jiffies(v*1000);
|
||||||
|
setup_timer(&cnt32_to_63_keepwarm_timer, cnt32_to_63_keepwarm, delta);
|
||||||
|
mod_timer(&cnt32_to_63_keepwarm_timer, round_jiffies(jiffies + delta));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clockevent device: use one-shot mode */
|
/* Clockevent device: use one-shot mode */
|
||||||
|
@ -161,13 +230,15 @@ void __init nmdk_timer_init(void)
|
||||||
writel(0, mtu_base + MTU_BGLR(0));
|
writel(0, mtu_base + MTU_BGLR(0));
|
||||||
writel(cr | MTU_CRn_ENA, mtu_base + MTU_CR(0));
|
writel(cr | MTU_CRn_ENA, mtu_base + MTU_CR(0));
|
||||||
|
|
||||||
/* Now the scheduling clock is ready */
|
/* Now the clock source is ready */
|
||||||
nmdk_clksrc.read = nmdk_read_timer;
|
nmdk_clksrc.read = nmdk_read_timer;
|
||||||
|
|
||||||
if (clocksource_register(&nmdk_clksrc))
|
if (clocksource_register(&nmdk_clksrc))
|
||||||
pr_err("timer: failed to initialize clock source %s\n",
|
pr_err("timer: failed to initialize clock source %s\n",
|
||||||
nmdk_clksrc.name);
|
nmdk_clksrc.name);
|
||||||
|
|
||||||
|
nmdk_sched_clock_init(rate);
|
||||||
|
|
||||||
/* Timer 1 is used for events */
|
/* Timer 1 is used for events */
|
||||||
|
|
||||||
clockevents_calc_mult_shift(&nmdk_clkevt, rate, MTU_MIN_RANGE);
|
clockevents_calc_mult_shift(&nmdk_clkevt, rate, MTU_MIN_RANGE);
|
||||||
|
|
|
@ -284,12 +284,14 @@ void __init omap_dsp_reserve_sdram_memblock(void)
|
||||||
if (!size)
|
if (!size)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT);
|
paddr = memblock_alloc(size, SZ_1M);
|
||||||
if (!paddr) {
|
if (!paddr) {
|
||||||
pr_err("%s: failed to reserve %x bytes\n",
|
pr_err("%s: failed to reserve %x bytes\n",
|
||||||
__func__, size);
|
__func__, size);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
memblock_free(paddr, size);
|
||||||
|
memblock_remove(paddr, size);
|
||||||
|
|
||||||
omap_dsp_phys_mempool_base = paddr;
|
omap_dsp_phys_mempool_base = paddr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1983,6 +1983,8 @@ static int omap2_dma_handle_ch(int ch)
|
||||||
|
|
||||||
dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(ch));
|
dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(ch));
|
||||||
dma_write(1 << ch, IRQSTATUS_L0);
|
dma_write(1 << ch, IRQSTATUS_L0);
|
||||||
|
/* read back the register to flush the write */
|
||||||
|
dma_read(IRQSTATUS_L0);
|
||||||
|
|
||||||
/* If the ch is not chained then chain_id will be -1 */
|
/* If the ch is not chained then chain_id will be -1 */
|
||||||
if (dma_chan[ch].chain_id != -1) {
|
if (dma_chan[ch].chain_id != -1) {
|
||||||
|
|
|
@ -11,12 +11,15 @@
|
||||||
#ifndef __PLAT_PCIE_H
|
#ifndef __PLAT_PCIE_H
|
||||||
#define __PLAT_PCIE_H
|
#define __PLAT_PCIE_H
|
||||||
|
|
||||||
|
struct pci_bus;
|
||||||
|
|
||||||
u32 orion_pcie_dev_id(void __iomem *base);
|
u32 orion_pcie_dev_id(void __iomem *base);
|
||||||
u32 orion_pcie_rev(void __iomem *base);
|
u32 orion_pcie_rev(void __iomem *base);
|
||||||
int orion_pcie_link_up(void __iomem *base);
|
int orion_pcie_link_up(void __iomem *base);
|
||||||
int orion_pcie_x4_mode(void __iomem *base);
|
int orion_pcie_x4_mode(void __iomem *base);
|
||||||
int orion_pcie_get_local_bus_nr(void __iomem *base);
|
int orion_pcie_get_local_bus_nr(void __iomem *base);
|
||||||
void orion_pcie_set_local_bus_nr(void __iomem *base, int nr);
|
void orion_pcie_set_local_bus_nr(void __iomem *base, int nr);
|
||||||
|
void orion_pcie_reset(void __iomem *base);
|
||||||
void orion_pcie_setup(void __iomem *base,
|
void orion_pcie_setup(void __iomem *base,
|
||||||
struct mbus_dram_target_info *dram);
|
struct mbus_dram_target_info *dram);
|
||||||
int orion_pcie_rd_conf(void __iomem *base, struct pci_bus *bus,
|
int orion_pcie_rd_conf(void __iomem *base, struct pci_bus *bus,
|
||||||
|
|
|
@ -181,11 +181,6 @@ void __init orion_pcie_setup(void __iomem *base,
|
||||||
u16 cmd;
|
u16 cmd;
|
||||||
u32 mask;
|
u32 mask;
|
||||||
|
|
||||||
/*
|
|
||||||
* soft reset PCIe unit
|
|
||||||
*/
|
|
||||||
orion_pcie_reset(base);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Point PCIe unit MBUS decode windows to DRAM space.
|
* Point PCIe unit MBUS decode windows to DRAM space.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
#include <linux/user.h>
|
#include <linux/user.h>
|
||||||
#include <linux/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
#include <linux/ptrace.h>
|
#include <linux/ptrace.h>
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
#include <linux/ptrace.h>
|
#include <linux/ptrace.h>
|
||||||
|
|
|
@ -202,7 +202,7 @@ simscsi_readwrite10 (struct scsi_cmnd *sc, int mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
|
simscsi_queuecommand_lck (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
|
||||||
{
|
{
|
||||||
unsigned int target_id = sc->device->id;
|
unsigned int target_id = sc->device->id;
|
||||||
char fname[MAX_ROOT_LEN+16];
|
char fname[MAX_ROOT_LEN+16];
|
||||||
|
@ -326,6 +326,8 @@ simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static DEF_SCSI_QCMD(simscsi_queuecommand)
|
||||||
|
|
||||||
static int
|
static int
|
||||||
simscsi_host_reset (struct scsi_cmnd *sc)
|
simscsi_host_reset (struct scsi_cmnd *sc)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
#include <linux/ptrace.h>
|
#include <linux/ptrace.h>
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
#include <linux/ptrace.h>
|
#include <linux/ptrace.h>
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/unistd.h>
|
#include <linux/unistd.h>
|
||||||
#include <linux/ptrace.h>
|
#include <linux/ptrace.h>
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include <linux/namei.h>
|
#include <linux/namei.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
#include <linux/syscalls.h>
|
#include <linux/syscalls.h>
|
||||||
#include <linux/utsname.h>
|
#include <linux/utsname.h>
|
||||||
#include <linux/vfs.h>
|
#include <linux/vfs.h>
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue