Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 169
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 ac98695d 编写于 作者: T Trond Myklebust
浏览文件
操作

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

上级 d9bc125c 93bbad8f
展开全部 隐藏空白更改
内联 并排
Showing with 22229 addition and 3305 deletion
Documentation/i2c/busses/i2c-i801
浏览文件 @ ac98695d
...@@ -48,14 +48,9 @@ following: ...@@ -48,14 +48,9 @@ following:
The SMBus controller is function 3 in device 1f. Class 0c05 is SMBus Serial The SMBus controller is function 3 in device 1f. Class 0c05 is SMBus Serial
Controller. Controller.
If you do NOT see the 24x3 device at function 3, and you can't figure out
any way in the BIOS to enable it,
The ICH chips are quite similar to Intel's PIIX4 chip, at least in the The ICH chips are quite similar to Intel's PIIX4 chip, at least in the
SMBus controller. SMBus controller.
See the file i2c-piix4 for some additional information.
Process Call Support Process Call Support
-------------------- --------------------
...@@ -74,6 +69,61 @@ SMBus 2.0 Support ...@@ -74,6 +69,61 @@ SMBus 2.0 Support
The 82801DB (ICH4) and later chips support several SMBus 2.0 features. The 82801DB (ICH4) and later chips support several SMBus 2.0 features.
Hidden ICH SMBus
----------------
If your system has an Intel ICH south bridge, but you do NOT see the
SMBus device at 00:1f.3 in lspci, and you can't figure out any way in the
BIOS to enable it, it means it has been hidden by the BIOS code. Asus is
well known for first doing this on their P4B motherboard, and many other
boards after that. Some vendor machines are affected as well.
The first thing to try is the "i2c_ec" ACPI driver. It could be that the
SMBus was hidden on purpose because it'll be driven by ACPI. If the
i2c_ec driver works for you, just forget about the i2c-i801 driver and
don't try to unhide the ICH SMBus. Even if i2c_ec doesn't work, you
better make sure that the SMBus isn't used by the ACPI code. Try loading
the "fan" and "thermal" drivers, and check in /proc/acpi/fan and
/proc/acpi/thermal_zone. If you find anything there, it's likely that
the ACPI is accessing the SMBus and it's safer not to unhide it. Only
once you are certain that ACPI isn't using the SMBus, you can attempt
to unhide it.
In order to unhide the SMBus, we need to change the value of a PCI
register before the kernel enumerates the PCI devices. This is done in
drivers/pci/quirks.c, where all affected boards must be listed (see
function asus_hides_smbus_hostbridge.) If the SMBus device is missing,
and you think there's something interesting on the SMBus (e.g. a
hardware monitoring chip), you need to add your board to the list.
The motherboard is identified using the subvendor and subdevice IDs of the
host bridge PCI device. Get yours with "lspci -n -v -s 00:00.0":
00:00.0 Class 0600: 8086:2570 (rev 02)
Subsystem: 1043:80f2
Flags: bus master, fast devsel, latency 0
Memory at fc000000 (32-bit, prefetchable) [size=32M]
Capabilities: [e4] #09 [2106]
Capabilities: [a0] AGP version 3.0
Here the host bridge ID is 2570 (82865G/PE/P), the subvendor ID is 1043
(Asus) and the subdevice ID is 80f2 (P4P800-X). You can find the symbolic
names for the bridge ID and the subvendor ID in include/linux/pci_ids.h,
and then add a case for your subdevice ID at the right place in
drivers/pci/quirks.c. Then please give it very good testing, to make sure
that the unhidden SMBus doesn't conflict with e.g. ACPI.
If it works, proves useful (i.e. there are usable chips on the SMBus)
and seems safe, please submit a patch for inclusion into the kernel.
Note: There's a useful script in lm_sensors 2.10.2 and later, named
unhide_ICH_SMBus (in prog/hotplug), which uses the fakephp driver to
temporarily unhide the SMBus without having to patch and recompile your
kernel. It's very convenient if you just want to check if there's
anything interesting on your hidden ICH SMBus.
********************** **********************
The lm_sensors project gratefully acknowledges the support of Texas The lm_sensors project gratefully acknowledges the support of Texas
Instruments in the initial development of this driver. Instruments in the initial development of this driver.
......
Documentation/i2c/busses/i2c-parport
浏览文件 @ ac98695d
...@@ -19,6 +19,7 @@ It currently supports the following devices: ...@@ -19,6 +19,7 @@ It currently supports the following devices:
* (type=4) Analog Devices ADM1032 evaluation board * (type=4) Analog Devices ADM1032 evaluation board
* (type=5) Analog Devices evaluation boards: ADM1025, ADM1030, ADM1031 * (type=5) Analog Devices evaluation boards: ADM1025, ADM1030, ADM1031
* (type=6) Barco LPT->DVI (K5800236) adapter * (type=6) Barco LPT->DVI (K5800236) adapter
* (type=7) One For All JP1 parallel port adapter
These devices use different pinout configurations, so you have to tell These devices use different pinout configurations, so you have to tell
the driver what you have, using the type module parameter. There is no the driver what you have, using the type module parameter. There is no
...@@ -157,3 +158,17 @@ many more, using /dev/velleman. ...@@ -157,3 +158,17 @@ many more, using /dev/velleman.
http://home.wanadoo.nl/hihihi/libk8005.htm http://home.wanadoo.nl/hihihi/libk8005.htm
http://struyve.mine.nu:8080/index.php?block=k8000 http://struyve.mine.nu:8080/index.php?block=k8000
http://sourceforge.net/projects/libk8005/ http://sourceforge.net/projects/libk8005/
One For All JP1 parallel port adapter
-------------------------------------
The JP1 project revolves around a set of remote controls which expose
the I2C bus their internal configuration EEPROM lives on via a 6 pin
jumper in the battery compartment. More details can be found at:
http://www.hifi-remote.com/jp1/
Details of the simple parallel port hardware can be found at:
http://www.hifi-remote.com/jp1/hardware.shtml
Documentation/i2c/busses/i2c-piix4
浏览文件 @ ac98695d
...@@ -6,7 +6,7 @@ Supported adapters: ...@@ -6,7 +6,7 @@ Supported adapters:
Datasheet: Publicly available at the Intel website Datasheet: Publicly available at the Intel website
* ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges
Datasheet: Only available via NDA from ServerWorks Datasheet: Only available via NDA from ServerWorks
* ATI IXP southbridges IXP200, IXP300, IXP400 * ATI IXP200, IXP300, IXP400 and SB600 southbridges
Datasheet: Not publicly available Datasheet: Not publicly available
* Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
Datasheet: Publicly available at the SMSC website http://www.smsc.com Datasheet: Publicly available at the SMSC website http://www.smsc.com
......
Documentation/i2c/busses/i2c-viapro
浏览文件 @ ac98695d
...@@ -13,6 +13,9 @@ Supported adapters: ...@@ -13,6 +13,9 @@ Supported adapters:
* VIA Technologies, Inc. VT8235, VT8237R, VT8237A, VT8251 * VIA Technologies, Inc. VT8235, VT8237R, VT8237A, VT8251
Datasheet: available on request and under NDA from VIA Datasheet: available on request and under NDA from VIA
* VIA Technologies, Inc. CX700
Datasheet: available on request and under NDA from VIA
Authors: Authors:
Kysti Mlkki <kmalkki@cc.hut.fi>, Kysti Mlkki <kmalkki@cc.hut.fi>,
Mark D. Studebaker <mdsxyz123@yahoo.com>, Mark D. Studebaker <mdsxyz123@yahoo.com>,
...@@ -44,6 +47,7 @@ Your lspci -n listing must show one of these : ...@@ -44,6 +47,7 @@ Your lspci -n listing must show one of these :
device 1106:3227 (VT8237R) device 1106:3227 (VT8237R)
device 1106:3337 (VT8237A) device 1106:3337 (VT8237A)
device 1106:3287 (VT8251) device 1106:3287 (VT8251)
device 1106:8324 (CX700)
If none of these show up, you should look in the BIOS for settings like If none of these show up, you should look in the BIOS for settings like
enable ACPI / SMBus or even USB. enable ACPI / SMBus or even USB.
...@@ -51,3 +55,6 @@ enable ACPI / SMBus or even USB. ...@@ -51,3 +55,6 @@ enable ACPI / SMBus or even USB.
Except for the oldest chips (VT82C596A/B, VT82C686A and most probably Except for the oldest chips (VT82C596A/B, VT82C686A and most probably
VT8231), this driver supports I2C block transactions. Such transactions VT8231), this driver supports I2C block transactions. Such transactions
are mainly useful to read from and write to EEPROMs. are mainly useful to read from and write to EEPROMs.
The CX700 additionally appears to support SMBus PEC, although this driver
doesn't implement it yet.
Documentation/i2c/porting-clients
浏览文件 @ ac98695d
...@@ -129,6 +129,12 @@ Technical changes: ...@@ -129,6 +129,12 @@ Technical changes:
structure, those name member should be initialized to a driver name structure, those name member should be initialized to a driver name
string. i2c_driver itself has no name member anymore. string. i2c_driver itself has no name member anymore.
* [Driver model] Instead of shutdown or reboot notifiers, provide a
shutdown() method in your driver.
* [Power management] Use the driver model suspend() and resume()
callbacks instead of the obsolete pm_register() calls.
Coding policy: Coding policy:
* [Copyright] Use (C), not (c), for copyright. * [Copyright] Use (C), not (c), for copyright.
......
Documentation/i2c/smbus-protocol
浏览文件 @ ac98695d
...@@ -97,7 +97,7 @@ SMBus Write Word Data ...@@ -97,7 +97,7 @@ SMBus Write Word Data
===================== =====================
This is the opposite operation of the Read Word Data command. 16 bits This is the opposite operation of the Read Word Data command. 16 bits
of data is read from a device, from a designated register that is of data is written to a device, to the designated register that is
specified through the Comm byte. specified through the Comm byte.
S Addr Wr [A] Comm [A] DataLow [A] DataHigh [A] P S Addr Wr [A] Comm [A] DataLow [A] DataHigh [A] P
......
Documentation/i2c/writing-clients
浏览文件 @ ac98695d
...@@ -21,20 +21,26 @@ The driver structure ...@@ -21,20 +21,26 @@ The driver structure
Usually, you will implement a single driver structure, and instantiate Usually, you will implement a single driver structure, and instantiate
all clients from it. Remember, a driver structure contains general access all clients from it. Remember, a driver structure contains general access
routines, a client structure specific information like the actual I2C routines, and should be zero-initialized except for fields with data you
address. provide. A client structure holds device-specific information like the
driver model device node, and its I2C address.
static struct i2c_driver foo_driver = { static struct i2c_driver foo_driver = {
.driver = { .driver = {
.name = "foo", .name = "foo",
}, },
.attach_adapter = &foo_attach_adapter, .attach_adapter = foo_attach_adapter,
.detach_client = &foo_detach_client, .detach_client = foo_detach_client,
.command = &foo_command /* may be NULL */ .shutdown = foo_shutdown, /* optional */
.suspend = foo_suspend, /* optional */
.resume = foo_resume, /* optional */
.command = foo_command, /* optional */
} }
The name field must match the driver name, including the case. It must not The name field is the driver name, and must not contain spaces. It
contain spaces, and may be up to 31 characters long. should match the module name (if the driver can be compiled as a module),
although you can use MODULE_ALIAS (passing "foo" in this example) to add
another name for the module.
All other fields are for call-back functions which will be explained All other fields are for call-back functions which will be explained
below. below.
...@@ -43,11 +49,18 @@ below. ...@@ -43,11 +49,18 @@ below.
Extra client data Extra client data
================= =================
The client structure has a special `data' field that can point to any Each client structure has a special `data' field that can point to any
structure at all. You can use this to keep client-specific data. You structure at all. You should use this to keep device-specific data,
especially in drivers that handle multiple I2C or SMBUS devices. You
do not always need this, but especially for `sensors' drivers, it can do not always need this, but especially for `sensors' drivers, it can
be very useful. be very useful.
/* store the value */
void i2c_set_clientdata(struct i2c_client *client, void *data);
/* retrieve the value */
void *i2c_get_clientdata(struct i2c_client *client);
An example structure is below. An example structure is below.
struct foo_data { struct foo_data {
...@@ -493,6 +506,33 @@ by `__init_data'. Hose functions and structures can be removed after ...@@ -493,6 +506,33 @@ by `__init_data'. Hose functions and structures can be removed after
kernel booting (or module loading) is completed. kernel booting (or module loading) is completed.
Power Management
================
If your I2C device needs special handling when entering a system low
power state -- like putting a transceiver into a low power mode, or
activating a system wakeup mechanism -- do that in the suspend() method.
The resume() method should reverse what the suspend() method does.
These are standard driver model calls, and they work just like they
would for any other driver stack. The calls can sleep, and can use
I2C messaging to the device being suspended or resumed (since their
parent I2C adapter is active when these calls are issued, and IRQs
are still enabled).
System Shutdown
===============
If your I2C device needs special handling when the system shuts down
or reboots (including kexec) -- like turning something off -- use a
shutdown() method.
Again, this is a standard driver model call, working just like it
would for any other driver stack: the calls can sleep, and can use
I2C messaging.
Command function Command function
================ ================
......
Documentation/powerpc/booting-without-of.txt
浏览文件 @ ac98695d
...@@ -1334,6 +1334,9 @@ platforms are moved over to use the flattened-device-tree model. ...@@ -1334,6 +1334,9 @@ platforms are moved over to use the flattened-device-tree model.
fsl-usb2-mph compatible controllers. Either this property or fsl-usb2-mph compatible controllers. Either this property or
"port0" (or both) must be defined for "fsl-usb2-mph" compatible "port0" (or both) must be defined for "fsl-usb2-mph" compatible
controllers. controllers.
- dr_mode : indicates the working mode for "fsl-usb2-dr" compatible
controllers. Can be "host", "peripheral", or "otg". Default to
"host" if not defined for backward compatibility.
Recommended properties : Recommended properties :
- interrupts : <a b> where a is the interrupt number and b is a - interrupts : <a b> where a is the interrupt number and b is a
...@@ -1367,6 +1370,7 @@ platforms are moved over to use the flattened-device-tree model. ...@@ -1367,6 +1370,7 @@ platforms are moved over to use the flattened-device-tree model.
#size-cells = <0>; #size-cells = <0>;
interrupt-parent = <700>; interrupt-parent = <700>;
interrupts = <26 1>; interrupts = <26 1>;
dr_mode = "otg";
phy = "ulpi"; phy = "ulpi";
}; };
......
Documentation/powerpc/mpc52xx-device-tree-bindings.txt
浏览文件 @ ac98695d
MPC52xx Device Tree Bindings MPC5200 Device Tree Bindings
---------------------------- ----------------------------
(c) 2006 Secret Lab Technologies Ltd (c) 2006-2007 Secret Lab Technologies Ltd
Grant Likely <grant.likely at secretlab.ca> Grant Likely <grant.likely at secretlab.ca>
********** DRAFT *********** ********** DRAFT ***********
...@@ -20,11 +20,11 @@ described in Documentation/powerpc/booting-without-of.txt), or passed ...@@ -20,11 +20,11 @@ described in Documentation/powerpc/booting-without-of.txt), or passed
by Open Firmare (IEEE 1275) compatible firmware using an OF compatible by Open Firmare (IEEE 1275) compatible firmware using an OF compatible
client interface API. client interface API.
This document specifies the requirements on the device-tree for mpc52xx This document specifies the requirements on the device-tree for mpc5200
based boards. These requirements are above and beyond the details based boards. These requirements are above and beyond the details
specified in either the OpenFirmware spec or booting-without-of.txt specified in either the OpenFirmware spec or booting-without-of.txt
All new mpc52xx-based boards are expected to match this document. In All new mpc5200-based boards are expected to match this document. In
cases where this document is not sufficient to support a new board port, cases where this document is not sufficient to support a new board port,
this document should be updated as part of adding the new board support. this document should be updated as part of adding the new board support.
...@@ -32,26 +32,26 @@ II - Philosophy ...@@ -32,26 +32,26 @@ II - Philosophy
=============== ===============
The core of this document is naming convention. The whole point of The core of this document is naming convention. The whole point of
defining this convention is to reduce or eliminate the number of defining this convention is to reduce or eliminate the number of
special cases required to support a 52xx board. If all 52xx boards special cases required to support a 5200 board. If all 5200 boards
follow the same convention, then generic 52xx support code will work follow the same convention, then generic 5200 support code will work
rather than coding special cases for each new board. rather than coding special cases for each new board.
This section tries to capture the thought process behind why the naming This section tries to capture the thought process behind why the naming
convention is what it is. convention is what it is.
1. Node names 1. names
------------- ---------
There is strong convention/requirements already established for children There is strong convention/requirements already established for children
of the root node. 'cpus' describes the processor cores, 'memory' of the root node. 'cpus' describes the processor cores, 'memory'
describes memory, and 'chosen' provides boot configuration. Other nodes describes memory, and 'chosen' provides boot configuration. Other nodes
are added to describe devices attached to the processor local bus. are added to describe devices attached to the processor local bus.
Following convention already established with other system-on-chip Following convention already established with other system-on-chip
processors, MPC52xx boards must have an 'soc5200' node as a child of the processors, 5200 device trees should use the name 'soc5200' for the
root node. parent node of on chip devices, and the root node should be its parent.
The soc5200 node holds child nodes for all on chip devices. Child nodes Child nodes are typically named after the configured function. ie.
are typically named after the configured function. ie. the FEC node is the FEC node is named 'ethernet', and a PSC in uart mode is named 'serial'.
named 'ethernet', and a PSC in uart mode is named 'serial'.
2. device_type property 2. device_type property
----------------------- -----------------------
...@@ -66,28 +66,47 @@ exactly. ...@@ -66,28 +66,47 @@ exactly.
Since device_type isn't enough to match devices to drivers, there also Since device_type isn't enough to match devices to drivers, there also
needs to be a naming convention for the compatible property. Compatible needs to be a naming convention for the compatible property. Compatible
is an list of device descriptions sorted from specific to generic. For is an list of device descriptions sorted from specific to generic. For
the mpc52xx, the required format for each compatible value is the mpc5200, the required format for each compatible value is
<chip>-<device>[-<mode>]. At the minimum, the list shall contain two <chip>-<device>[-<mode>]. The OS should be able to match a device driver
items; the first specifying the exact chip, and the second specifying to the device based solely on the compatible value. If two drivers
mpc52xx for the chip. match on the compatible list; the 'most compatible' driver should be
selected.
ie. ethernet on mpc5200b: compatible = "mpc5200b-ethernet\0mpc52xx-ethernet"
The split between the MPC5200 and the MPC5200B leaves a bit of a
The idea here is that most drivers will match to the most generic field connundrum. How should the compatible property be set up to provide
in the compatible list (mpc52xx-*), but can also test the more specific maximum compatability information; but still acurately describe the
field for enabling bug fixes or extra features. chip? For the MPC5200; the answer is easy. Most of the SoC devices
originally appeared on the MPC5200. Since they didn't exist anywhere
else; the 5200 compatible properties will contain only one item;
"mpc5200-<device>".
The 5200B is almost the same as the 5200, but not quite. It fixes
silicon bugs and it adds a small number of enhancements. Most of the
devices either provide exactly the same interface as on the 5200. A few
devices have extra functions but still have a backwards compatible mode.
To express this infomation as completely as possible, 5200B device trees
should have two items in the compatible list;
"mpc5200b-<device>\0mpc5200-<device>". It is *strongly* recommended
that 5200B device trees follow this convention (instead of only listing
the base mpc5200 item).
If another chip appear on the market with one of the mpc5200 SoC
devices, then the compatible list should include mpc5200-<device>.
ie. ethernet on mpc5200: compatible = "mpc5200-ethernet"
ethernet on mpc5200b: compatible = "mpc5200b-ethernet\0mpc5200-ethernet"
Modal devices, like PSCs, also append the configured function to the Modal devices, like PSCs, also append the configured function to the
end of the compatible field. ie. A PSC in i2s mode would specify end of the compatible field. ie. A PSC in i2s mode would specify
"mpc52xx-psc-i2s", not "mpc52xx-i2s". This convention is chosen to "mpc5200-psc-i2s", not "mpc5200-i2s". This convention is chosen to
avoid naming conflicts with non-psc devices providing the same avoid naming conflicts with non-psc devices providing the same
function. For example, "mpc52xx-spi" and "mpc52xx-psc-spi" describe function. For example, "mpc5200-spi" and "mpc5200-psc-spi" describe
the mpc5200 simple spi device and a PSC spi mode respectively. the mpc5200 simple spi device and a PSC spi mode respectively.
If the soc device is more generic and present on other SOCs, the If the soc device is more generic and present on other SOCs, the
compatible property can specify the more generic device type also. compatible property can specify the more generic device type also.
ie. mscan: compatible = "mpc5200-mscan\0mpc52xx-mscan\0fsl,mscan"; ie. mscan: compatible = "mpc5200-mscan\0fsl,mscan";
At the time of writing, exact chip may be either 'mpc5200' or At the time of writing, exact chip may be either 'mpc5200' or
'mpc5200b'. 'mpc5200b'.
...@@ -96,7 +115,7 @@ Device drivers should always try to match as generically as possible. ...@@ -96,7 +115,7 @@ Device drivers should always try to match as generically as possible.
III - Structure III - Structure
=============== ===============
The device tree for an mpc52xx board follows the structure defined in The device tree for an mpc5200 board follows the structure defined in
booting-without-of.txt with the following additional notes: booting-without-of.txt with the following additional notes:
0) the root node 0) the root node
...@@ -115,7 +134,7 @@ Typical memory description node; see booting-without-of. ...@@ -115,7 +134,7 @@ Typical memory description node; see booting-without-of.
3) The soc5200 node 3) The soc5200 node
------------------- -------------------
This node describes the on chip SOC peripherals. Every mpc52xx based This node describes the on chip SOC peripherals. Every mpc5200 based
board will have this node, and as such there is a common naming board will have this node, and as such there is a common naming
convention for SOC devices. convention for SOC devices.
...@@ -125,71 +144,111 @@ name type description ...@@ -125,71 +144,111 @@ name type description
device_type string must be "soc" device_type string must be "soc"
ranges int should be <0 baseaddr baseaddr+10000> ranges int should be <0 baseaddr baseaddr+10000>
reg int must be <baseaddr 10000> reg int must be <baseaddr 10000>
compatible string mpc5200: "mpc5200-soc"
mpc5200b: "mpc5200b-soc\0mpc5200-soc"
system-frequency int Fsystem frequency; source of all
other clocks.
bus-frequency int IPB bus frequency in HZ. Clock rate
used by most of the soc devices.
#interrupt-cells int must be <3>.
Recommended properties: Recommended properties:
name type description name type description
---- ---- ----------- ---- ---- -----------
compatible string should be "<chip>-soc\0mpc52xx-soc" model string Exact model of the chip;
ie. "mpc5200b-soc\0mpc52xx-soc" ie: model="fsl,mpc5200"
#interrupt-cells int must be <3>. If it is not defined revision string Silicon revision of chip
here then it must be defined in every ie: revision="M08A"
soc device node.
bus-frequency int IPB bus frequency in HZ. Clock rate The 'model' and 'revision' properties are *strongly* recommended. Having
used by most of the soc devices. them presence acts as a bit of a safety net for working around as yet
Defining it here avoids needing it undiscovered bugs on one version of silicon. For example, device drivers
added to every device node. can use the model and revision properties to decide if a bug fix should
be turned on.
4) soc5200 child nodes 4) soc5200 child nodes
---------------------- ----------------------
Any on chip SOC devices available to Linux must appear as soc5200 child nodes. Any on chip SOC devices available to Linux must appear as soc5200 child nodes.
Note: in the tables below, '*' matches all <chip> values. ie. Note: The tables below show the value for the mpc5200. A mpc5200b device
*-pic would translate to "mpc5200-pic\0mpc52xx-pic" tree should use the "mpc5200b-<device>\0mpc5200-<device> form.
Required soc5200 child nodes: Required soc5200 child nodes:
name device_type compatible Description name device_type compatible Description
---- ----------- ---------- ----------- ---- ----------- ---------- -----------
cdm@<addr> cdm *-cmd Clock Distribution cdm@<addr> cdm mpc5200-cmd Clock Distribution
pic@<addr> interrupt-controller *-pic need an interrupt pic@<addr> interrupt-controller mpc5200-pic need an interrupt
controller to boot controller to boot
bestcomm@<addr> dma-controller *-bestcomm 52xx pic also requires bestcomm@<addr> dma-controller mpc5200-bestcomm 5200 pic also requires
the bestcomm device the bestcomm device
Recommended soc5200 child nodes; populate as needed for your board Recommended soc5200 child nodes; populate as needed for your board
name device_type compatible Description name device_type compatible Description
---- ----------- ---------- ----------- ---- ----------- ---------- -----------
gpt@<addr> gpt *-gpt General purpose timers gpt@<addr> gpt mpc5200-gpt General purpose timers
rtc@<addr> rtc *-rtc Real time clock rtc@<addr> rtc mpc5200-rtc Real time clock
mscan@<addr> mscan *-mscan CAN bus controller mscan@<addr> mscan mpc5200-mscan CAN bus controller
pci@<addr> pci *-pci PCI bridge pci@<addr> pci mpc5200-pci PCI bridge
serial@<addr> serial *-psc-uart PSC in serial mode serial@<addr> serial mpc5200-psc-uart PSC in serial mode
i2s@<addr> sound *-psc-i2s PSC in i2s mode i2s@<addr> sound mpc5200-psc-i2s PSC in i2s mode
ac97@<addr> sound *-psc-ac97 PSC in ac97 mode ac97@<addr> sound mpc5200-psc-ac97 PSC in ac97 mode
spi@<addr> spi *-psc-spi PSC in spi mode spi@<addr> spi mpc5200-psc-spi PSC in spi mode
irda@<addr> irda *-psc-irda PSC in IrDA mode irda@<addr> irda mpc5200-psc-irda PSC in IrDA mode
spi@<addr> spi *-spi MPC52xx spi device spi@<addr> spi mpc5200-spi MPC5200 spi device
ethernet@<addr> network *-fec MPC52xx ethernet device ethernet@<addr> network mpc5200-fec MPC5200 ethernet device
ata@<addr> ata *-ata IDE ATA interface ata@<addr> ata mpc5200-ata IDE ATA interface
i2c@<addr> i2c *-i2c I2C controller i2c@<addr> i2c mpc5200-i2c I2C controller
usb@<addr> usb-ohci-be *-ohci,ohci-be USB controller usb@<addr> usb-ohci-be mpc5200-ohci,ohci-be USB controller
xlb@<addr> xlb *-xlb XLB arbritrator xlb@<addr> xlb mpc5200-xlb XLB arbritrator
Important child node properties
name type description
---- ---- -----------
cell-index int When multiple devices are present, is the
index of the device in the hardware (ie. There
are 6 PSC on the 5200 numbered PSC1 to PSC6)
PSC1 has 'cell-index = <0>'
PSC4 has 'cell-index = <3>'
5) General Purpose Timer nodes (child of soc5200 node)
On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board
design supports the internal wdt, then the device node for GPT0 should
include the empty property 'has-wdt'.
6) PSC nodes (child of soc5200 node)
PSC nodes can define the optional 'port-number' property to force assignment
order of serial ports. For example, PSC5 might be physically connected to
the port labeled 'COM1' and PSC1 wired to 'COM1'. In this case, PSC5 would
have a "port-number = <0>" property, and PSC1 would have "port-number = <1>".
PSC in i2s mode: The mpc5200 and mpc5200b PSCs are not compatible when in
i2s mode. An 'mpc5200b-psc-i2s' node cannot include 'mpc5200-psc-i2s' in the
compatible field.
IV - Extra Notes IV - Extra Notes
================ ================
1. Interrupt mapping 1. Interrupt mapping
-------------------- --------------------
The mpc52xx pic driver splits hardware IRQ numbers into two levels. The The mpc5200 pic driver splits hardware IRQ numbers into two levels. The
split reflects the layout of the PIC hardware itself, which groups split reflects the layout of the PIC hardware itself, which groups
interrupts into one of three groups; CRIT, MAIN or PERP. Also, the interrupts into one of three groups; CRIT, MAIN or PERP. Also, the
Bestcomm dma engine has it's own set of interrupt sources which are Bestcomm dma engine has it's own set of interrupt sources which are
cascaded off of peripheral interrupt 0, which the driver interprets as a cascaded off of peripheral interrupt 0, which the driver interprets as a
fourth group, SDMA. fourth group, SDMA.
The interrupts property for device nodes using the mpc52xx pic consists The interrupts property for device nodes using the mpc5200 pic consists
of three cells; <L1 L2 level> of three cells; <L1 L2 level>
L1 := [CRIT=0, MAIN=1, PERP=2, SDMA=3] L1 := [CRIT=0, MAIN=1, PERP=2, SDMA=3]
L2 := interrupt number; directly mapped from the value in the L2 := interrupt number; directly mapped from the value in the
"ICTL PerStat, MainStat, CritStat Encoded Register" "ICTL PerStat, MainStat, CritStat Encoded Register"
level := [LEVEL_HIGH=0, EDGE_RISING=1, EDGE_FALLING=2, LEVEL_LOW=3] level := [LEVEL_HIGH=0, EDGE_RISING=1, EDGE_FALLING=2, LEVEL_LOW=3]
2. Shared registers
-------------------
Some SoC devices share registers between them. ie. the i2c devices use
a single clock control register, and almost all device are affected by
the port_config register. Devices which need to manipulate shared regs
should look to the parent SoC node. The soc node is responsible
for arbitrating all shared register access.
MAINTAINERS
浏览文件 @ ac98695d
...@@ -2523,6 +2523,12 @@ M: olof@lixom.net ...@@ -2523,6 +2523,12 @@ M: olof@lixom.net
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Maintained S: Maintained
PA SEMI SMBUS DRIVER
P: Olof Johansson
M: olof@lixom.net
L: i2c@lm-sensors.org
S: Maintained
PARALLEL PORT SUPPORT PARALLEL PORT SUPPORT
P: Phil Blundell P: Phil Blundell
M: philb@gnu.org M: philb@gnu.org
......
arch/mips/Kconfig
浏览文件 @ ac98695d
...@@ -598,8 +598,6 @@ config SGI_IP32 ...@@ -598,8 +598,6 @@ config SGI_IP32
select ARC select ARC
select ARC32 select ARC32
select BOOT_ELF32 select BOOT_ELF32
select OWN_DMA
select DMA_IP32
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HW_HAS_PCI
select R5000_CPU_SCACHE select R5000_CPU_SCACHE
...@@ -883,9 +881,6 @@ config DMA_NONCOHERENT ...@@ -883,9 +881,6 @@ config DMA_NONCOHERENT
config DMA_NEED_PCI_MAP_STATE config DMA_NEED_PCI_MAP_STATE
bool bool
config OWN_DMA
bool
config EARLY_PRINTK config EARLY_PRINTK
bool bool
......
arch/mips/configs/ip27_defconfig
浏览文件 @ ac98695d
...@@ -264,7 +264,7 @@ CONFIG_BINFMT_ELF=y ...@@ -264,7 +264,7 @@ CONFIG_BINFMT_ELF=y
CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_COMPAT=y
CONFIG_COMPAT=y CONFIG_COMPAT=y
CONFIG_MIPS32_O32=y CONFIG_MIPS32_O32=y
# CONFIG_MIPS32_N32 is not set CONFIG_MIPS32_N32=y
CONFIG_BINFMT_ELF32=y CONFIG_BINFMT_ELF32=y
# #
......
arch/mips/dec/int-handler.S
浏览文件 @ ac98695d
...@@ -264,9 +264,6 @@ ...@@ -264,9 +264,6 @@
srlv t3,t1,t2 srlv t3,t1,t2
handle_it: handle_it:
LONG_L s0, TI_REGS($28)
LONG_S sp, TI_REGS($28)
PTR_LA ra, ret_from_irq
j dec_irq_dispatch j dec_irq_dispatch
nop nop
...@@ -277,7 +274,6 @@ fpu: ...@@ -277,7 +274,6 @@ fpu:
#endif #endif
spurious: spurious:
PTR_LA ra, _ret_from_irq
j spurious_interrupt j spurious_interrupt
nop nop
END(plat_irq_dispatch) END(plat_irq_dispatch)
......
arch/mips/kernel/entry.S
浏览文件 @ ac98695d
...@@ -21,24 +21,21 @@ ...@@ -21,24 +21,21 @@
#endif #endif
#ifndef CONFIG_PREEMPT #ifndef CONFIG_PREEMPT
.macro preempt_stop
local_irq_disable
.endm
#define resume_kernel restore_all #define resume_kernel restore_all
#else
#define __ret_from_irq ret_from_exception
#endif #endif
.text .text
.align 5 .align 5
FEXPORT(ret_from_irq) #ifndef CONFIG_PREEMPT
LONG_S s0, TI_REGS($28)
#ifdef CONFIG_PREEMPT
FEXPORT(ret_from_exception)
#else
b _ret_from_irq
FEXPORT(ret_from_exception) FEXPORT(ret_from_exception)
preempt_stop local_irq_disable # preempt stop
b __ret_from_irq
#endif #endif
FEXPORT(_ret_from_irq) FEXPORT(ret_from_irq)
LONG_S s0, TI_REGS($28)
FEXPORT(__ret_from_irq)
LONG_L t0, PT_STATUS(sp) # returning to kernel mode? LONG_L t0, PT_STATUS(sp) # returning to kernel mode?
andi t0, t0, KU_USER andi t0, t0, KU_USER
beqz t0, resume_kernel beqz t0, resume_kernel
......
arch/mips/kernel/linux32.c
浏览文件 @ ac98695d
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/scm.h> #include <net/scm.h>
#include <asm/compat-signal.h>
#include <asm/ipc.h> #include <asm/ipc.h>
#include <asm/sim.h> #include <asm/sim.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -736,3 +737,49 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs) ...@@ -736,3 +737,49 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs)
return do_fork(clone_flags, newsp, &regs, 0, return do_fork(clone_flags, newsp, &regs, 0,
parent_tidptr, child_tidptr); parent_tidptr, child_tidptr);
} }
/*
* Implement the event wait interface for the eventpoll file. It is the kernel
* part of the user space epoll_pwait(2).
*/
asmlinkage long compat_sys_epoll_pwait(int epfd,
struct epoll_event __user *events, int maxevents, int timeout,
const compat_sigset_t __user *sigmask, size_t sigsetsize)
{
int error;
sigset_t ksigmask, sigsaved;
/*
* If the caller wants a certain signal mask to be set during the wait,
* we apply it here.
*/
if (sigmask) {
if (sigsetsize != sizeof(sigset_t))
return -EINVAL;
if (!access_ok(VERIFY_READ, sigmask, sizeof(ksigmask)))
return -EFAULT;
if (__copy_conv_sigset_from_user(&ksigmask, sigmask))
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL) | sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
error = sys_epoll_wait(epfd, events, maxevents, timeout);
/*
* If we changed the signal mask, we need to restore the original one.
* In case we've got a signal while waiting, we do not restore the
* signal mask yet, and we allow do_signal() to deliver the signal on
* the way back to userspace, before the signal mask is restored.
*/
if (sigmask) {
if (error == -EINTR) {
memcpy(&current->saved_sigmask, &sigsaved,
sizeof(sigsaved));
set_thread_flag(TIF_RESTORE_SIGMASK);
} else
sigprocmask(SIG_SETMASK, &sigsaved, NULL);
}
return error;
}
arch/mips/kernel/scall64-64.S
浏览文件 @ ac98695d
...@@ -470,4 +470,4 @@ sys_call_table: ...@@ -470,4 +470,4 @@ sys_call_table:
PTR sys_get_robust_list PTR sys_get_robust_list
PTR sys_kexec_load /* 5270 */ PTR sys_kexec_load /* 5270 */
PTR sys_getcpu PTR sys_getcpu
PTR sys_epoll_pwait PTR compat_sys_epoll_pwait
arch/mips/kernel/scall64-n32.S
浏览文件 @ ac98695d
...@@ -396,4 +396,4 @@ EXPORT(sysn32_call_table) ...@@ -396,4 +396,4 @@ EXPORT(sysn32_call_table)
PTR compat_sys_get_robust_list PTR compat_sys_get_robust_list
PTR compat_sys_kexec_load PTR compat_sys_kexec_load
PTR sys_getcpu PTR sys_getcpu
PTR sys_epoll_pwait PTR compat_sys_epoll_pwait
arch/mips/kernel/signal-common.h
浏览文件 @ ac98695d
...@@ -19,37 +19,7 @@ ...@@ -19,37 +19,7 @@
# define DEBUGP(fmt, args...) # define DEBUGP(fmt, args...)
#endif #endif
/* #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
* Horribly complicated - with the bloody RM9000 workarounds enabled
* the signal trampolines is moving to the end of the structure so we can
* increase the alignment without breaking software compatibility.
*/
#if ICACHE_REFILLS_WORKAROUND_WAR == 0
struct sigframe {
u32 sf_ass[4]; /* argument save space for o32 */
u32 sf_code[2]; /* signal trampoline */
struct sigcontext sf_sc;
sigset_t sf_mask;
};
#else /* ICACHE_REFILLS_WORKAROUND_WAR */
struct sigframe {
u32 sf_ass[4]; /* argument save space for o32 */
u32 sf_pad[2];
struct sigcontext sf_sc; /* hw context */
sigset_t sf_mask;
u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
};
#endif /* !ICACHE_REFILLS_WORKAROUND_WAR */
/*
* handle hardware context
*/
extern int setup_sigcontext(struct pt_regs *, struct sigcontext __user *);
extern int restore_sigcontext(struct pt_regs *, struct sigcontext __user *);
/* /*
* Determine which stack to use.. * Determine which stack to use..
......
arch/mips/kernel/signal.c
浏览文件 @ ac98695d
...@@ -34,10 +34,20 @@ ...@@ -34,10 +34,20 @@
#include "signal-common.h" #include "signal-common.h"
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) /*
* Horribly complicated - with the bloody RM9000 workarounds enabled
* the signal trampolines is moving to the end of the structure so we can
* increase the alignment without breaking software compatibility.
*/
#if ICACHE_REFILLS_WORKAROUND_WAR == 0 #if ICACHE_REFILLS_WORKAROUND_WAR == 0
struct sigframe {
u32 sf_ass[4]; /* argument save space for o32 */
u32 sf_code[2]; /* signal trampoline */
struct sigcontext sf_sc;
sigset_t sf_mask;
};
struct rt_sigframe { struct rt_sigframe {
u32 rs_ass[4]; /* argument save space for o32 */ u32 rs_ass[4]; /* argument save space for o32 */
u32 rs_code[2]; /* signal trampoline */ u32 rs_code[2]; /* signal trampoline */
...@@ -47,6 +57,14 @@ struct rt_sigframe { ...@@ -47,6 +57,14 @@ struct rt_sigframe {
#else #else
struct sigframe {
u32 sf_ass[4]; /* argument save space for o32 */
u32 sf_pad[2];
struct sigcontext sf_sc; /* hw context */
sigset_t sf_mask;
u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
};
struct rt_sigframe { struct rt_sigframe {
u32 rs_ass[4]; /* argument save space for o32 */ u32 rs_ass[4]; /* argument save space for o32 */
u32 rs_pad[2]; u32 rs_pad[2];
......
arch/mips/kernel/signal32.c
浏览文件 @ ac98695d
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* Copyright (C) 1999, 2000 Silicon Graphics, Inc. * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/ */
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/compat.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp.h> #include <linux/smp.h>
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
#include <asm/abi.h> #include <asm/abi.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/compat-signal.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/sim.h> #include <asm/sim.h>
...@@ -104,8 +106,6 @@ typedef struct compat_siginfo { ...@@ -104,8 +106,6 @@ typedef struct compat_siginfo {
#define __NR_O32_rt_sigreturn 4193 #define __NR_O32_rt_sigreturn 4193
#define __NR_O32_restart_syscall 4253 #define __NR_O32_restart_syscall 4253
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
/* 32-bit compatibility types */ /* 32-bit compatibility types */
#define _NSIG_BPW32 32 #define _NSIG_BPW32 32
...@@ -139,8 +139,20 @@ struct ucontext32 { ...@@ -139,8 +139,20 @@ struct ucontext32 {
sigset_t32 uc_sigmask; /* mask last for extensibility */ sigset_t32 uc_sigmask; /* mask last for extensibility */
}; };
/*
* Horribly complicated - with the bloody RM9000 workarounds enabled
* the signal trampolines is moving to the end of the structure so we can
* increase the alignment without breaking software compatibility.
*/
#if ICACHE_REFILLS_WORKAROUND_WAR == 0 #if ICACHE_REFILLS_WORKAROUND_WAR == 0
struct sigframe32 {
u32 sf_ass[4]; /* argument save space for o32 */
u32 sf_code[2]; /* signal trampoline */
struct sigcontext32 sf_sc;
sigset_t sf_mask;
};
struct rt_sigframe32 { struct rt_sigframe32 {
u32 rs_ass[4]; /* argument save space for o32 */ u32 rs_ass[4]; /* argument save space for o32 */
u32 rs_code[2]; /* signal trampoline */ u32 rs_code[2]; /* signal trampoline */
...@@ -150,6 +162,14 @@ struct rt_sigframe32 { ...@@ -150,6 +162,14 @@ struct rt_sigframe32 {
#else /* ICACHE_REFILLS_WORKAROUND_WAR */ #else /* ICACHE_REFILLS_WORKAROUND_WAR */
struct sigframe32 {
u32 sf_ass[4]; /* argument save space for o32 */
u32 sf_pad[2];
struct sigcontext32 sf_sc; /* hw context */
sigset_t sf_mask;
u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
};
struct rt_sigframe32 { struct rt_sigframe32 {
u32 rs_ass[4]; /* argument save space for o32 */ u32 rs_ass[4]; /* argument save space for o32 */
u32 rs_pad[2]; u32 rs_pad[2];
...@@ -493,13 +513,13 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) ...@@ -493,13 +513,13 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs) asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs)
{ {
struct sigframe __user *frame; struct sigframe32 __user *frame;
sigset_t blocked; sigset_t blocked;
frame = (struct sigframe __user *) regs.regs[29]; frame = (struct sigframe32 __user *) regs.regs[29];
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe; goto badframe;
if (__copy_from_user(&blocked, &frame->sf_mask, sizeof(blocked))) if (__copy_conv_sigset_from_user(&blocked, &frame->sf_mask))
goto badframe; goto badframe;
sigdelsetmask(&blocked, ~_BLOCKABLE); sigdelsetmask(&blocked, ~_BLOCKABLE);
...@@ -536,7 +556,7 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) ...@@ -536,7 +556,7 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
frame = (struct rt_sigframe32 __user *) regs.regs[29]; frame = (struct rt_sigframe32 __user *) regs.regs[29];
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe; goto badframe;
if (__copy_from_user(&set, &frame->rs_uc.uc_sigmask, sizeof(set))) if (__copy_conv_sigset_from_user(&set, &frame->rs_uc.uc_sigmask))
goto badframe; goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE); sigdelsetmask(&set, ~_BLOCKABLE);
...@@ -581,7 +601,7 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) ...@@ -581,7 +601,7 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set) int signr, sigset_t *set)
{ {
struct sigframe __user *frame; struct sigframe32 __user *frame;
int err = 0; int err = 0;
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(ka, regs, sizeof(*frame));
...@@ -591,7 +611,8 @@ int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, ...@@ -591,7 +611,8 @@ int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
err |= install_sigtramp(frame->sf_code, __NR_O32_sigreturn); err |= install_sigtramp(frame->sf_code, __NR_O32_sigreturn);
err |= setup_sigcontext32(regs, &frame->sf_sc); err |= setup_sigcontext32(regs, &frame->sf_sc);
err |= __copy_to_user(&frame->sf_mask, set, sizeof(*set)); err |= __copy_conv_sigset_to_user(&frame->sf_mask, set);
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
...@@ -650,7 +671,7 @@ int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, ...@@ -650,7 +671,7 @@ int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
err |= __put_user(current->sas_ss_size, err |= __put_user(current->sas_ss_size,
&frame->rs_uc.uc_stack.ss_size); &frame->rs_uc.uc_stack.ss_size);
err |= setup_sigcontext32(regs, &frame->rs_uc.uc_mcontext); err |= setup_sigcontext32(regs, &frame->rs_uc.uc_mcontext);
err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set)); err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set);
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
......
arch/mips/kernel/signal_n32.c
浏览文件 @ ac98695d
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/compat-signal.h>
#include <asm/sim.h> #include <asm/sim.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
...@@ -47,7 +48,9 @@ ...@@ -47,7 +48,9 @@
#define __NR_N32_rt_sigreturn 6211 #define __NR_N32_rt_sigreturn 6211
#define __NR_N32_restart_syscall 6214 #define __NR_N32_restart_syscall 6214
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) extern int setup_sigcontext(struct pt_regs *, struct sigcontext __user *);
extern int restore_sigcontext(struct pt_regs *, struct sigcontext __user *);
/* IRIX compatible stack_t */ /* IRIX compatible stack_t */
typedef struct sigaltstack32 { typedef struct sigaltstack32 {
...@@ -61,7 +64,7 @@ struct ucontextn32 { ...@@ -61,7 +64,7 @@ struct ucontextn32 {
s32 uc_link; s32 uc_link;
stack32_t uc_stack; stack32_t uc_stack;
struct sigcontext uc_mcontext; struct sigcontext uc_mcontext;
sigset_t uc_sigmask; /* mask last for extensibility */ compat_sigset_t uc_sigmask; /* mask last for extensibility */
}; };
#if ICACHE_REFILLS_WORKAROUND_WAR == 0 #if ICACHE_REFILLS_WORKAROUND_WAR == 0
...@@ -127,7 +130,7 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs) ...@@ -127,7 +130,7 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
frame = (struct rt_sigframe_n32 __user *) regs.regs[29]; frame = (struct rt_sigframe_n32 __user *) regs.regs[29];
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe; goto badframe;
if (__copy_from_user(&set, &frame->rs_uc.uc_sigmask, sizeof(set))) if (__copy_conv_sigset_from_user(&set, &frame->rs_uc.uc_sigmask))
goto badframe; goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE); sigdelsetmask(&set, ~_BLOCKABLE);
...@@ -193,7 +196,7 @@ int setup_rt_frame_n32(struct k_sigaction * ka, ...@@ -193,7 +196,7 @@ int setup_rt_frame_n32(struct k_sigaction * ka,
err |= __put_user(current->sas_ss_size, err |= __put_user(current->sas_ss_size,
&frame->rs_uc.uc_stack.ss_size); &frame->rs_uc.uc_stack.ss_size);
err |= setup_sigcontext(regs, &frame->rs_uc.uc_mcontext); err |= setup_sigcontext(regs, &frame->rs_uc.uc_mcontext);
err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set)); err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set);
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
......
arch/mips/mm/Makefile
浏览文件 @ ac98695d
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Makefile for the Linux/MIPS-specific parts of the memory manager. # Makefile for the Linux/MIPS-specific parts of the memory manager.
# #
obj-y += cache.o extable.o fault.o init.o pgtable.o \ obj-y += cache.o dma-default.o extable.o fault.o \
tlbex.o tlbex-fault.o init.o pgtable.o tlbex.o tlbex-fault.o
obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
obj-$(CONFIG_64BIT) += pgtable-64.o obj-$(CONFIG_64BIT) += pgtable-64.o
...@@ -32,14 +32,4 @@ obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o ...@@ -32,14 +32,4 @@ obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
#
# Choose one DMA coherency model
#
ifndef CONFIG_OWN_DMA
obj-$(CONFIG_DMA_COHERENT) += dma-coherent.o
obj-$(CONFIG_DMA_NONCOHERENT) += dma-noncoherent.o
endif
obj-$(CONFIG_DMA_IP27) += dma-ip27.o
obj-$(CONFIG_DMA_IP32) += dma-ip32.o
EXTRA_AFLAGS := $(CFLAGS) EXTRA_AFLAGS := $(CFLAGS)
arch/mips/mm/c-sb1.c
浏览文件 @ ac98695d
...@@ -259,6 +259,12 @@ static void sb1_flush_cache_data_page(unsigned long addr) ...@@ -259,6 +259,12 @@ static void sb1_flush_cache_data_page(unsigned long addr)
on_each_cpu(sb1_flush_cache_data_page_ipi, (void *) addr, 1, 1); on_each_cpu(sb1_flush_cache_data_page_ipi, (void *) addr, 1, 1);
} }
#else #else
static void local_sb1_flush_cache_data_page(unsigned long addr)
{
__sb1_writeback_inv_dcache_range(addr, addr + PAGE_SIZE);
}
void sb1_flush_cache_data_page(unsigned long) void sb1_flush_cache_data_page(unsigned long)
__attribute__((alias("local_sb1_flush_cache_data_page"))); __attribute__((alias("local_sb1_flush_cache_data_page")));
#endif #endif
......
arch/mips/mm/dma-coherent.c 已删除 100644 → 0
浏览文件 @ d9bc125c
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2000 Ani Joshi <ajoshi@unixbox.com>
* Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org>
* swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
*/
#include <linux/types.h>
#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
#include <asm/cache.h>
#include <asm/io.h>
void *dma_alloc_noncoherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp)
{
void *ret;
/* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
gfp |= GFP_DMA;
ret = (void *) __get_free_pages(gfp, get_order(size));
if (ret != NULL) {
memset(ret, 0, size);
*dma_handle = virt_to_phys(ret);
}
return ret;
}
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp)
__attribute__((alias("dma_alloc_noncoherent")));
EXPORT_SYMBOL(dma_alloc_coherent);
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle)
{
unsigned long addr = (unsigned long) vaddr;
free_pages(addr, get_order(size));
}
EXPORT_SYMBOL(dma_free_noncoherent);
void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle) __attribute__((alias("dma_free_noncoherent")));
EXPORT_SYMBOL(dma_free_coherent);
dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
return __pa(ptr);
}
EXPORT_SYMBOL(dma_map_single);
void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_unmap_single);
int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction direction)
{
int i;
BUG_ON(direction == DMA_NONE);
for (i = 0; i < nents; i++, sg++) {
sg->dma_address = (dma_addr_t)page_to_phys(sg->page) + sg->offset;
}
return nents;
}
EXPORT_SYMBOL(dma_map_sg);
dma_addr_t dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
return page_to_phys(page) + offset;
}
EXPORT_SYMBOL(dma_map_page);
void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_unmap_page);
void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_unmap_sg);
void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_for_cpu);
void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_for_device);
void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_range_for_device);
void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_sg_for_cpu);
void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_sg_for_device);
int dma_mapping_error(dma_addr_t dma_addr)
{
return 0;
}
EXPORT_SYMBOL(dma_mapping_error);
int dma_supported(struct device *dev, u64 mask)
{
/*
* we fall back to GFP_DMA when the mask isn't all 1s,
* so we can't guarantee allocations that must be
* within a tighter range than GFP_DMA..
*/
if (mask < 0x00ffffff)
return 0;
return 1;
}
EXPORT_SYMBOL(dma_supported);
int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
{
return 1;
}
EXPORT_SYMBOL(dma_is_consistent);
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_cache_sync);
/* The DAC routines are a PCIism.. */
#ifdef CONFIG_PCI
#include <linux/pci.h>
dma64_addr_t pci_dac_page_to_dma(struct pci_dev *pdev,
struct page *page, unsigned long offset, int direction)
{
return (dma64_addr_t)page_to_phys(page) + offset;
}
EXPORT_SYMBOL(pci_dac_page_to_dma);
struct page *pci_dac_dma_to_page(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return mem_map + (dma_addr >> PAGE_SHIFT);
}
EXPORT_SYMBOL(pci_dac_dma_to_page);
unsigned long pci_dac_dma_to_offset(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return dma_addr & ~PAGE_MASK;
}
EXPORT_SYMBOL(pci_dac_dma_to_offset);
void pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_cpu);
void pci_dac_dma_sync_single_for_device(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_device);
#endif /* CONFIG_PCI */
arch/mips/mm/dma-noncoherent.c → arch/mips/mm/dma-default.c
浏览文件 @ ac98695d
...@@ -4,28 +4,39 @@ ...@@ -4,28 +4,39 @@
* for more details. * for more details.
* *
* Copyright (C) 2000 Ani Joshi <ajoshi@unixbox.com> * Copyright (C) 2000 Ani Joshi <ajoshi@unixbox.com>
* Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org> * Copyright (C) 2000, 2001, 06 Ralf Baechle <ralf@linux-mips.org>
* swiped from i386, and cloned for MIPS by Geert, polished by Ralf. * swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
*/ */
#include <linux/types.h> #include <linux/types.h>
#include <linux/dma-mapping.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/dma-mapping.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/io.h> #include <asm/io.h>
#include <dma-coherence.h>
/* /*
* Warning on the terminology - Linux calls an uncached area coherent; * Warning on the terminology - Linux calls an uncached area coherent;
* MIPS terminology calls memory areas with hardware maintained coherency * MIPS terminology calls memory areas with hardware maintained coherency
* coherent. * coherent.
*/ */
static inline int cpu_is_noncoherent_r10000(struct device *dev)
{
return !plat_device_is_coherent(dev) &&
(current_cpu_data.cputype == CPU_R10000 &&
current_cpu_data.cputype == CPU_R12000);
}
void *dma_alloc_noncoherent(struct device *dev, size_t size, void *dma_alloc_noncoherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp) dma_addr_t * dma_handle, gfp_t gfp)
{ {
void *ret; void *ret;
/* ignore region specifiers */ /* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM); gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
...@@ -35,7 +46,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, ...@@ -35,7 +46,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size,
if (ret != NULL) { if (ret != NULL) {
memset(ret, 0, size); memset(ret, 0, size);
*dma_handle = virt_to_phys(ret); *dma_handle = plat_map_dma_mem(dev, ret, size);
} }
return ret; return ret;
...@@ -48,10 +59,21 @@ void *dma_alloc_coherent(struct device *dev, size_t size, ...@@ -48,10 +59,21 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
{ {
void *ret; void *ret;
ret = dma_alloc_noncoherent(dev, size, dma_handle, gfp); /* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
gfp |= GFP_DMA;
ret = (void *) __get_free_pages(gfp, get_order(size));
if (ret) { if (ret) {
dma_cache_wback_inv((unsigned long) ret, size); memset(ret, 0, size);
ret = UNCAC_ADDR(ret); *dma_handle = plat_map_dma_mem(dev, ret, size);
if (!plat_device_is_coherent(dev)) {
dma_cache_wback_inv((unsigned long) ret, size);
ret = UNCAC_ADDR(ret);
}
} }
return ret; return ret;
...@@ -72,7 +94,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, ...@@ -72,7 +94,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
{ {
unsigned long addr = (unsigned long) vaddr; unsigned long addr = (unsigned long) vaddr;
addr = CAC_ADDR(addr); if (!plat_device_is_coherent(dev))
addr = CAC_ADDR(addr);
free_pages(addr, get_order(size)); free_pages(addr, get_order(size));
} }
...@@ -104,9 +128,10 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, ...@@ -104,9 +128,10 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
{ {
unsigned long addr = (unsigned long) ptr; unsigned long addr = (unsigned long) ptr;
__dma_sync(addr, size, direction); if (!plat_device_is_coherent(dev))
__dma_sync(addr, size, direction);
return virt_to_phys(ptr); return plat_map_dma_mem(dev, ptr, size);
} }
EXPORT_SYMBOL(dma_map_single); EXPORT_SYMBOL(dma_map_single);
...@@ -114,10 +139,11 @@ EXPORT_SYMBOL(dma_map_single); ...@@ -114,10 +139,11 @@ EXPORT_SYMBOL(dma_map_single);
void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
unsigned long addr; if (cpu_is_noncoherent_r10000(dev))
addr = dma_addr + PAGE_OFFSET; __dma_sync(plat_dma_addr_to_phys(dma_addr) + PAGE_OFFSET, size,
direction);
//__dma_sync(addr, size, direction); plat_unmap_dma_mem(dma_addr);
} }
EXPORT_SYMBOL(dma_unmap_single); EXPORT_SYMBOL(dma_unmap_single);
...@@ -133,11 +159,10 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, ...@@ -133,11 +159,10 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
unsigned long addr; unsigned long addr;
addr = (unsigned long) page_address(sg->page); addr = (unsigned long) page_address(sg->page);
if (addr) { if (!plat_device_is_coherent(dev) && addr)
__dma_sync(addr + sg->offset, sg->length, direction); __dma_sync(addr + sg->offset, sg->length, direction);
sg->dma_address = (dma_addr_t)page_to_phys(sg->page) sg->dma_address = plat_map_dma_mem_page(dev, sg->page) +
+ sg->offset; sg->offset;
}
} }
return nents; return nents;
...@@ -148,14 +173,16 @@ EXPORT_SYMBOL(dma_map_sg); ...@@ -148,14 +173,16 @@ EXPORT_SYMBOL(dma_map_sg);
dma_addr_t dma_map_page(struct device *dev, struct page *page, dma_addr_t dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction direction) unsigned long offset, size_t size, enum dma_data_direction direction)
{ {
unsigned long addr;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
addr = (unsigned long) page_address(page) + offset; if (!plat_device_is_coherent(dev)) {
dma_cache_wback_inv(addr, size); unsigned long addr;
addr = (unsigned long) page_address(page) + offset;
dma_cache_wback_inv(addr, size);
}
return page_to_phys(page) + offset; return plat_map_dma_mem_page(dev, page) + offset;
} }
EXPORT_SYMBOL(dma_map_page); EXPORT_SYMBOL(dma_map_page);
...@@ -165,12 +192,14 @@ void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, ...@@ -165,12 +192,14 @@ void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
{ {
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
if (direction != DMA_TO_DEVICE) { if (!plat_device_is_coherent(dev) && direction != DMA_TO_DEVICE) {
unsigned long addr; unsigned long addr;
addr = dma_address + PAGE_OFFSET; addr = plat_dma_addr_to_phys(dma_address);
dma_cache_wback_inv(addr, size); dma_cache_wback_inv(addr, size);
} }
plat_unmap_dma_mem(dma_address);
} }
EXPORT_SYMBOL(dma_unmap_page); EXPORT_SYMBOL(dma_unmap_page);
...@@ -183,13 +212,15 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, ...@@ -183,13 +212,15 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
if (direction == DMA_TO_DEVICE)
return;
for (i = 0; i < nhwentries; i++, sg++) { for (i = 0; i < nhwentries; i++, sg++) {
addr = (unsigned long) page_address(sg->page); if (!plat_device_is_coherent(dev) &&
if (addr) direction != DMA_TO_DEVICE) {
__dma_sync(addr + sg->offset, sg->length, direction); addr = (unsigned long) page_address(sg->page);
if (addr)
__dma_sync(addr + sg->offset, sg->length,
direction);
}
plat_unmap_dma_mem(sg->dma_address);
} }
} }
...@@ -198,12 +229,14 @@ EXPORT_SYMBOL(dma_unmap_sg); ...@@ -198,12 +229,14 @@ EXPORT_SYMBOL(dma_unmap_sg);
void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction) size_t size, enum dma_data_direction direction)
{ {
unsigned long addr;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
addr = dma_handle + PAGE_OFFSET; if (cpu_is_noncoherent_r10000(dev)) {
__dma_sync(addr, size, direction); unsigned long addr;
addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
__dma_sync(addr, size, direction);
}
} }
EXPORT_SYMBOL(dma_sync_single_for_cpu); EXPORT_SYMBOL(dma_sync_single_for_cpu);
...@@ -211,12 +244,14 @@ EXPORT_SYMBOL(dma_sync_single_for_cpu); ...@@ -211,12 +244,14 @@ EXPORT_SYMBOL(dma_sync_single_for_cpu);
void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction) size_t size, enum dma_data_direction direction)
{ {
unsigned long addr;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
addr = dma_handle + PAGE_OFFSET; if (cpu_is_noncoherent_r10000(dev)) {
__dma_sync(addr, size, direction); unsigned long addr;
addr = plat_dma_addr_to_phys(dma_handle);
__dma_sync(addr, size, direction);
}
} }
EXPORT_SYMBOL(dma_sync_single_for_device); EXPORT_SYMBOL(dma_sync_single_for_device);
...@@ -224,12 +259,14 @@ EXPORT_SYMBOL(dma_sync_single_for_device); ...@@ -224,12 +259,14 @@ EXPORT_SYMBOL(dma_sync_single_for_device);
void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size, enum dma_data_direction direction) unsigned long offset, size_t size, enum dma_data_direction direction)
{ {
unsigned long addr;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
addr = dma_handle + offset + PAGE_OFFSET; if (cpu_is_noncoherent_r10000(dev)) {
__dma_sync(addr, size, direction); unsigned long addr;
addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
__dma_sync(addr + offset, size, direction);
}
} }
EXPORT_SYMBOL(dma_sync_single_range_for_cpu); EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
...@@ -237,12 +274,14 @@ EXPORT_SYMBOL(dma_sync_single_range_for_cpu); ...@@ -237,12 +274,14 @@ EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size, enum dma_data_direction direction) unsigned long offset, size_t size, enum dma_data_direction direction)
{ {
unsigned long addr;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
addr = dma_handle + offset + PAGE_OFFSET; if (cpu_is_noncoherent_r10000(dev)) {
__dma_sync(addr, size, direction); unsigned long addr;
addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
__dma_sync(addr + offset, size, direction);
}
} }
EXPORT_SYMBOL(dma_sync_single_range_for_device); EXPORT_SYMBOL(dma_sync_single_range_for_device);
...@@ -255,9 +294,12 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, ...@@ -255,9 +294,12 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
/* Make sure that gcc doesn't leave the empty loop body. */ /* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++) for (i = 0; i < nelems; i++, sg++) {
__dma_sync((unsigned long)page_address(sg->page), if (!plat_device_is_coherent(dev))
sg->length, direction); __dma_sync((unsigned long)page_address(sg->page),
sg->length, direction);
plat_unmap_dma_mem(sg->dma_address);
}
} }
EXPORT_SYMBOL(dma_sync_sg_for_cpu); EXPORT_SYMBOL(dma_sync_sg_for_cpu);
...@@ -270,9 +312,12 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele ...@@ -270,9 +312,12 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
/* Make sure that gcc doesn't leave the empty loop body. */ /* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++) for (i = 0; i < nelems; i++, sg++) {
__dma_sync((unsigned long)page_address(sg->page), if (!plat_device_is_coherent(dev))
sg->length, direction); __dma_sync((unsigned long)page_address(sg->page),
sg->length, direction);
plat_unmap_dma_mem(sg->dma_address);
}
} }
EXPORT_SYMBOL(dma_sync_sg_for_device); EXPORT_SYMBOL(dma_sync_sg_for_device);
...@@ -301,70 +346,18 @@ EXPORT_SYMBOL(dma_supported); ...@@ -301,70 +346,18 @@ EXPORT_SYMBOL(dma_supported);
int dma_is_consistent(struct device *dev, dma_addr_t dma_addr) int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
{ {
return 1; return plat_device_is_coherent(dev);
} }
EXPORT_SYMBOL(dma_is_consistent); EXPORT_SYMBOL(dma_is_consistent);
void dma_cache_sync(struct device *dev, void *vaddr, size_t size, void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
if (direction == DMA_NONE) BUG_ON(direction == DMA_NONE);
return;
dma_cache_wback_inv((unsigned long)vaddr, size); if (!plat_device_is_coherent(dev))
dma_cache_wback_inv((unsigned long)vaddr, size);
} }
EXPORT_SYMBOL(dma_cache_sync); EXPORT_SYMBOL(dma_cache_sync);
/* The DAC routines are a PCIism.. */
#ifdef CONFIG_PCI
#include <linux/pci.h>
dma64_addr_t pci_dac_page_to_dma(struct pci_dev *pdev,
struct page *page, unsigned long offset, int direction)
{
return (dma64_addr_t)page_to_phys(page) + offset;
}
EXPORT_SYMBOL(pci_dac_page_to_dma);
struct page *pci_dac_dma_to_page(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return mem_map + (dma_addr >> PAGE_SHIFT);
}
EXPORT_SYMBOL(pci_dac_dma_to_page);
unsigned long pci_dac_dma_to_offset(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return dma_addr & ~PAGE_MASK;
}
EXPORT_SYMBOL(pci_dac_dma_to_offset);
void pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
dma_cache_wback_inv(dma_addr + PAGE_OFFSET, len);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_cpu);
void pci_dac_dma_sync_single_for_device(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
dma_cache_wback_inv(dma_addr + PAGE_OFFSET, len);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_device);
#endif /* CONFIG_PCI */
arch/mips/mm/dma-ip27.c 已删除 100644 → 0
浏览文件 @ d9bc125c
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2000 Ani Joshi <ajoshi@unixbox.com>
* Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org>
* swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
*/
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <asm/cache.h>
#include <asm/pci/bridge.h>
#define pdev_to_baddr(pdev, addr) \
(BRIDGE_CONTROLLER(pdev->bus)->baddr + (addr))
#define dev_to_baddr(dev, addr) \
pdev_to_baddr(to_pci_dev(dev), (addr))
void *dma_alloc_noncoherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp)
{
void *ret;
/* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
gfp |= GFP_DMA;
ret = (void *) __get_free_pages(gfp, get_order(size));
if (ret != NULL) {
memset(ret, 0, size);
*dma_handle = dev_to_baddr(dev, virt_to_phys(ret));
}
return ret;
}
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp)
__attribute__((alias("dma_alloc_noncoherent")));
EXPORT_SYMBOL(dma_alloc_coherent);
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle)
{
unsigned long addr = (unsigned long) vaddr;
free_pages(addr, get_order(size));
}
EXPORT_SYMBOL(dma_free_noncoherent);
void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle) __attribute__((alias("dma_free_noncoherent")));
EXPORT_SYMBOL(dma_free_coherent);
dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
return dev_to_baddr(dev, __pa(ptr));
}
EXPORT_SYMBOL(dma_map_single);
void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_unmap_single);
int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction direction)
{
int i;
BUG_ON(direction == DMA_NONE);
for (i = 0; i < nents; i++, sg++) {
sg->dma_address = (dma_addr_t) dev_to_baddr(dev,
page_to_phys(sg->page) + sg->offset);
}
return nents;
}
EXPORT_SYMBOL(dma_map_sg);
dma_addr_t dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
return dev_to_baddr(dev, page_to_phys(page) + offset);
}
EXPORT_SYMBOL(dma_map_page);
void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_unmap_page);
void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_unmap_sg);
void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_for_cpu);
void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_for_device);
void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_single_range_for_device);
void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_sg_for_cpu);
void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_sync_sg_for_device);
int dma_mapping_error(dma_addr_t dma_addr)
{
return 0;
}
EXPORT_SYMBOL(dma_mapping_error);
int dma_supported(struct device *dev, u64 mask)
{
/*
* we fall back to GFP_DMA when the mask isn't all 1s,
* so we can't guarantee allocations that must be
* within a tighter range than GFP_DMA..
*/
if (mask < 0x00ffffff)
return 0;
return 1;
}
EXPORT_SYMBOL(dma_supported);
int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
{
return 1;
}
EXPORT_SYMBOL(dma_is_consistent);
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
}
EXPORT_SYMBOL(dma_cache_sync);
dma64_addr_t pci_dac_page_to_dma(struct pci_dev *pdev,
struct page *page, unsigned long offset, int direction)
{
dma64_addr_t addr = page_to_phys(page) + offset;
return (dma64_addr_t) pdev_to_baddr(pdev, addr);
}
EXPORT_SYMBOL(pci_dac_page_to_dma);
struct page *pci_dac_dma_to_page(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
struct bridge_controller *bc = BRIDGE_CONTROLLER(pdev->bus);
return pfn_to_page((dma_addr - bc->baddr) >> PAGE_SHIFT);
}
EXPORT_SYMBOL(pci_dac_dma_to_page);
unsigned long pci_dac_dma_to_offset(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return dma_addr & ~PAGE_MASK;
}
EXPORT_SYMBOL(pci_dac_dma_to_offset);
void pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_cpu);
void pci_dac_dma_sync_single_for_device(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_device);
arch/mips/mm/dma-ip32.c 已删除 100644 → 0
浏览文件 @ d9bc125c
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2000 Ani Joshi <ajoshi@unixbox.com>
* Copyright (C) 2000, 2001 Ralf Baechle <ralf@gnu.org>
* Copyright (C) 2005 Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
* swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
* IP32 changes by Ilya.
*/
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/dma-mapping.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/ip32/crime.h>
/*
* Warning on the terminology - Linux calls an uncached area coherent;
* MIPS terminology calls memory areas with hardware maintained coherency
* coherent.
*/
/*
* Few notes.
* 1. CPU sees memory as two chunks: 0-256M@0x0, and the rest @0x40000000+256M
* 2. PCI sees memory as one big chunk @0x0 (or we could use 0x40000000 for native-endian)
* 3. All other devices see memory as one big chunk at 0x40000000
* 4. Non-PCI devices will pass NULL as struct device*
* Thus we translate differently, depending on device.
*/
#define RAM_OFFSET_MASK 0x3fffffff
void *dma_alloc_noncoherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp)
{
void *ret;
/* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
gfp |= GFP_DMA;
ret = (void *) __get_free_pages(gfp, get_order(size));
if (ret != NULL) {
unsigned long addr = virt_to_phys(ret)&RAM_OFFSET_MASK;
memset(ret, 0, size);
if(dev==NULL)
addr+= CRIME_HI_MEM_BASE;
*dma_handle = addr;
}
return ret;
}
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t gfp)
{
void *ret;
ret = dma_alloc_noncoherent(dev, size, dma_handle, gfp);
if (ret) {
dma_cache_wback_inv((unsigned long) ret, size);
ret = UNCAC_ADDR(ret);
}
return ret;
}
EXPORT_SYMBOL(dma_alloc_coherent);
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle)
{
free_pages((unsigned long) vaddr, get_order(size));
}
EXPORT_SYMBOL(dma_free_noncoherent);
void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle)
{
unsigned long addr = (unsigned long) vaddr;
addr = CAC_ADDR(addr);
free_pages(addr, get_order(size));
}
EXPORT_SYMBOL(dma_free_coherent);
static inline void __dma_sync(unsigned long addr, size_t size,
enum dma_data_direction direction)
{
switch (direction) {
case DMA_TO_DEVICE:
dma_cache_wback(addr, size);
break;
case DMA_FROM_DEVICE:
dma_cache_inv(addr, size);
break;
case DMA_BIDIRECTIONAL:
dma_cache_wback_inv(addr, size);
break;
default:
BUG();
}
}
dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction direction)
{
unsigned long addr = (unsigned long) ptr;
switch (direction) {
case DMA_TO_DEVICE:
dma_cache_wback(addr, size);
break;
case DMA_FROM_DEVICE:
dma_cache_inv(addr, size);
break;
case DMA_BIDIRECTIONAL:
dma_cache_wback_inv(addr, size);
break;
default:
BUG();
}
addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;
if(dev == NULL)
addr+=CRIME_HI_MEM_BASE;
return (dma_addr_t)addr;
}
EXPORT_SYMBOL(dma_map_single);
void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction direction)
{
switch (direction) {
case DMA_TO_DEVICE:
break;
case DMA_FROM_DEVICE:
break;
case DMA_BIDIRECTIONAL:
break;
default:
BUG();
}
}
EXPORT_SYMBOL(dma_unmap_single);
int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction direction)
{
int i;
BUG_ON(direction == DMA_NONE);
for (i = 0; i < nents; i++, sg++) {
unsigned long addr;
addr = (unsigned long) page_address(sg->page)+sg->offset;
if (addr)
__dma_sync(addr, sg->length, direction);
addr = __pa(addr)&RAM_OFFSET_MASK;
if(dev == NULL)
addr += CRIME_HI_MEM_BASE;
sg->dma_address = (dma_addr_t)addr;
}
return nents;
}
EXPORT_SYMBOL(dma_map_sg);
dma_addr_t dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction direction)
{
unsigned long addr;
BUG_ON(direction == DMA_NONE);
addr = (unsigned long) page_address(page) + offset;
dma_cache_wback_inv(addr, size);
addr = __pa(addr)&RAM_OFFSET_MASK;
if(dev == NULL)
addr += CRIME_HI_MEM_BASE;
return (dma_addr_t)addr;
}
EXPORT_SYMBOL(dma_map_page);
void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
if (direction != DMA_TO_DEVICE) {
unsigned long addr;
dma_address&=RAM_OFFSET_MASK;
addr = dma_address + PAGE_OFFSET;
if(dma_address>=256*1024*1024)
addr+=CRIME_HI_MEM_BASE;
dma_cache_wback_inv(addr, size);
}
}
EXPORT_SYMBOL(dma_unmap_page);
void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
enum dma_data_direction direction)
{
unsigned long addr;
int i;
BUG_ON(direction == DMA_NONE);
if (direction == DMA_TO_DEVICE)
return;
for (i = 0; i < nhwentries; i++, sg++) {
addr = (unsigned long) page_address(sg->page);
if (!addr)
continue;
dma_cache_wback_inv(addr + sg->offset, sg->length);
}
}
EXPORT_SYMBOL(dma_unmap_sg);
void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction)
{
unsigned long addr;
BUG_ON(direction == DMA_NONE);
dma_handle&=RAM_OFFSET_MASK;
addr = dma_handle + PAGE_OFFSET;
if(dma_handle>=256*1024*1024)
addr+=CRIME_HI_MEM_BASE;
__dma_sync(addr, size, direction);
}
EXPORT_SYMBOL(dma_sync_single_for_cpu);
void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction)
{
unsigned long addr;
BUG_ON(direction == DMA_NONE);
dma_handle&=RAM_OFFSET_MASK;
addr = dma_handle + PAGE_OFFSET;
if(dma_handle>=256*1024*1024)
addr+=CRIME_HI_MEM_BASE;
__dma_sync(addr, size, direction);
}
EXPORT_SYMBOL(dma_sync_single_for_device);
void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size, enum dma_data_direction direction)
{
unsigned long addr;
BUG_ON(direction == DMA_NONE);
dma_handle&=RAM_OFFSET_MASK;
addr = dma_handle + offset + PAGE_OFFSET;
if(dma_handle>=256*1024*1024)
addr+=CRIME_HI_MEM_BASE;
__dma_sync(addr, size, direction);
}
EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
unsigned long offset, size_t size, enum dma_data_direction direction)
{
unsigned long addr;
BUG_ON(direction == DMA_NONE);
dma_handle&=RAM_OFFSET_MASK;
addr = dma_handle + offset + PAGE_OFFSET;
if(dma_handle>=256*1024*1024)
addr+=CRIME_HI_MEM_BASE;
__dma_sync(addr, size, direction);
}
EXPORT_SYMBOL(dma_sync_single_range_for_device);
void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
int i;
BUG_ON(direction == DMA_NONE);
/* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++)
__dma_sync((unsigned long)page_address(sg->page),
sg->length, direction);
}
EXPORT_SYMBOL(dma_sync_sg_for_cpu);
void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
int i;
BUG_ON(direction == DMA_NONE);
/* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++)
__dma_sync((unsigned long)page_address(sg->page),
sg->length, direction);
}
EXPORT_SYMBOL(dma_sync_sg_for_device);
int dma_mapping_error(dma_addr_t dma_addr)
{
return 0;
}
EXPORT_SYMBOL(dma_mapping_error);
int dma_supported(struct device *dev, u64 mask)
{
/*
* we fall back to GFP_DMA when the mask isn't all 1s,
* so we can't guarantee allocations that must be
* within a tighter range than GFP_DMA..
*/
if (mask < 0x00ffffff)
return 0;
return 1;
}
EXPORT_SYMBOL(dma_supported);
int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
{
return 1;
}
EXPORT_SYMBOL(dma_is_consistent);
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
if (direction == DMA_NONE)
return;
dma_cache_wback_inv((unsigned long)vaddr, size);
}
EXPORT_SYMBOL(dma_cache_sync);
arch/mips/pci/Makefile
浏览文件 @ ac98695d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the PCI specific kernel interface routines under Linux. # Makefile for the PCI specific kernel interface routines under Linux.
# #
obj-y += pci.o obj-y += pci.o pci-dac.o
# #
# PCI bus host bridge specific code # PCI bus host bridge specific code
......
arch/mips/pci/pci-dac.c 0 → 100644
浏览文件 @ ac98695d
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2000 Ani Joshi <ajoshi@unixbox.com>
* Copyright (C) 2000, 2001, 06 Ralf Baechle <ralf@linux-mips.org>
* swiped from i386, and cloned for MIPS by Geert, polished by Ralf.
*/
#include <linux/types.h>
#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <dma-coherence.h>
#include <linux/pci.h>
dma64_addr_t pci_dac_page_to_dma(struct pci_dev *pdev,
struct page *page, unsigned long offset, int direction)
{
struct device *dev = &pdev->dev;
BUG_ON(direction == DMA_NONE);
if (!plat_device_is_coherent(dev)) {
unsigned long addr;
addr = (unsigned long) page_address(page) + offset;
dma_cache_wback_inv(addr, PAGE_SIZE);
}
return plat_map_dma_mem_page(dev, page) + offset;
}
EXPORT_SYMBOL(pci_dac_page_to_dma);
struct page *pci_dac_dma_to_page(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return pfn_to_page(plat_dma_addr_to_phys(dma_addr) >> PAGE_SHIFT);
}
EXPORT_SYMBOL(pci_dac_dma_to_page);
unsigned long pci_dac_dma_to_offset(struct pci_dev *pdev,
dma64_addr_t dma_addr)
{
return dma_addr & ~PAGE_MASK;
}
EXPORT_SYMBOL(pci_dac_dma_to_offset);
void pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
if (!plat_device_is_coherent(&pdev->dev))
dma_cache_wback_inv(dma_addr + PAGE_OFFSET, len);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_cpu);
void pci_dac_dma_sync_single_for_device(struct pci_dev *pdev,
dma64_addr_t dma_addr, size_t len, int direction)
{
BUG_ON(direction == PCI_DMA_NONE);
if (!plat_device_is_coherent(&pdev->dev))
dma_cache_wback_inv(dma_addr + PAGE_OFFSET, len);
}
EXPORT_SYMBOL(pci_dac_dma_sync_single_for_device);
arch/powerpc/Kconfig
浏览文件 @ ac98695d
...@@ -876,7 +876,7 @@ config ARCH_SPARSEMEM_ENABLE ...@@ -876,7 +876,7 @@ config ARCH_SPARSEMEM_ENABLE
config ARCH_SPARSEMEM_DEFAULT config ARCH_SPARSEMEM_DEFAULT
def_bool y def_bool y
depends on (SMP && PPC_PSERIES) || PPC_CELL depends on (SMP && PPC_PSERIES) || PPC_PS3
config ARCH_POPULATES_NODE_MAP config ARCH_POPULATES_NODE_MAP
def_bool y def_bool y
......
arch/powerpc/boot/dts/kuroboxHD.dts 0 → 100644
浏览文件 @ ac98695d
/*
* Device Tree Souce for Buffalo KuroboxHD
*
* Choose CONFIG_LINKSTATION to build a kernel for KuroboxHD, or use
* the default configuration linkstation_defconfig.
*
* Based on sandpoint.dts
*
* 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
*
* This file is licensed under
* the terms of the GNU General Public License version 2. This program
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
XXXX add flash parts, rtc, ??
build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
*/
/ {
linux,phandle = <1000>;
model = "KuroboxHD";
compatible = "linkstation";
#address-cells = <1>;
#size-cells = <1>;
cpus {
linux,phandle = <2000>;
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
PowerPC,603e { /* Really 8241 */
linux,phandle = <2100>;
linux,boot-cpu;
device_type = "cpu";
reg = <0>;
clock-frequency = <bebc200>; /* Fixed by bootwrapper */
timebase-frequency = <1743000>; /* Fixed by bootwrapper */
bus-frequency = <0>; /* From bootloader */
/* Following required by dtc but not used */
i-cache-line-size = <0>;
d-cache-line-size = <0>;
i-cache-size = <4000>;
d-cache-size = <4000>;
};
};
memory {
linux,phandle = <3000>;
device_type = "memory";
reg = <00000000 04000000>;
};
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
linux,phandle = <4000>;
#address-cells = <1>;
#size-cells = <1>;
#interrupt-cells = <2>;
device_type = "soc";
compatible = "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
reg = <80000000 00100000>;
ranges = <80000000 80000000 70000000 /* pci mem space */
fc000000 fc000000 00100000 /* EUMB */
fe000000 fe000000 00c00000 /* pci i/o space */
fec00000 fec00000 00300000 /* pci cfg regs */
fef00000 fef00000 00100000>; /* pci iack */
i2c@80003000 {
linux,phandle = <4300>;
device_type = "i2c";
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
interrupt-parent = <4400>;
};
serial@80004500 {
linux,phandle = <4511>;
device_type = "serial";
compatible = "ns16550";
reg = <80004500 8>;
clock-frequency = <5d08d88>;
current-speed = <2580>;
interrupts = <9 2>;
interrupt-parent = <4400>;
};
serial@80004600 {
linux,phandle = <4512>;
device_type = "serial";
compatible = "ns16550";
reg = <80004600 8>;
clock-frequency = <5d08d88>;
current-speed = <e100>;
interrupts = <a 0>;
interrupt-parent = <4400>;
};
pic@80040000 {
linux,phandle = <4400>;
#interrupt-cells = <2>;
#address-cells = <0>;
device_type = "open-pic";
compatible = "chrp,open-pic";
interrupt-controller;
reg = <80040000 40000>;
built-in;
};
pci@fec00000 {
linux,phandle = <4500>;
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
device_type = "pci";
compatible = "mpc10x-pci";
reg = <fec00000 400000>;
ranges = <01000000 0 0 fe000000 0 00c00000
02000000 0 80000000 80000000 0 70000000>;
bus-range = <0 ff>;
clock-frequency = <7f28155>;
interrupt-parent = <4400>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x11 - IRQ0 ETH */
5800 0 0 1 4400 0 1
5800 0 0 2 4400 1 1
5800 0 0 3 4400 2 1
5800 0 0 4 4400 3 1
/* IDSEL 0x12 - IRQ1 IDE0 */
6000 0 0 1 4400 1 1
6000 0 0 2 4400 2 1
6000 0 0 3 4400 3 1
6000 0 0 4 4400 0 1
/* IDSEL 0x14 - IRQ3 USB2.0 */
7000 0 0 1 4400 3 1
7000 0 0 2 4400 3 1
7000 0 0 3 4400 3 1
7000 0 0 4 4400 3 1
>;
};
};
};
arch/powerpc/boot/dts/lite5200.dts
浏览文件 @ ac98695d
/* /*
* Lite5200 board Device Tree Source * Lite5200 board Device Tree Source
* *
* Copyright 2006 Secret Lab Technologies Ltd. * Copyright 2006-2007 Secret Lab Technologies Ltd.
* Grant Likely <grant.likely@secretlab.ca> * Grant Likely <grant.likely@secretlab.ca>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
*/ */
/ { / {
model = "Lite5200"; model = "fsl,lite5200";
compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx"; // revision = "1.0";
compatible = "fsl,lite5200\0generic-mpc5200";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -47,14 +48,17 @@ ...@@ -47,14 +48,17 @@
}; };
soc5200@f0000000 { soc5200@f0000000 {
model = "fsl,mpc5200";
revision = "" // from bootloader
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "soc"; device_type = "soc";
ranges = <0 f0000000 f0010000>; ranges = <0 f0000000 f0010000>;
reg = <f0000000 00010000>; reg = <f0000000 00010000>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200-cdm\0mpc52xx-cdm"; compatible = "mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
...@@ -64,77 +68,86 @@ ...@@ -64,77 +68,86 @@
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200-pic\0mpc52xx-pic"; compatible = "mpc5200-pic";
reg = <500 80>; reg = <500 80>;
built-in; built-in;
}; };
gpt@600 { // General Purpose Timer gpt@600 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <0>;
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
has-wdt;
}; };
gpt@610 { // General Purpose Timer gpt@610 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <1>;
reg = <610 10>; reg = <610 10>;
interrupts = <1 a 0>; interrupts = <1 a 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@620 { // General Purpose Timer gpt@620 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <2>;
reg = <620 10>; reg = <620 10>;
interrupts = <1 b 0>; interrupts = <1 b 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@630 { // General Purpose Timer gpt@630 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <3>;
reg = <630 10>; reg = <630 10>;
interrupts = <1 c 0>; interrupts = <1 c 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@640 { // General Purpose Timer gpt@640 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <4>;
reg = <640 10>; reg = <640 10>;
interrupts = <1 d 0>; interrupts = <1 d 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@650 { // General Purpose Timer gpt@650 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <5>;
reg = <650 10>; reg = <650 10>;
interrupts = <1 e 0>; interrupts = <1 e 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@660 { // General Purpose Timer gpt@660 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <6>;
reg = <660 10>; reg = <660 10>;
interrupts = <1 f 0>; interrupts = <1 f 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@670 { // General Purpose Timer gpt@670 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt"; compatible = "mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <7>;
reg = <670 10>; reg = <670 10>;
interrupts = <1 10 0>; interrupts = <1 10 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
compatible = "mpc5200-rtc\0mpc52xx-rtc"; compatible = "mpc5200-rtc";
device_type = "rtc"; device_type = "rtc";
reg = <800 100>; reg = <800 100>;
interrupts = <1 5 0 1 6 0>; interrupts = <1 5 0 1 6 0>;
...@@ -143,7 +156,8 @@ ...@@ -143,7 +156,8 @@
mscan@900 { mscan@900 {
device_type = "mscan"; device_type = "mscan";
compatible = "mpc5200-mscan\0mpc52xx-mscan"; compatible = "mpc5200-mscan";
cell-index = <0>;
interrupts = <2 11 0>; interrupts = <2 11 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
reg = <900 80>; reg = <900 80>;
...@@ -151,21 +165,22 @@ ...@@ -151,21 +165,22 @@
mscan@980 { mscan@980 {
device_type = "mscan"; device_type = "mscan";
compatible = "mpc5200-mscan\0mpc52xx-mscan"; compatible = "mpc5200-mscan";
cell-index = <1>;
interrupts = <1 12 0>; interrupts = <1 12 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
reg = <980 80>; reg = <980 80>;
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200-gpio\0mpc52xx-gpio"; compatible = "mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpio-wkup@b00 { gpio-wkup@b00 {
compatible = "mpc5200-gpio-wkup\0mpc52xx-gpio-wkup"; compatible = "mpc5200-gpio-wkup";
reg = <c00 40>; reg = <c00 40>;
interrupts = <1 8 0 0 3 0>; interrupts = <1 8 0 0 3 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -176,7 +191,7 @@ ...@@ -176,7 +191,7 @@
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
device_type = "pci"; device_type = "pci";
compatible = "mpc5200-pci\0mpc52xx-pci"; compatible = "mpc5200-pci";
reg = <d00 100>; reg = <d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 500 0 0 3 interrupt-map = <c000 0 0 1 500 0 0 3
...@@ -194,7 +209,7 @@ ...@@ -194,7 +209,7 @@
spi@f00 { spi@f00 {
device_type = "spi"; device_type = "spi";
compatible = "mpc5200-spi\0mpc52xx-spi"; compatible = "mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -202,7 +217,7 @@ ...@@ -202,7 +217,7 @@
usb@1000 { usb@1000 {
device_type = "usb-ohci-be"; device_type = "usb-ohci-be";
compatible = "mpc5200-ohci\0mpc52xx-ohci\0ohci-be"; compatible = "mpc5200-ohci\0ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -210,7 +225,7 @@ ...@@ -210,7 +225,7 @@
bestcomm@1200 { bestcomm@1200 {
device_type = "dma-controller"; device_type = "dma-controller";
compatible = "mpc5200-bestcomm\0mpc52xx-bestcomm"; compatible = "mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -220,67 +235,73 @@ ...@@ -220,67 +235,73 @@
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200-xlb\0mpc52xx-xlb"; compatible = "mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart"; compatible = "mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
cell-index = <0>;
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
// PSC2 in spi mode example // PSC2 in ac97 mode example
spi@2200 { // PSC2 //ac97@2200 { // PSC2
device_type = "spi"; // device_type = "sound";
compatible = "mpc5200-psc-spi\0mpc52xx-psc-spi"; // compatible = "mpc5200-psc-ac97";
reg = <2200 100>; // cell-index = <1>;
interrupts = <2 2 0>; // reg = <2200 100>;
interrupt-parent = <500>; // interrupts = <2 2 0>;
}; // interrupt-parent = <500>;
//};
// PSC3 in CODEC mode example // PSC3 in CODEC mode example
i2s@2400 { // PSC3 //i2s@2400 { // PSC3
device_type = "sound"; // device_type = "sound";
compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s"; // compatible = "mpc5200-psc-i2s";
reg = <2400 100>; // cell-index = <2>;
interrupts = <2 3 0>; // reg = <2400 100>;
interrupt-parent = <500>; // interrupts = <2 3 0>;
}; // interrupt-parent = <500>;
//};
// PSC4 unconfigured // PSC4 in uart mode example
//serial@2600 { // PSC4 //serial@2600 { // PSC4
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart"; // compatible = "mpc5200-psc-uart";
// cell-index = <3>;
// reg = <2600 100>; // reg = <2600 100>;
// interrupts = <2 b 0>; // interrupts = <2 b 0>;
// interrupt-parent = <500>; // interrupt-parent = <500>;
//}; //};
// PSC5 unconfigured // PSC5 in uart mode example
//serial@2800 { // PSC5 //serial@2800 { // PSC5
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart"; // compatible = "mpc5200-psc-uart";
// cell-index = <4>;
// reg = <2800 100>; // reg = <2800 100>;
// interrupts = <2 c 0>; // interrupts = <2 c 0>;
// interrupt-parent = <500>; // interrupt-parent = <500>;
//}; //};
// PSC6 in AC97 mode example // PSC6 in spi mode example
ac97@2c00 { // PSC6 //spi@2c00 { // PSC6
device_type = "sound"; // device_type = "spi";
compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97"; // compatible = "mpc5200-psc-spi";
reg = <2c00 100>; // cell-index = <5>;
interrupts = <2 4 0>; // reg = <2c00 100>;
interrupt-parent = <500>; // interrupts = <2 4 0>;
}; // interrupt-parent = <500>;
//};
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200-fec\0mpc52xx-fec"; compatible = "mpc5200-fec";
reg = <3000 800>; reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad! mac-address = [ 02 03 04 05 06 07 ]; // Bad!
interrupts = <2 5 0>; interrupts = <2 5 0>;
...@@ -289,7 +310,7 @@ ...@@ -289,7 +310,7 @@
ata@3a00 { ata@3a00 {
device_type = "ata"; device_type = "ata";
compatible = "mpc5200-ata\0mpc52xx-ata"; compatible = "mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -297,7 +318,8 @@ ...@@ -297,7 +318,8 @@
i2c@3d00 { i2c@3d00 {
device_type = "i2c"; device_type = "i2c";
compatible = "mpc5200-i2c\0mpc52xx-i2c"; compatible = "mpc5200-i2c";
cell-index = <0>;
reg = <3d00 40>; reg = <3d00 40>;
interrupts = <2 f 0>; interrupts = <2 f 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -305,14 +327,15 @@ ...@@ -305,14 +327,15 @@
i2c@3d40 { i2c@3d40 {
device_type = "i2c"; device_type = "i2c";
compatible = "mpc5200-i2c\0mpc52xx-i2c"; compatible = "mpc5200-i2c";
cell-index = <1>;
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
sram@8000 { sram@8000 {
device_type = "sram"; device_type = "sram";
compatible = "mpc5200-sram\0mpc52xx-sram\0sram"; compatible = "mpc5200-sram\0sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
......
arch/powerpc/boot/dts/lite5200b.dts
浏览文件 @ ac98695d
/* /*
* Lite5200B board Device Tree Source * Lite5200B board Device Tree Source
* *
* Copyright 2006 Secret Lab Technologies Ltd. * Copyright 2006-2007 Secret Lab Technologies Ltd.
* Grant Likely <grant.likely@secretlab.ca> * Grant Likely <grant.likely@secretlab.ca>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
*/ */
/ { / {
model = "Lite5200b"; model = "fsl,lite5200b";
compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx"; // revision = "1.0";
compatible = "fsl,lite5200b\0generic-mpc5200";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -47,14 +48,17 @@ ...@@ -47,14 +48,17 @@
}; };
soc5200@f0000000 { soc5200@f0000000 {
model = "fsl,mpc5200b";
revision = ""; // from bootloader
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "soc"; device_type = "soc";
ranges = <0 f0000000 f0010000>; ranges = <0 f0000000 f0010000>;
reg = <f0000000 00010000>; reg = <f0000000 00010000>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200b-cdm\0mpc52xx-cdm"; compatible = "mpc5200b-cdm\0mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
...@@ -64,77 +68,86 @@ ...@@ -64,77 +68,86 @@
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200b-pic\0mpc52xx-pic"; compatible = "mpc5200b-pic\0mpc5200-pic";
reg = <500 80>; reg = <500 80>;
built-in; built-in;
}; };
gpt@600 { // General Purpose Timer gpt@600 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <0>;
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
has-wdt;
}; };
gpt@610 { // General Purpose Timer gpt@610 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <1>;
reg = <610 10>; reg = <610 10>;
interrupts = <1 a 0>; interrupts = <1 a 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@620 { // General Purpose Timer gpt@620 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <2>;
reg = <620 10>; reg = <620 10>;
interrupts = <1 b 0>; interrupts = <1 b 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@630 { // General Purpose Timer gpt@630 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <3>;
reg = <630 10>; reg = <630 10>;
interrupts = <1 c 0>; interrupts = <1 c 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@640 { // General Purpose Timer gpt@640 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <4>;
reg = <640 10>; reg = <640 10>;
interrupts = <1 d 0>; interrupts = <1 d 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@650 { // General Purpose Timer gpt@650 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <5>;
reg = <650 10>; reg = <650 10>;
interrupts = <1 e 0>; interrupts = <1 e 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@660 { // General Purpose Timer gpt@660 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <6>;
reg = <660 10>; reg = <660 10>;
interrupts = <1 f 0>; interrupts = <1 f 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpt@670 { // General Purpose Timer gpt@670 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt"; compatible = "mpc5200b-gpt\0mpc5200-gpt";
device_type = "gpt"; device_type = "gpt";
cell-index = <7>;
reg = <670 10>; reg = <670 10>;
interrupts = <1 10 0>; interrupts = <1 10 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
compatible = "mpc5200b-rtc\0mpc52xx-rtc"; compatible = "mpc5200b-rtc\0mpc5200-rtc";
device_type = "rtc"; device_type = "rtc";
reg = <800 100>; reg = <800 100>;
interrupts = <1 5 0 1 6 0>; interrupts = <1 5 0 1 6 0>;
...@@ -143,7 +156,8 @@ ...@@ -143,7 +156,8 @@
mscan@900 { mscan@900 {
device_type = "mscan"; device_type = "mscan";
compatible = "mpc5200b-mscan\0mpc52xx-mscan"; compatible = "mpc5200b-mscan\0mpc5200-mscan";
cell-index = <0>;
interrupts = <2 11 0>; interrupts = <2 11 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
reg = <900 80>; reg = <900 80>;
...@@ -151,21 +165,22 @@ ...@@ -151,21 +165,22 @@
mscan@980 { mscan@980 {
device_type = "mscan"; device_type = "mscan";
compatible = "mpc5200b-mscan\0mpc52xx-mscan"; compatible = "mpc5200b-mscan\0mpc5200-mscan";
cell-index = <1>;
interrupts = <1 12 0>; interrupts = <1 12 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
reg = <980 80>; reg = <980 80>;
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200b-gpio\0mpc52xx-gpio"; compatible = "mpc5200b-gpio\0mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
gpio-wkup@b00 { gpio-wkup@b00 {
compatible = "mpc5200b-gpio-wkup\0mpc52xx-gpio-wkup"; compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup";
reg = <c00 40>; reg = <c00 40>;
interrupts = <1 8 0 0 3 0>; interrupts = <1 8 0 0 3 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -176,7 +191,7 @@ ...@@ -176,7 +191,7 @@
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
device_type = "pci"; device_type = "pci";
compatible = "mpc5200b-pci\0mpc52xx-pci"; compatible = "mpc5200b-pci\0mpc5200-pci";
reg = <d00 100>; reg = <d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot
...@@ -199,7 +214,7 @@ ...@@ -199,7 +214,7 @@
spi@f00 { spi@f00 {
device_type = "spi"; device_type = "spi";
compatible = "mpc5200b-spi\0mpc52xx-spi"; compatible = "mpc5200b-spi\0mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -207,7 +222,7 @@ ...@@ -207,7 +222,7 @@
usb@1000 { usb@1000 {
device_type = "usb-ohci-be"; device_type = "usb-ohci-be";
compatible = "mpc5200b-ohci\0mpc52xx-ohci\0ohci-be"; compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -215,7 +230,7 @@ ...@@ -215,7 +230,7 @@
bestcomm@1200 { bestcomm@1200 {
device_type = "dma-controller"; device_type = "dma-controller";
compatible = "mpc5200b-bestcomm\0mpc52xx-bestcomm"; compatible = "mpc5200b-bestcomm\0mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -225,67 +240,73 @@ ...@@ -225,67 +240,73 @@
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200b-xlb\0mpc52xx-xlb"; compatible = "mpc5200b-xlb\0mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart"; compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
cell-index = <0>;
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
// PSC2 in spi mode example // PSC2 in ac97 mode example
spi@2200 { // PSC2 //ac97@2200 { // PSC2
device_type = "spi"; // device_type = "sound";
compatible = "mpc5200b-psc-spi\0mpc52xx-psc-spi"; // compatible = "mpc5200b-psc-ac97\0mpc5200-psc-ac97";
reg = <2200 100>; // cell-index = <1>;
interrupts = <2 2 0>; // reg = <2200 100>;
interrupt-parent = <500>; // interrupts = <2 2 0>;
}; // interrupt-parent = <500>;
//};
// PSC3 in CODEC mode example // PSC3 in CODEC mode example
i2s@2400 { // PSC3 //i2s@2400 { // PSC3
device_type = "sound"; // device_type = "sound";
compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s"; // compatible = "mpc5200b-psc-i2s"; //not 5200 compatible
reg = <2400 100>; // cell-index = <2>;
interrupts = <2 3 0>; // reg = <2400 100>;
interrupt-parent = <500>; // interrupts = <2 3 0>;
}; // interrupt-parent = <500>;
//};
// PSC4 unconfigured // PSC4 in uart mode example
//serial@2600 { // PSC4 //serial@2600 { // PSC4
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart"; // compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart";
// cell-index = <3>;
// reg = <2600 100>; // reg = <2600 100>;
// interrupts = <2 b 0>; // interrupts = <2 b 0>;
// interrupt-parent = <500>; // interrupt-parent = <500>;
//}; //};
// PSC5 unconfigured // PSC5 in uart mode example
//serial@2800 { // PSC5 //serial@2800 { // PSC5
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart"; // compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart";
// cell-index = <4>;
// reg = <2800 100>; // reg = <2800 100>;
// interrupts = <2 c 0>; // interrupts = <2 c 0>;
// interrupt-parent = <500>; // interrupt-parent = <500>;
//}; //};
// PSC6 in AC97 mode example // PSC6 in spi mode example
ac97@2c00 { // PSC6 //spi@2c00 { // PSC6
device_type = "sound"; // device_type = "spi";
compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97"; // compatible = "mpc5200b-psc-spi\0mpc5200-psc-spi";
reg = <2c00 100>; // cell-index = <5>;
interrupts = <2 4 0>; // reg = <2c00 100>;
interrupt-parent = <500>; // interrupts = <2 4 0>;
}; // interrupt-parent = <500>;
//};
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200b-fec\0mpc52xx-fec"; compatible = "mpc5200b-fec\0mpc5200-fec";
reg = <3000 800>; reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad! mac-address = [ 02 03 04 05 06 07 ]; // Bad!
interrupts = <2 5 0>; interrupts = <2 5 0>;
...@@ -294,7 +315,7 @@ ...@@ -294,7 +315,7 @@
ata@3a00 { ata@3a00 {
device_type = "ata"; device_type = "ata";
compatible = "mpc5200b-ata\0mpc52xx-ata"; compatible = "mpc5200b-ata\0mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -302,7 +323,8 @@ ...@@ -302,7 +323,8 @@
i2c@3d00 { i2c@3d00 {
device_type = "i2c"; device_type = "i2c";
compatible = "mpc5200b-i2c\0mpc52xx-i2c"; compatible = "mpc5200b-i2c\0mpc5200-i2c";
cell-index = <0>;
reg = <3d00 40>; reg = <3d00 40>;
interrupts = <2 f 0>; interrupts = <2 f 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
...@@ -310,14 +332,15 @@ ...@@ -310,14 +332,15 @@
i2c@3d40 { i2c@3d40 {
device_type = "i2c"; device_type = "i2c";
compatible = "mpc5200b-i2c\0mpc52xx-i2c"; compatible = "mpc5200b-i2c\0mpc5200-i2c";
cell-index = <1>;
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <500>; interrupt-parent = <500>;
}; };
sram@8000 { sram@8000 {
device_type = "sram"; device_type = "sram";
compatible = "mpc5200b-sram\0mpc52xx-sram\0sram"; compatible = "mpc5200b-sram\0mpc5200-sram\0sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
......
arch/powerpc/boot/dts/mpc8313erdb.dts 0 → 100644
浏览文件 @ ac98695d
/*
* MPC8313E RDB Device Tree Source
*
* Copyright 2005, 2006, 2007 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
/ {
model = "MPC8313ERDB";
compatible = "MPC83xx";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
PowerPC,8313@0 {
device_type = "cpu";
reg = <0>;
d-cache-line-size = <20>; // 32 bytes
i-cache-line-size = <20>; // 32 bytes
d-cache-size = <4000>; // L1, 16K
i-cache-size = <4000>; // L1, 16K
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
32-bit;
};
};
memory {
device_type = "memory";
reg = <00000000 08000000>; // 128MB at 0
};
soc8313@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
#interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
bus-frequency = <0>;
wdt@200 {
device_type = "watchdog";
compatible = "mpc83xx_wdt";
reg = <200 100>;
};
i2c@3000 {
device_type = "i2c";
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
interrupt-parent = <700>;
dfsrr;
};
i2c@3100 {
device_type = "i2c";
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
interrupt-parent = <700>;
dfsrr;
};
spi@7000 {
device_type = "spi";
compatible = "mpc83xx_spi";
reg = <7000 1000>;
interrupts = <10 8>;
interrupt-parent = <700>;
mode = <0>;
};
/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
usb@23000 {
device_type = "usb";
compatible = "fsl-usb2-dr";
reg = <23000 1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <700>;
interrupts = <26 2>;
phy_type = "utmi_wide";
};
mdio@24520 {
device_type = "mdio";
compatible = "gianfar";
reg = <24520 20>;
#address-cells = <1>;
#size-cells = <0>;
linux,phandle = <24520>;
ethernet-phy@1 {
linux,phandle = <2452001>;
interrupt-parent = <700>;
interrupts = <13 2>;
reg = <1>;
device_type = "ethernet-phy";
};
ethernet-phy@4 {
linux,phandle = <2452004>;
interrupt-parent = <700>;
interrupts = <14 2>;
reg = <4>;
device_type = "ethernet-phy";
};
};
ethernet@24000 {
device_type = "network";
model = "eTSEC";
compatible = "gianfar";
reg = <24000 1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <25 8 24 8 23 8>;
interrupt-parent = <700>;
phy-handle = <2452001>;
};
ethernet@25000 {
device_type = "network";
model = "eTSEC";
compatible = "gianfar";
reg = <25000 1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <22 8 21 8 20 8>;
interrupt-parent = <700>;
phy-handle = <2452004>;
};
serial@4500 {
device_type = "serial";
compatible = "ns16550";
reg = <4500 100>;
clock-frequency = <0>;
interrupts = <9 8>;
interrupt-parent = <700>;
};
serial@4600 {
device_type = "serial";
compatible = "ns16550";
reg = <4600 100>;
clock-frequency = <0>;
interrupts = <a 8>;
interrupt-parent = <700>;
};
pci@8500 {
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x0E -mini PCI */
7000 0 0 1 700 12 8
7000 0 0 2 700 12 8
7000 0 0 3 700 12 8
7000 0 0 4 700 12 8
/* IDSEL 0x0F - PCI slot */
7800 0 0 1 700 11 8
7800 0 0 2 700 12 8
7800 0 0 3 700 11 8
7800 0 0 4 700 12 8>;
interrupt-parent = <700>;
interrupts = <42 8>;
bus-range = <0 0>;
ranges = <02000000 0 90000000 90000000 0 10000000
42000000 0 80000000 80000000 0 10000000
01000000 0 00000000 e2000000 0 00100000>;
clock-frequency = <3f940aa>;
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
reg = <8500 100>;
compatible = "83xx";
device_type = "pci";
};
crypto@30000 {
device_type = "crypto";
model = "SEC2";
compatible = "talitos";
reg = <30000 7000>;
interrupts = <b 8>;
interrupt-parent = <700>;
/* Rev. 2.2 */
num-channels = <1>;
channel-fifo-len = <18>;
exec-units-mask = <0000004c>;
descriptor-types-mask = <0122003f>;
};
/* IPIC
* interrupts cell = <intr #, sense>
* sense values match linux IORESOURCE_IRQ_* defines:
* sense == 8: Level, low assertion
* sense == 2: Edge, high-to-low change
*/
pic@700 {
linux,phandle = <700>;
interrupt-controller;
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
built-in;
device_type = "ipic";
};
};
};
arch/powerpc/boot/dts/mpc8349emitxgp.dts 0 → 100644
浏览文件 @ ac98695d
/*
* MPC8349E-mITX-GP Device Tree Source
*
* Copyright 2007 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
/ {
model = "MPC8349EMITXGP";
compatible = "MPC834xMITXGP";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
PowerPC,8349@0 {
device_type = "cpu";
reg = <0>;
d-cache-line-size = <20>;
i-cache-line-size = <20>;
d-cache-size = <8000>;
i-cache-size = <8000>;
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
32-bit;
};
};
memory {
device_type = "memory";
reg = <00000000 10000000>;
};
soc8349@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
#interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
bus-frequency = <0>; // from bootloader
wdt@200 {
device_type = "watchdog";
compatible = "mpc83xx_wdt";
reg = <200 100>;
};
i2c@3000 {
device_type = "i2c";
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
interrupt-parent = <700>;
dfsrr;
};
i2c@3100 {
device_type = "i2c";
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <f 8>;
interrupt-parent = <700>;
dfsrr;
};
spi@7000 {
device_type = "spi";
compatible = "mpc83xx_spi";
reg = <7000 1000>;
interrupts = <10 8>;
interrupt-parent = <700>;
mode = <0>;
};
usb@23000 {
device_type = "usb";
compatible = "fsl-usb2-dr";
reg = <23000 1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <700>;
interrupts = <26 2>;
dr_mode = "otg";
phy_type = "ulpi";
};
mdio@24520 {
device_type = "mdio";
compatible = "gianfar";
reg = <24520 20>;
#address-cells = <1>;
#size-cells = <0>;
linux,phandle = <24520>;
/* Vitesse 8201 */
ethernet-phy@1c {
linux,phandle = <245201c>;
interrupt-parent = <700>;
interrupts = <12 2>;
reg = <1c>;
device_type = "ethernet-phy";
};
};
ethernet@24000 {
device_type = "network";
model = "TSEC";
compatible = "gianfar";
reg = <24000 1000>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <20 8 21 8 22 8>;
interrupt-parent = <700>;
phy-handle = <245201c>;
};
serial@4500 {
device_type = "serial";
compatible = "ns16550";
reg = <4500 100>;
clock-frequency = <0>; // from bootloader
interrupts = <9 8>;
interrupt-parent = <700>;
};
serial@4600 {
device_type = "serial";
compatible = "ns16550";
reg = <4600 100>;
clock-frequency = <0>; // from bootloader
interrupts = <a 8>;
interrupt-parent = <700>;
};
pci@8600 {
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x0F - PCI Slot */
7800 0 0 1 700 14 8 /* PCI_INTA */
7800 0 0 2 700 15 8 /* PCI_INTB */
>;
interrupt-parent = <700>;
interrupts = <43 8>;
bus-range = <1 1>;
ranges = <42000000 0 a0000000 a0000000 0 10000000
02000000 0 b0000000 b0000000 0 10000000
01000000 0 00000000 e3000000 0 01000000>;
clock-frequency = <3f940aa>;
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
reg = <8600 100>;
compatible = "83xx";
device_type = "pci";
};
crypto@30000 {
device_type = "crypto";
model = "SEC2";
compatible = "talitos";
reg = <30000 10000>;
interrupts = <b 8>;
interrupt-parent = <700>;
num-channels = <4>;
channel-fifo-len = <18>;
exec-units-mask = <0000007e>;
descriptor-types-mask = <01010ebf>;
};
pic@700 {
linux,phandle = <700>;
interrupt-controller;
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
built-in;
device_type = "ipic";
};
};
};
arch/powerpc/boot/dts/mpc8349emds.dts → arch/powerpc/boot/dts/mpc834x_mds.dts
浏览文件 @ ac98695d
...@@ -39,6 +39,11 @@ ...@@ -39,6 +39,11 @@
reg = <00000000 10000000>; // 256MB at 0 reg = <00000000 10000000>; // 256MB at 0
}; };
bcsr@e2400000 {
device_type = "board-control";
reg = <e2400000 8000>;
};
soc8349@e0000000 { soc8349@e0000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -103,6 +108,7 @@ ...@@ -103,6 +108,7 @@
#size-cells = <0>; #size-cells = <0>;
interrupt-parent = <700>; interrupt-parent = <700>;
interrupts = <26 2>; interrupts = <26 2>;
dr_mode = "otg";
phy_type = "ulpi"; phy_type = "ulpi";
}; };
......
arch/powerpc/boot/dts/mpc8568mds.dts 0 → 100644
浏览文件 @ ac98695d
/*
* MPC8568E MDS Device Tree Source
*
* Copyright 2007 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
/*
/memreserve/ 00000000 1000000;
*/
/ {
model = "MPC8568EMDS";
compatible = "MPC85xxMDS";
#address-cells = <1>;
#size-cells = <1>;
linux,phandle = <100>;
cpus {
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
linux,phandle = <200>;
PowerPC,8568@0 {
device_type = "cpu";
reg = <0>;
d-cache-line-size = <20>; // 32 bytes
i-cache-line-size = <20>; // 32 bytes
d-cache-size = <8000>; // L1, 32K
i-cache-size = <8000>; // L1, 32K
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
32-bit;
linux,phandle = <201>;
};
};
memory {
device_type = "memory";
linux,phandle = <300>;
reg = <00000000 10000000>;
};
bcsr@f8000000 {
device_type = "board-control";
reg = <f8000000 8000>;
};
soc8568@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
#interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00100000>;
bus-frequency = <0>;
i2c@3000 {
device_type = "i2c";
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <1b 2>;
interrupt-parent = <40000>;
dfsrr;
};
i2c@3100 {
device_type = "i2c";
compatible = "fsl-i2c";
reg = <3100 100>;
interrupts = <1b 2>;
interrupt-parent = <40000>;
dfsrr;
};
mdio@24520 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "mdio";
compatible = "gianfar";
reg = <24520 20>;
linux,phandle = <24520>;
ethernet-phy@0 {
linux,phandle = <2452000>;
interrupt-parent = <40000>;
interrupts = <31 1>;
reg = <0>;
device_type = "ethernet-phy";
};
ethernet-phy@1 {
linux,phandle = <2452001>;
interrupt-parent = <40000>;
interrupts = <32 1>;
reg = <1>;
device_type = "ethernet-phy";
};
ethernet-phy@2 {
linux,phandle = <2452002>;
interrupt-parent = <40000>;
interrupts = <31 1>;
reg = <2>;
device_type = "ethernet-phy";
};
ethernet-phy@3 {
linux,phandle = <2452003>;
interrupt-parent = <40000>;
interrupts = <32 1>;
reg = <3>;
device_type = "ethernet-phy";
};
};
ethernet@24000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "network";
model = "eTSEC";
compatible = "gianfar";
reg = <24000 1000>;
mac-address = [ 00 00 00 00 00 00 ];
interrupts = <d 2 e 2 12 2>;
interrupt-parent = <40000>;
phy-handle = <2452002>;
};
ethernet@25000 {
#address-cells = <1>;
#size-cells = <0>;
device_type = "network";
model = "eTSEC";
compatible = "gianfar";
reg = <25000 1000>;
mac-address = [ 00 00 00 00 00 00];
interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>;
phy-handle = <2452003>;
};
serial@4500 {
device_type = "serial";
compatible = "ns16550";
reg = <4500 100>;
clock-frequency = <0>;
interrupts = <1a 2>;
interrupt-parent = <40000>;
};
serial@4600 {
device_type = "serial";
compatible = "ns16550";
reg = <4600 100>;
clock-frequency = <0>;
interrupts = <1a 2>;
interrupt-parent = <40000>;
};
crypto@30000 {
device_type = "crypto";
model = "SEC2";
compatible = "talitos";
reg = <30000 f000>;
interrupts = <1d 2>;
interrupt-parent = <40000>;
num-channels = <4>;
channel-fifo-len = <18>;
exec-units-mask = <000000fe>;
descriptor-types-mask = <012b0ebf>;
};
pic@40000 {
linux,phandle = <40000>;
clock-frequency = <0>;
interrupt-controller;
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
};
par_io@e0100 {
reg = <e0100 100>;
device_type = "par_io";
num-ports = <7>;
ucc_pin@01 {
linux,phandle = <e010001>;
pio-map = <
/* port pin dir open_drain assignment has_irq */
4 0a 1 0 2 0 /* TxD0 */
4 09 1 0 2 0 /* TxD1 */
4 08 1 0 2 0 /* TxD2 */
4 07 1 0 2 0 /* TxD3 */
4 17 1 0 2 0 /* TxD4 */
4 16 1 0 2 0 /* TxD5 */
4 15 1 0 2 0 /* TxD6 */
4 14 1 0 2 0 /* TxD7 */
4 0f 2 0 2 0 /* RxD0 */
4 0e 2 0 2 0 /* RxD1 */
4 0d 2 0 2 0 /* RxD2 */
4 0c 2 0 2 0 /* RxD3 */
4 1d 2 0 2 0 /* RxD4 */
4 1c 2 0 2 0 /* RxD5 */
4 1b 2 0 2 0 /* RxD6 */
4 1a 2 0 2 0 /* RxD7 */
4 0b 1 0 2 0 /* TX_EN */
4 18 1 0 2 0 /* TX_ER */
4 0f 2 0 2 0 /* RX_DV */
4 1e 2 0 2 0 /* RX_ER */
4 11 2 0 2 0 /* RX_CLK */
4 13 1 0 2 0 /* GTX_CLK */
1 1f 2 0 3 0>; /* GTX125 */
};
ucc_pin@02 {
linux,phandle = <e010002>;
pio-map = <
/* port pin dir open_drain assignment has_irq */
5 0a 1 0 2 0 /* TxD0 */
5 09 1 0 2 0 /* TxD1 */
5 08 1 0 2 0 /* TxD2 */
5 07 1 0 2 0 /* TxD3 */
5 17 1 0 2 0 /* TxD4 */
5 16 1 0 2 0 /* TxD5 */
5 15 1 0 2 0 /* TxD6 */
5 14 1 0 2 0 /* TxD7 */
5 0f 2 0 2 0 /* RxD0 */
5 0e 2 0 2 0 /* RxD1 */
5 0d 2 0 2 0 /* RxD2 */
5 0c 2 0 2 0 /* RxD3 */
5 1d 2 0 2 0 /* RxD4 */
5 1c 2 0 2 0 /* RxD5 */
5 1b 2 0 2 0 /* RxD6 */
5 1a 2 0 2 0 /* RxD7 */
5 0b 1 0 2 0 /* TX_EN */
5 18 1 0 2 0 /* TX_ER */
5 10 2 0 2 0 /* RX_DV */
5 1e 2 0 2 0 /* RX_ER */
5 11 2 0 2 0 /* RX_CLK */
5 13 1 0 2 0 /* GTX_CLK */
1 1f 2 0 3 0 /* GTX125 */
4 06 3 0 2 0 /* MDIO */
4 05 1 0 2 0>; /* MDC */
};
};
};
qe@e0080000 {
#address-cells = <1>;
#size-cells = <1>;
device_type = "qe";
model = "QE";
ranges = <0 e0080000 00040000>;
reg = <e0080000 480>;
brg-frequency = <0>;
bus-frequency = <179A7B00>;
muram@10000 {
device_type = "muram";
ranges = <0 00010000 0000c000>;
data-only@0{
reg = <0 c000>;
};
};
spi@4c0 {
device_type = "spi";
compatible = "fsl_spi";
reg = <4c0 40>;
interrupts = <2>;
interrupt-parent = <80>;
mode = "cpu";
};
spi@500 {
device_type = "spi";
compatible = "fsl_spi";
reg = <500 40>;
interrupts = <1>;
interrupt-parent = <80>;
mode = "cpu";
};
ucc@2000 {
device_type = "network";
compatible = "ucc_geth";
model = "UCC";
device-id = <1>;
reg = <2000 200>;
interrupts = <20>;
interrupt-parent = <80>;
mac-address = [ 00 04 9f 00 23 23 ];
rx-clock = <0>;
tx-clock = <19>;
phy-handle = <212000>;
pio-handle = <e010001>;
};
ucc@3000 {
device_type = "network";
compatible = "ucc_geth";
model = "UCC";
device-id = <2>;
reg = <3000 200>;
interrupts = <21>;
interrupt-parent = <80>;
mac-address = [ 00 11 22 33 44 55 ];
rx-clock = <0>;
tx-clock = <14>;
phy-handle = <212001>;
pio-handle = <e010002>;
};
mdio@2120 {
#address-cells = <1>;
#size-cells = <0>;
reg = <2120 18>;
device_type = "mdio";
compatible = "ucc_geth_phy";
/* These are the same PHYs as on
* gianfar's MDIO bus */
ethernet-phy@00 {
linux,phandle = <212000>;
interrupt-parent = <40000>;
interrupts = <31 1>;
reg = <0>;
device_type = "ethernet-phy";
interface = <6>; //ENET_1000_GMII
};
ethernet-phy@01 {
linux,phandle = <212001>;
interrupt-parent = <40000>;
interrupts = <32 1>;
reg = <1>;
device_type = "ethernet-phy";
interface = <6>;
};
ethernet-phy@02 {
linux,phandle = <212002>;
interrupt-parent = <40000>;
interrupts = <31 1>;
reg = <2>;
device_type = "ethernet-phy";
interface = <6>; //ENET_1000_GMII
};
ethernet-phy@03 {
linux,phandle = <212003>;
interrupt-parent = <40000>;
interrupts = <32 1>;
reg = <3>;
device_type = "ethernet-phy";
interface = <6>; //ENET_1000_GMII
};
};
qeic@80 {
linux,phandle = <80>;
interrupt-controller;
device_type = "qeic";
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
built-in;
big-endian;
interrupts = <1e 2 1e 2>; //high:30 low:30
interrupt-parent = <40000>;
};
};
};
arch/powerpc/configs/linkstation_defconfig
浏览文件 @ ac98695d
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc5 # Linux kernel version: 2.6.20-rc6
# Mon Jan 22 22:17:58 2007 # Sun Jan 28 23:13:56 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
CONFIG_PPC32=y CONFIG_PPC32=y
...@@ -58,7 +58,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 ...@@ -58,7 +58,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# #
# General setup # General setup
# #
CONFIG_LOCALVERSION="-kuroboxHG" CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
...@@ -206,7 +206,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -206,7 +206,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_PROC_DEVICETREE=y CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_BOOL is not set
# CONFIG_PM is not set # CONFIG_PM is not set
# CONFIG_SECCOMP is not set CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y CONFIG_ISA_DMA_API=y
# #
...@@ -312,39 +312,40 @@ CONFIG_NF_CONNTRACK=m ...@@ -312,39 +312,40 @@ CONFIG_NF_CONNTRACK=m
# CONFIG_NF_CT_ACCT is not set # CONFIG_NF_CT_ACCT is not set
# CONFIG_NF_CONNTRACK_MARK is not set # CONFIG_NF_CONNTRACK_MARK is not set
# CONFIG_NF_CONNTRACK_EVENTS is not set # CONFIG_NF_CONNTRACK_EVENTS is not set
# CONFIG_NF_CT_PROTO_SCTP is not set CONFIG_NF_CT_PROTO_GRE=m
# CONFIG_NF_CONNTRACK_AMANDA is not set CONFIG_NF_CT_PROTO_SCTP=m
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_FTP=m
# CONFIG_NF_CONNTRACK_H323 is not set CONFIG_NF_CONNTRACK_H323=m
CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_IRC=m
# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set CONFIG_NF_CONNTRACK_NETBIOS_NS=m
# CONFIG_NF_CONNTRACK_PPTP is not set CONFIG_NF_CONNTRACK_PPTP=m
# CONFIG_NF_CONNTRACK_SIP is not set CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
CONFIG_NETFILTER_XT_TARGET_MARK=m # CONFIG_NETFILTER_XT_TARGET_MARK is not set
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
CONFIG_NETFILTER_XT_TARGET_NFLOG=m # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
CONFIG_NETFILTER_XT_MATCH_ESP=m # CONFIG_NETFILTER_XT_MATCH_ESP is not set
CONFIG_NETFILTER_XT_MATCH_HELPER=m # CONFIG_NETFILTER_XT_MATCH_HELPER is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=m # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
CONFIG_NETFILTER_XT_MATCH_LIMIT=m # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m # CONFIG_NETFILTER_XT_MATCH_MARK is not set
# CONFIG_NETFILTER_XT_MATCH_POLICY is not set # CONFIG_NETFILTER_XT_MATCH_POLICY is not set
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_REALM is not set # CONFIG_NETFILTER_XT_MATCH_REALM is not set
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set # CONFIG_NETFILTER_XT_MATCH_SCTP is not set
# CONFIG_NETFILTER_XT_MATCH_STATE is not set CONFIG_NETFILTER_XT_MATCH_STATE=m
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
# CONFIG_NETFILTER_XT_MATCH_STRING is not set # CONFIG_NETFILTER_XT_MATCH_STRING is not set
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
...@@ -359,12 +360,12 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y ...@@ -359,12 +360,12 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m CONFIG_IP_NF_MATCH_IPRANGE=m
# CONFIG_IP_NF_MATCH_TOS is not set # CONFIG_IP_NF_MATCH_TOS is not set
# CONFIG_IP_NF_MATCH_RECENT is not set CONFIG_IP_NF_MATCH_RECENT=m
# CONFIG_IP_NF_MATCH_ECN is not set # CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_AH is not set # CONFIG_IP_NF_MATCH_AH is not set
# CONFIG_IP_NF_MATCH_TTL is not set # CONFIG_IP_NF_MATCH_TTL is not set
# CONFIG_IP_NF_MATCH_OWNER is not set CONFIG_IP_NF_MATCH_OWNER=m
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_REJECT=m
# CONFIG_IP_NF_TARGET_LOG is not set # CONFIG_IP_NF_TARGET_LOG is not set
...@@ -374,16 +375,17 @@ CONFIG_NF_NAT=m ...@@ -374,16 +375,17 @@ CONFIG_NF_NAT=m
CONFIG_NF_NAT_NEEDED=y CONFIG_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m # CONFIG_IP_NF_TARGET_NETMAP is not set
CONFIG_IP_NF_TARGET_SAME=m # CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_NF_NAT_SNMP_BASIC is not set # CONFIG_NF_NAT_SNMP_BASIC is not set
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_TFTP=m CONFIG_NF_NAT_TFTP=m
# CONFIG_NF_NAT_AMANDA is not set CONFIG_NF_NAT_AMANDA=m
# CONFIG_NF_NAT_PPTP is not set CONFIG_NF_NAT_PPTP=m
# CONFIG_NF_NAT_H323 is not set CONFIG_NF_NAT_H323=m
# CONFIG_NF_NAT_SIP is not set CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_ECN=m
...@@ -472,6 +474,7 @@ CONFIG_MTD_PARTITIONS=y ...@@ -472,6 +474,7 @@ CONFIG_MTD_PARTITIONS=y
# User Modules And Translation Layers # User Modules And Translation Layers
# #
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set # CONFIG_FTL is not set
# CONFIG_NFTL is not set # CONFIG_NFTL is not set
...@@ -518,6 +521,7 @@ CONFIG_MTD_PHYSMAP=y ...@@ -518,6 +521,7 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0xffc00000 CONFIG_MTD_PHYSMAP_START=0xffc00000
CONFIG_MTD_PHYSMAP_LEN=0x400000 CONFIG_MTD_PHYSMAP_LEN=0x400000
CONFIG_MTD_PHYSMAP_BANKWIDTH=1 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# CONFIG_MTD_PHYSMAP_OF is not set
# CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PLATRAM is not set
# #
...@@ -540,6 +544,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 ...@@ -540,6 +544,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# NAND Flash Device Drivers # NAND Flash Device Drivers
# #
# CONFIG_MTD_NAND is not set # CONFIG_MTD_NAND is not set
# CONFIG_MTD_NAND_CAFE is not set
# #
# OneNAND Flash Device Drivers # OneNAND Flash Device Drivers
...@@ -696,7 +701,7 @@ CONFIG_ATA=y ...@@ -696,7 +701,7 @@ CONFIG_ATA=y
# CONFIG_PATA_HPT37X is not set # CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set # CONFIG_PATA_HPT3X3 is not set
# CONFIG_PATA_IT821X is not set CONFIG_PATA_IT821X=y
# CONFIG_PATA_JMICRON is not set # CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_TRIFLEX is not set # CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set # CONFIG_PATA_MARVELL is not set
...@@ -763,11 +768,33 @@ CONFIG_TUN=m ...@@ -763,11 +768,33 @@ CONFIG_TUN=m
# #
# PHY device support # PHY device support
# #
# CONFIG_PHYLIB is not set
# #
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
# #
# CONFIG_NET_ETHERNET is not set CONFIG_NET_ETHERNET=y
# CONFIG_MII is not set
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
#
# Tulip family network device support
#
CONFIG_NET_TULIP=y
# CONFIG_DE2104X is not set
CONFIG_TULIP=y
# CONFIG_TULIP_MWI is not set
CONFIG_TULIP_MMIO=y
# CONFIG_TULIP_NAPI is not set
# CONFIG_DE4X5 is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_DM9102 is not set
# CONFIG_ULI526X is not set
# CONFIG_HP100 is not set
# CONFIG_NET_PCI is not set
# #
# Ethernet (1000 Mbit) # Ethernet (1000 Mbit)
...@@ -829,7 +856,8 @@ CONFIG_NET_RADIO=y ...@@ -829,7 +856,8 @@ CONFIG_NET_RADIO=y
# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZD1201 is not set
# CONFIG_HOSTAP is not set # CONFIG_HOSTAP is not set
# CONFIG_BCM43XX is not set # CONFIG_BCM43XX is not set
# CONFIG_ZD1211RW is not set CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_NET_WIRELESS=y CONFIG_NET_WIRELESS=y
# #
...@@ -1098,7 +1126,7 @@ CONFIG_DUMMY_CONSOLE=y ...@@ -1098,7 +1126,7 @@ CONFIG_DUMMY_CONSOLE=y
# #
# HID Devices # HID Devices
# #
CONFIG_HID=y CONFIG_HID=m
# #
# USB support # USB support
...@@ -1115,7 +1143,6 @@ CONFIG_USB=y ...@@ -1115,7 +1143,6 @@ CONFIG_USB=y
CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_MULTITHREAD_PROBE is not set
# CONFIG_USB_OTG is not set # CONFIG_USB_OTG is not set
# #
...@@ -1136,7 +1163,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y ...@@ -1136,7 +1163,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# USB Device Class drivers # USB Device Class drivers
# #
# CONFIG_USB_ACM is not set # CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set CONFIG_USB_PRINTER=m
# #
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
...@@ -1371,7 +1398,11 @@ CONFIG_FS_MBCACHE=y ...@@ -1371,7 +1398,11 @@ CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set # CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set CONFIG_XFS_FS=m
# CONFIG_XFS_QUOTA is not set
# CONFIG_XFS_SECURITY is not set
# CONFIG_XFS_POSIX_ACL is not set
# CONFIG_XFS_RT is not set
# CONFIG_GFS2_FS is not set # CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set # CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set # CONFIG_MINIX_FS is not set
...@@ -1461,7 +1492,12 @@ CONFIG_SUNRPC_GSS=y ...@@ -1461,7 +1492,12 @@ CONFIG_SUNRPC_GSS=y
CONFIG_RPCSEC_GSS_KRB5=y CONFIG_RPCSEC_GSS_KRB5=y
# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set # CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_XATTR is not set
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
...@@ -1495,7 +1531,7 @@ CONFIG_NLS_CODEPAGE_437=m ...@@ -1495,7 +1531,7 @@ CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set CONFIG_NLS_CODEPAGE_932=m
# CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_ISO8859_8 is not set
...@@ -1526,12 +1562,14 @@ CONFIG_NLS_UTF8=m ...@@ -1526,12 +1562,14 @@ CONFIG_NLS_UTF8=m
# Library routines # Library routines
# #
CONFIG_BITREVERSE=y CONFIG_BITREVERSE=y
# CONFIG_CRC_CCITT is not set CONFIG_CRC_CCITT=m
# CONFIG_CRC16 is not set # CONFIG_CRC16 is not set
CONFIG_CRC32=y CONFIG_CRC32=y
CONFIG_LIBCRC32C=m CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m CONFIG_ZLIB_DEFLATE=m
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_PLIST=y CONFIG_PLIST=y
CONFIG_IOMAP_COPY=y CONFIG_IOMAP_COPY=y
......
arch/powerpc/configs/mpc8313_rdb_defconfig 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/configs/mpc834x_itx_defconfig
浏览文件 @ ac98695d
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc5 # Linux kernel version: 2.6.20
# Fri Jan 26 00:19:02 2007 # Wed Feb 7 13:12:18 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
CONFIG_PPC32=y CONFIG_PPC32=y
...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y ...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
CONFIG_PPC_83xx=y CONFIG_PPC_83xx=y
# CONFIG_PPC_85xx is not set # CONFIG_PPC_85xx is not set
# CONFIG_PPC_86xx is not set # CONFIG_PPC_86xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_40x is not set # CONFIG_40x is not set
# CONFIG_44x is not set # CONFIG_44x is not set
# CONFIG_8xx is not set
# CONFIG_E200 is not set # CONFIG_E200 is not set
CONFIG_6xx=y CONFIG_6xx=y
CONFIG_83xx=y CONFIG_83xx=y
...@@ -178,7 +178,6 @@ CONFIG_FSL_SOC=y ...@@ -178,7 +178,6 @@ CONFIG_FSL_SOC=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set # CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
# #
# PCCARD (PCMCIA/CardBus) support # PCCARD (PCMCIA/CardBus) support
...@@ -303,7 +302,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" ...@@ -303,7 +302,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_STANDALONE=y CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYS_HYPERVISOR is not set
# #
...@@ -523,6 +521,7 @@ CONFIG_SCSI_SPI_ATTRS=y ...@@ -523,6 +521,7 @@ CONFIG_SCSI_SPI_ATTRS=y
# Serial ATA (prod) and Parallel ATA (experimental) drivers # Serial ATA (prod) and Parallel ATA (experimental) drivers
# #
CONFIG_ATA=y CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_SATA_AHCI is not set # CONFIG_SATA_AHCI is not set
# CONFIG_SATA_SVW is not set # CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set # CONFIG_ATA_PIIX is not set
...@@ -647,37 +646,7 @@ CONFIG_CICADA_PHY=y ...@@ -647,37 +646,7 @@ CONFIG_CICADA_PHY=y
# #
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
# #
CONFIG_NET_ETHERNET=y # CONFIG_NET_ETHERNET is not set
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
#
# Tulip family network device support
#
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# #
# Ethernet (1000 Mbit) # Ethernet (1000 Mbit)
...@@ -693,7 +662,6 @@ CONFIG_E100=y ...@@ -693,7 +662,6 @@ CONFIG_E100=y
# CONFIG_SKGE is not set # CONFIG_SKGE is not set
# CONFIG_SKY2 is not set # CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set # CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set # CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set # CONFIG_BNX2 is not set
CONFIG_GIANFAR=y CONFIG_GIANFAR=y
...@@ -746,26 +714,7 @@ CONFIG_GFAR_NAPI=y ...@@ -746,26 +714,7 @@ CONFIG_GFAR_NAPI=y
# #
# Input device support # Input device support
# #
CONFIG_INPUT=y # CONFIG_INPUT is not set
# CONFIG_INPUT_FF_MEMLESS is not set
#
# Userland interfaces
#
# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
#
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
# #
# Hardware I/O ports # Hardware I/O ports
...@@ -784,7 +733,7 @@ CONFIG_INPUT=y ...@@ -784,7 +733,7 @@ CONFIG_INPUT=y
# #
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_PCI=y # CONFIG_SERIAL_8250_PCI is not set
CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set # CONFIG_SERIAL_8250_EXTENDED is not set
...@@ -887,7 +836,7 @@ CONFIG_I2C_MPC=y ...@@ -887,7 +836,7 @@ CONFIG_I2C_MPC=y
# CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set # CONFIG_SENSORS_DS1374 is not set
# CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_EEPROM is not set
# CONFIG_SENSORS_PCF8574 is not set CONFIG_SENSORS_PCF8574=y
# CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_M41T00 is not set # CONFIG_SENSORS_M41T00 is not set
...@@ -901,7 +850,6 @@ CONFIG_I2C_MPC=y ...@@ -901,7 +850,6 @@ CONFIG_I2C_MPC=y
# SPI support # SPI support
# #
CONFIG_SPI=y CONFIG_SPI=y
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y CONFIG_SPI_MASTER=y
# #
...@@ -922,52 +870,8 @@ CONFIG_SPI_MPC83xx=y ...@@ -922,52 +870,8 @@ CONFIG_SPI_MPC83xx=y
# #
# Hardware Monitoring support # Hardware Monitoring support
# #
CONFIG_HWMON=y # CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set # CONFIG_HWMON_VID is not set
# CONFIG_SENSORS_ABITUGURU is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ADM9240 is not set
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_FSCHER is not set
# CONFIG_SENSORS_FSCPOS is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM70 is not set
# CONFIG_SENSORS_LM75 is not set
# CONFIG_SENSORS_LM77 is not set
# CONFIG_SENSORS_LM78 is not set
# CONFIG_SENSORS_LM80 is not set
# CONFIG_SENSORS_LM83 is not set
# CONFIG_SENSORS_LM85 is not set
# CONFIG_SENSORS_LM87 is not set
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_SIS5595 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_VT8231 is not set
# CONFIG_SENSORS_W83781D is not set
# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
# #
# Multimedia devices # Multimedia devices
...@@ -983,7 +887,7 @@ CONFIG_HWMON=y ...@@ -983,7 +887,7 @@ CONFIG_HWMON=y
# #
# Graphics support # Graphics support
# #
CONFIG_FIRMWARE_EDID=y # CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB is not set # CONFIG_FB is not set
# CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
...@@ -993,11 +897,6 @@ CONFIG_FIRMWARE_EDID=y ...@@ -993,11 +897,6 @@ CONFIG_FIRMWARE_EDID=y
# #
# CONFIG_SOUND is not set # CONFIG_SOUND is not set
#
# HID Devices
#
CONFIG_HID=y
# #
# USB support # USB support
# #
...@@ -1023,10 +922,8 @@ CONFIG_USB_EHCI_HCD=y ...@@ -1023,10 +922,8 @@ CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP116X_HCD is not set
CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_HCD is not set
# CONFIG_USB_OHCI_BIG_ENDIAN is not set # CONFIG_USB_UHCI_HCD is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set # CONFIG_USB_SL811_HCD is not set
# #
...@@ -1058,25 +955,10 @@ CONFIG_USB_STORAGE=y ...@@ -1058,25 +955,10 @@ CONFIG_USB_STORAGE=y
# #
# USB Input Devices # USB Input Devices
# #
# CONFIG_USB_HID is not set
# #
# USB HID Boot Protocol drivers # USB HID Boot Protocol drivers
# #
# CONFIG_USB_KBD is not set
# CONFIG_USB_MOUSE is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_TOUCHSCREEN is not set
# CONFIG_USB_YEALINK is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
# #
# USB Imaging devices # USB Imaging devices
...@@ -1133,25 +1015,7 @@ CONFIG_USB_MON=y ...@@ -1133,25 +1015,7 @@ CONFIG_USB_MON=y
# #
# USB Gadget Support # USB Gadget Support
# #
CONFIG_USB_GADGET=y # CONFIG_USB_GADGET is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_NET2280=y
CONFIG_USB_NET2280=y
# CONFIG_USB_GADGET_PXA2XX is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# #
# MMC/SD Card support # MMC/SD Card support
...@@ -1273,8 +1137,11 @@ CONFIG_DNOTIFY=y ...@@ -1273,8 +1137,11 @@ CONFIG_DNOTIFY=y
# #
# DOS/FAT/NT Filesystems # DOS/FAT/NT Filesystems
# #
# CONFIG_MSDOS_FS is not set CONFIG_FAT_FS=y
# CONFIG_VFAT_FS is not set CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set # CONFIG_NTFS_FS is not set
# #
...@@ -1340,7 +1207,7 @@ CONFIG_PARTITION_ADVANCED=y ...@@ -1340,7 +1207,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_OSF_PARTITION is not set # CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set # CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set # CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set # CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MINIX_SUBPARTITION is not set
...@@ -1356,7 +1223,46 @@ CONFIG_MSDOS_PARTITION=y ...@@ -1356,7 +1223,46 @@ CONFIG_MSDOS_PARTITION=y
# #
# Native Language Support # Native Language Support
# #
# CONFIG_NLS is not set CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
# #
# Distributed Lock Manager # Distributed Lock Manager
...@@ -1388,27 +1294,9 @@ CONFIG_ENABLE_MUST_CHECK=y ...@@ -1388,27 +1294,9 @@ CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_KERNEL is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_DEBUGGER is not set
# CONFIG_BDI_SWITCH is not set
# CONFIG_BOOTX_TEXT is not set # CONFIG_BOOTX_TEXT is not set
# CONFIG_SERIAL_TEXT_DEBUG is not set # CONFIG_SERIAL_TEXT_DEBUG is not set
# CONFIG_PPC_EARLY_DEBUG is not set # CONFIG_PPC_EARLY_DEBUG is not set
......
arch/powerpc/configs/mpc834x_itxgp_defconfig 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/configs/mpc834x_mds_defconfig
浏览文件 @ ac98695d
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc5 # Linux kernel version: 2.6.20
# Fri Jan 26 00:19:27 2007 # Thu Feb 8 01:00:48 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
CONFIG_PPC32=y CONFIG_PPC32=y
...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y ...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
CONFIG_PPC_83xx=y CONFIG_PPC_83xx=y
# CONFIG_PPC_85xx is not set # CONFIG_PPC_85xx is not set
# CONFIG_PPC_86xx is not set # CONFIG_PPC_86xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_40x is not set # CONFIG_40x is not set
# CONFIG_44x is not set # CONFIG_44x is not set
# CONFIG_8xx is not set
# CONFIG_E200 is not set # CONFIG_E200 is not set
CONFIG_6xx=y CONFIG_6xx=y
CONFIG_83xx=y CONFIG_83xx=y
...@@ -128,8 +128,9 @@ CONFIG_PPC_GEN550=y ...@@ -128,8 +128,9 @@ CONFIG_PPC_GEN550=y
# #
# Platform support # Platform support
# #
# CONFIG_MPC8313_RDB is not set
# CONFIG_MPC832x_MDS is not set # CONFIG_MPC832x_MDS is not set
CONFIG_MPC834x_SYS=y CONFIG_MPC834x_MDS=y
# CONFIG_MPC834x_ITX is not set # CONFIG_MPC834x_ITX is not set
# CONFIG_MPC8360E_PB is not set # CONFIG_MPC8360E_PB is not set
CONFIG_MPC834x=y CONFIG_MPC834x=y
......
arch/powerpc/configs/mpc8568mds_defconfig 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/kernel/btext.c
浏览文件 @ ac98695d
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/lmb.h> #include <asm/lmb.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/udbg.h>
#define NO_SCROLL #define NO_SCROLL
...@@ -912,3 +913,11 @@ static unsigned char vga_font[cmapsz] = { ...@@ -912,3 +913,11 @@ static unsigned char vga_font[cmapsz] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };
void __init udbg_init_btext(void)
{
/* If btext is enabled, we might have a BAT setup for early display,
* thus we do enable some very basic udbg output
*/
udbg_putc = btext_drawchar;
}
arch/powerpc/kernel/cputable.c
浏览文件 @ ac98695d
...@@ -44,7 +44,7 @@ extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec); ...@@ -44,7 +44,7 @@ extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec);
extern void __restore_cpu_pa6t(unsigned long offset, struct cpu_spec* spec); extern void __restore_cpu_pa6t(void);
extern void __restore_cpu_ppc970(void); extern void __restore_cpu_ppc970(void);
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
......
arch/powerpc/kernel/head_44x.S
浏览文件 @ ac98695d
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/ibm4xx.h>
#include <asm/ibm44x.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
......
arch/powerpc/kernel/head_fsl_booke.S
浏览文件 @ ac98695d
...@@ -206,7 +206,8 @@ skpinv: addi r6,r6,1 /* Increment */ ...@@ -206,7 +206,8 @@ skpinv: addi r6,r6,1 /* Increment */
rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */ rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */
mtspr SPRN_MAS0,r7 mtspr SPRN_MAS0,r7
tlbre tlbre
li r6,0 mfspr r6,SPRN_MAS1
rlwinm r6,r6,0,2,0 /* clear IPROT */
mtspr SPRN_MAS1,r6 mtspr SPRN_MAS1,r6
tlbwe tlbwe
/* Invalidate TLB1 */ /* Invalidate TLB1 */
...@@ -248,6 +249,8 @@ skpinv: addi r6,r6,1 /* Increment */ ...@@ -248,6 +249,8 @@ skpinv: addi r6,r6,1 /* Increment */
rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */ rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */
mtspr SPRN_MAS0,r7 mtspr SPRN_MAS0,r7
tlbre tlbre
mfspr r8,SPRN_MAS1
rlwinm r8,r8,0,2,0 /* clear IPROT */
mtspr SPRN_MAS1,r8 mtspr SPRN_MAS1,r8
tlbwe tlbwe
/* Invalidate TLB1 */ /* Invalidate TLB1 */
...@@ -889,7 +892,6 @@ load_up_spe: ...@@ -889,7 +892,6 @@ load_up_spe:
REST_GPR(9, r11) REST_GPR(9, r11)
REST_GPR(12, r11) REST_GPR(12, r11)
lwz r11,GPR11(r11) lwz r11,GPR11(r11)
SYNC
rfi rfi
/* /*
...@@ -953,7 +955,6 @@ _GLOBAL(giveup_altivec) ...@@ -953,7 +955,6 @@ _GLOBAL(giveup_altivec)
_GLOBAL(giveup_spe) _GLOBAL(giveup_spe)
mfmsr r5 mfmsr r5
oris r5,r5,MSR_SPE@h oris r5,r5,MSR_SPE@h
SYNC
mtmsr r5 /* enable use of SPE now */ mtmsr r5 /* enable use of SPE now */
isync isync
cmpi 0,r3,0 cmpi 0,r3,0
......
arch/powerpc/kernel/legacy_serial.c
浏览文件 @ ac98695d
...@@ -124,6 +124,10 @@ static int __init add_legacy_soc_port(struct device_node *np, ...@@ -124,6 +124,10 @@ static int __init add_legacy_soc_port(struct device_node *np,
if (get_property(np, "clock-frequency", NULL) == NULL) if (get_property(np, "clock-frequency", NULL) == NULL)
return -1; return -1;
/* if rtas uses this device, don't try to use it as well */
if (get_property(np, "used-by-rtas", NULL) != NULL)
return -1;
/* Get the address */ /* Get the address */
addrp = of_get_address(soc_dev, 0, NULL, NULL); addrp = of_get_address(soc_dev, 0, NULL, NULL);
if (addrp == NULL) if (addrp == NULL)
...@@ -334,6 +338,17 @@ void __init find_legacy_serial_ports(void) ...@@ -334,6 +338,17 @@ void __init find_legacy_serial_ports(void)
of_node_put(tsi); of_node_put(tsi);
} }
/* First fill our array with opb bus ports */
for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16750")) != NULL;) {
struct device_node *opb = of_get_parent(np);
if (opb && !strcmp(opb->type, "opb")) {
index = add_legacy_soc_port(np, np);
if (index >= 0 && np == stdout)
legacy_serial_console = index;
}
of_node_put(opb);
}
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* Next, try to locate PCI ports */ /* Next, try to locate PCI ports */
for (np = NULL; (np = of_find_all_nodes(np));) { for (np = NULL; (np = of_find_all_nodes(np));) {
......
arch/powerpc/kernel/prom_init.c
浏览文件 @ ac98695d
...@@ -2117,11 +2117,92 @@ static void __init fixup_device_tree_pmac(void) ...@@ -2117,11 +2117,92 @@ static void __init fixup_device_tree_pmac(void)
#define fixup_device_tree_pmac() #define fixup_device_tree_pmac()
#endif #endif
#ifdef CONFIG_PPC_EFIKA
/* The current fw of the Efika has a device tree needs quite a few
* fixups to be compliant with the mpc52xx bindings. It's currently
* unknown if it will ever be compliant (come on bPlan ...) so we do fixups.
* NOTE that we (barely) tolerate it because the EFIKA was out before
* the bindings were finished, for any new boards -> RTFM ! */
struct subst_entry {
char *path;
char *property;
void *value;
int value_len;
};
static void __init fixup_device_tree_efika(void)
{
/* Substitution table */
#define prop_cstr(x) x, sizeof(x)
int prop_sound_irq[3] = { 2, 2, 0 };
int prop_bcomm_irq[3*16] = { 3,0,0, 3,1,0, 3,2,0, 3,3,0,
3,4,0, 3,5,0, 3,6,0, 3,7,0,
3,8,0, 3,9,0, 3,10,0, 3,11,0,
3,12,0, 3,13,0, 3,14,0, 3,15,0 };
struct subst_entry efika_subst_table[] = {
{ "/", "device_type", prop_cstr("efika") },
{ "/builtin", "compatible", prop_cstr("soc") },
{ "/builtin/ata", "compatible", prop_cstr("mpc5200b-ata\0mpc5200-ata"), },
{ "/builtin/bestcomm", "compatible", prop_cstr("mpc5200b-bestcomm\0mpc5200-bestcomm") },
{ "/builtin/bestcomm", "interrupts", prop_bcomm_irq, sizeof(prop_bcomm_irq) },
{ "/builtin/ethernet", "compatible", prop_cstr("mpc5200b-fec\0mpc5200-fec") },
{ "/builtin/pic", "compatible", prop_cstr("mpc5200b-pic\0mpc5200-pic") },
{ "/builtin/serial", "compatible", prop_cstr("mpc5200b-psc-uart\0mpc5200-psc-uart") },
{ "/builtin/sound", "compatible", prop_cstr("mpc5200b-psc-ac97\0mpc5200-psc-ac97") },
{ "/builtin/sound", "interrupts", prop_sound_irq, sizeof(prop_sound_irq) },
{ "/builtin/sram", "compatible", prop_cstr("mpc5200b-sram\0mpc5200-sram") },
{ "/builtin/sram", "device_type", prop_cstr("sram") },
{}
};
#undef prop_cstr
/* Vars */
u32 node;
char prop[64];
int rv, i;
/* Check if we're really running on a EFIKA */
node = call_prom("finddevice", 1, 1, ADDR("/"));
if (!PHANDLE_VALID(node))
return;
rv = prom_getprop(node, "model", prop, sizeof(prop));
if (rv == PROM_ERROR)
return;
if (strcmp(prop, "EFIKA5K2"))
return;
prom_printf("Applying EFIKA device tree fixups\n");
/* Process substitution table */
for (i=0; efika_subst_table[i].path; i++) {
struct subst_entry *se = &efika_subst_table[i];
node = call_prom("finddevice", 1, 1, ADDR(se->path));
if (!PHANDLE_VALID(node)) {
prom_printf("fixup_device_tree_efika: ",
"skipped entry %x - not found\n", i);
continue;
}
rv = prom_setprop(node, se->path, se->property,
se->value, se->value_len );
if (rv == PROM_ERROR)
prom_printf("fixup_device_tree_efika: ",
"skipped entry %x - setprop error\n", i);
}
}
#else
#define fixup_device_tree_efika()
#endif
static void __init fixup_device_tree(void) static void __init fixup_device_tree(void)
{ {
fixup_device_tree_maple(); fixup_device_tree_maple();
fixup_device_tree_chrp(); fixup_device_tree_chrp();
fixup_device_tree_pmac(); fixup_device_tree_pmac();
fixup_device_tree_efika();
} }
static void __init prom_find_boot_cpu(void) static void __init prom_find_boot_cpu(void)
......
arch/powerpc/kernel/setup_32.c
浏览文件 @ ac98695d
...@@ -116,12 +116,8 @@ unsigned long __init early_init(unsigned long dt_ptr) ...@@ -116,12 +116,8 @@ unsigned long __init early_init(unsigned long dt_ptr)
*/ */
void __init machine_init(unsigned long dt_ptr, unsigned long phys) void __init machine_init(unsigned long dt_ptr, unsigned long phys)
{ {
/* If btext is enabled, we might have a BAT setup for early display, /* Enable early debugging if any specified (see udbg.h) */
* thus we do enable some very basic udbg output udbg_early_init();
*/
#ifdef CONFIG_BOOTX_TEXT
udbg_putc = btext_drawchar;
#endif
/* Do some early initialization based on the flat device tree */ /* Do some early initialization based on the flat device tree */
early_init_devtree(__va(dt_ptr)); early_init_devtree(__va(dt_ptr));
......
arch/powerpc/kernel/smp.c
浏览文件 @ ac98695d
...@@ -78,29 +78,6 @@ int smt_enabled_at_boot = 1; ...@@ -78,29 +78,6 @@ int smt_enabled_at_boot = 1;
static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL; static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
#ifdef CONFIG_MPIC
int __init smp_mpic_probe(void)
{
int nr_cpus;
DBG("smp_mpic_probe()...\n");
nr_cpus = cpus_weight(cpu_possible_map);
DBG("nr_cpus: %d\n", nr_cpus);
if (nr_cpus > 1)
mpic_request_ipis();
return nr_cpus;
}
void __devinit smp_mpic_setup_cpu(int cpu)
{
mpic_setup_this_cpu();
}
#endif /* CONFIG_MPIC */
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
void __devinit smp_generic_kick_cpu(int nr) void __devinit smp_generic_kick_cpu(int nr)
{ {
......
arch/powerpc/kernel/udbg.c
浏览文件 @ ac98695d
...@@ -49,6 +49,8 @@ void __init udbg_early_init(void) ...@@ -49,6 +49,8 @@ void __init udbg_early_init(void)
udbg_init_debug_beat(); udbg_init_debug_beat();
#elif defined(CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE) #elif defined(CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE)
udbg_init_pas_realmode(); udbg_init_pas_realmode();
#elif defined(CONFIG_BOOTX_TEXT)
udbg_init_btext();
#endif #endif
} }
......
arch/powerpc/kernel/vdso.c
浏览文件 @ ac98695d
...@@ -49,24 +49,23 @@ ...@@ -49,24 +49,23 @@
/* Max supported size for symbol names */ /* Max supported size for symbol names */
#define MAX_SYMNAME 64 #define MAX_SYMNAME 64
#define VDSO32_MAXPAGES (((0x3000 + PAGE_MASK) >> PAGE_SHIFT) + 2)
#define VDSO64_MAXPAGES (((0x3000 + PAGE_MASK) >> PAGE_SHIFT) + 2)
extern char vdso32_start, vdso32_end; extern char vdso32_start, vdso32_end;
static void *vdso32_kbase = &vdso32_start; static void *vdso32_kbase = &vdso32_start;
unsigned int vdso32_pages; static unsigned int vdso32_pages;
static struct page *vdso32_pagelist[VDSO32_MAXPAGES]; static struct page **vdso32_pagelist;
unsigned long vdso32_sigtramp; unsigned long vdso32_sigtramp;
unsigned long vdso32_rt_sigtramp; unsigned long vdso32_rt_sigtramp;
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
extern char vdso64_start, vdso64_end; extern char vdso64_start, vdso64_end;
static void *vdso64_kbase = &vdso64_start; static void *vdso64_kbase = &vdso64_start;
unsigned int vdso64_pages; static unsigned int vdso64_pages;
static struct page *vdso64_pagelist[VDSO64_MAXPAGES]; static struct page **vdso64_pagelist;
unsigned long vdso64_rt_sigtramp; unsigned long vdso64_rt_sigtramp;
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
static int vdso_ready;
/* /*
* The vdso data page (aka. systemcfg for old ppc64 fans) is here. * The vdso data page (aka. systemcfg for old ppc64 fans) is here.
* Once the early boot kernel code no longer needs to muck around * Once the early boot kernel code no longer needs to muck around
...@@ -182,6 +181,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, ...@@ -182,6 +181,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
unsigned long vdso_base; unsigned long vdso_base;
int rc; int rc;
if (!vdso_ready)
return 0;
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
if (test_thread_flag(TIF_32BIT)) { if (test_thread_flag(TIF_32BIT)) {
vdso_pagelist = vdso32_pagelist; vdso_pagelist = vdso32_pagelist;
...@@ -661,7 +663,7 @@ static void __init vdso_setup_syscall_map(void) ...@@ -661,7 +663,7 @@ static void __init vdso_setup_syscall_map(void)
} }
void __init vdso_init(void) static int __init vdso_init(void)
{ {
int i; int i;
...@@ -716,11 +718,13 @@ void __init vdso_init(void) ...@@ -716,11 +718,13 @@ void __init vdso_init(void)
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
vdso64_pages = 0; vdso64_pages = 0;
#endif #endif
return; return 0;
} }
/* Make sure pages are in the correct state */ /* Make sure pages are in the correct state */
BUG_ON(vdso32_pages + 2 > VDSO32_MAXPAGES); vdso32_pagelist = kzalloc(sizeof(struct page *) * (vdso32_pages + 2),
GFP_KERNEL);
BUG_ON(vdso32_pagelist == NULL);
for (i = 0; i < vdso32_pages; i++) { for (i = 0; i < vdso32_pages; i++) {
struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE); struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE);
ClearPageReserved(pg); ClearPageReserved(pg);
...@@ -731,7 +735,9 @@ void __init vdso_init(void) ...@@ -731,7 +735,9 @@ void __init vdso_init(void)
vdso32_pagelist[i] = NULL; vdso32_pagelist[i] = NULL;
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
BUG_ON(vdso64_pages + 2 > VDSO64_MAXPAGES); vdso64_pagelist = kzalloc(sizeof(struct page *) * (vdso64_pages + 2),
GFP_KERNEL);
BUG_ON(vdso64_pagelist == NULL);
for (i = 0; i < vdso64_pages; i++) { for (i = 0; i < vdso64_pages; i++) {
struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE); struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE);
ClearPageReserved(pg); ClearPageReserved(pg);
...@@ -743,7 +749,13 @@ void __init vdso_init(void) ...@@ -743,7 +749,13 @@ void __init vdso_init(void)
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
get_page(virt_to_page(vdso_data)); get_page(virt_to_page(vdso_data));
smp_wmb();
vdso_ready = 1;
return 0;
} }
arch_initcall(vdso_init);
int in_gate_area_no_task(unsigned long addr) int in_gate_area_no_task(unsigned long addr)
{ {
......
arch/powerpc/mm/mem.c
浏览文件 @ ac98695d
...@@ -384,9 +384,6 @@ void __init mem_init(void) ...@@ -384,9 +384,6 @@ void __init mem_init(void)
initsize >> 10); initsize >> 10);
mem_init_done = 1; mem_init_done = 1;
/* Initialize the vDSO */
vdso_init();
} }
/* /*
......
arch/powerpc/mm/pgtable_32.c
浏览文件 @ ac98695d
...@@ -295,7 +295,7 @@ void __init mapin_ram(void) ...@@ -295,7 +295,7 @@ void __init mapin_ram(void)
} }
/* is x a power of 4? */ /* is x a power of 4? */
#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)) #define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)
/* /*
* Set up a mapping for a block of I/O. * Set up a mapping for a block of I/O.
......
arch/powerpc/platforms/52xx/Makefile
浏览文件 @ ac98695d
...@@ -6,5 +6,5 @@ obj-y += mpc52xx_pic.o mpc52xx_common.o ...@@ -6,5 +6,5 @@ obj-y += mpc52xx_pic.o mpc52xx_common.o
obj-$(CONFIG_PCI) += mpc52xx_pci.o obj-$(CONFIG_PCI) += mpc52xx_pci.o
endif endif
obj-$(CONFIG_PPC_EFIKA) += efika-setup.o efika-pci.o obj-$(CONFIG_PPC_EFIKA) += efika.o
obj-$(CONFIG_PPC_LITE5200) += lite5200.o obj-$(CONFIG_PPC_LITE5200) += lite5200.o
arch/powerpc/platforms/52xx/efika-setup.c 已删除 100644 → 0
浏览文件 @ d9bc125c
此差异已折叠。
arch/powerpc/platforms/52xx/efika.h 已删除 100644 → 0
浏览文件 @ d9bc125c
/*
* Efika 5K2 platform setup - Header file
*
* Copyright (C) 2006 bplan GmbH
*
* This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any
* kind, whether express or implied.
*
*/
#ifndef __ARCH_POWERPC_EFIKA__
#define __ARCH_POWERPC_EFIKA__
#define EFIKA_PLATFORM_NAME "Efika"
extern void __init efika_pcisetup(void);
#endif
arch/powerpc/platforms/52xx/mpc52xx_common.c
浏览文件 @ ac98695d
...@@ -83,8 +83,8 @@ mpc52xx_setup_cpu(void) ...@@ -83,8 +83,8 @@ mpc52xx_setup_cpu(void)
struct mpc52xx_xlb __iomem *xlb; struct mpc52xx_xlb __iomem *xlb;
/* Map zones */ /* Map zones */
cdm = mpc52xx_find_and_map("mpc52xx-cdm"); cdm = mpc52xx_find_and_map("mpc5200-cdm");
xlb = mpc52xx_find_and_map("mpc52xx-xlb"); xlb = mpc52xx_find_and_map("mpc5200-xlb");
if (!cdm || !xlb) { if (!cdm || !xlb) {
printk(KERN_ERR __FILE__ ": " printk(KERN_ERR __FILE__ ": "
......
arch/powerpc/platforms/52xx/mpc52xx_pic.c
浏览文件 @ ac98695d
...@@ -383,16 +383,16 @@ void __init mpc52xx_init_irq(void) ...@@ -383,16 +383,16 @@ void __init mpc52xx_init_irq(void)
struct device_node *picnode; struct device_node *picnode;
/* Remap the necessary zones */ /* Remap the necessary zones */
picnode = of_find_compatible_node(NULL, NULL, "mpc52xx-pic"); picnode = of_find_compatible_node(NULL, NULL, "mpc5200-pic");
intr = mpc52xx_find_and_map("mpc52xx-pic"); intr = mpc52xx_find_and_map("mpc5200-pic");
if (!intr) if (!intr)
panic(__FILE__ ": find_and_map failed on 'mpc52xx-pic'. " panic(__FILE__ ": find_and_map failed on 'mpc5200-pic'. "
"Check node !"); "Check node !");
sdma = mpc52xx_find_and_map("mpc52xx-bestcomm"); sdma = mpc52xx_find_and_map("mpc5200-bestcomm");
if (!sdma) if (!sdma)
panic(__FILE__ ": find_and_map failed on 'mpc52xx-bestcomm'. " panic(__FILE__ ": find_and_map failed on 'mpc5200-bestcomm'. "
"Check node !"); "Check node !");
/* Disable all interrupt sources. */ /* Disable all interrupt sources. */
......
arch/powerpc/platforms/83xx/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/83xx/Makefile
浏览文件 @ ac98695d
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
# #
obj-y := misc.o obj-y := misc.o
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_MPC834x_SYS) += mpc834x_sys.o obj-$(CONFIG_MPC8313_RDB) += mpc8313_rdb.o
obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o
obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o
obj-$(CONFIG_MPC8360E_PB) += mpc8360e_pb.o obj-$(CONFIG_MPC8360E_PB) += mpc8360e_pb.o
obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o
arch/powerpc/platforms/83xx/mpc8313_rdb.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/83xx/mpc834x_itx.c
浏览文件 @ ac98695d
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
#include "mpc83xx.h" #include "mpc83xx.h"
#include <platforms/83xx/mpc834x_sys.h>
#ifndef CONFIG_PCI #ifndef CONFIG_PCI
unsigned long isa_io_base = 0; unsigned long isa_io_base = 0;
unsigned long isa_mem_base = 0; unsigned long isa_mem_base = 0;
......
arch/powerpc/platforms/83xx/mpc834x_sys.h 已删除 100644 → 0
浏览文件 @ d9bc125c
/*
* arch/powerpc/platforms/83xx/mpc834x_sys.h
*
* MPC834X SYS common board definitions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
*/
#ifndef __MACH_MPC83XX_SYS_H__
#define __MACH_MPC83XX_SYS_H__
#define PIRQA MPC83xx_IRQ_EXT4
#define PIRQB MPC83xx_IRQ_EXT5
#define PIRQC MPC83xx_IRQ_EXT6
#define PIRQD MPC83xx_IRQ_EXT7
#endif /* __MACH_MPC83XX_SYS_H__ */
arch/powerpc/platforms/85xx/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/85xx/mpc8568_mds.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/Makefile
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/cell/pmu.c
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/ps3/spu.c
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/pseries/firmware.h 已删除 100644 → 0
浏览文件 @ d9bc125c
此差异已折叠。
arch/powerpc/platforms/pseries/kexec.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/pseries/pseries.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/platforms/pseries/ras.h 已删除 100644 → 0
浏览文件 @ d9bc125c
此差异已折叠。
arch/powerpc/sysdev/fsl_soc.c
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/sysdev/mpic.c
浏览文件 @ ac98695d
此差异已折叠。
arch/powerpc/xmon/xmon.c
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/configs/taishan_defconfig 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/kernel/head_fsl_booke.S
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/kernel/ppc_ksyms.c
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/mm/pgtable.c
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/platforms/4xx/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/platforms/4xx/Makefile
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/platforms/4xx/taishan.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/platforms/4xx/taishan.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
arch/ppc/syslib/Makefile
浏览文件 @ ac98695d
此差异已折叠。
drivers/acpi/i2c_ec.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/ata/pata_mpc52xx.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/keyboard.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/sysrq.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/tty_io.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/vt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/acquirewdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/cpu5wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/eurotechwdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/i6300esb.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/i8xx_tco.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/iTCO_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/ib700wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/ibmasr.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/indydog.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/machzwd.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/mixcomwd.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/pc87413_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/pcwd.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/pcwd_pci.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/pcwd_usb.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/pnx4008_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/s3c2410_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/sbc60xxwdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/sbc8360.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/sbc_epx_c3.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/sc1200wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/sc520_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/shwdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/softdog.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/w83877f_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/w83977f_wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/wdt.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/wdt977.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/char/watchdog/wdt_pci.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/hwmon/vt8231.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/Makefile
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-ali1535.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-ali1563.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-ali15x3.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-amd756.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-amd8111.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-i801.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-i810.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-ibm_iic.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-isa.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-mv64xxx.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-nforce2.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-parport.h
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-pasemi.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-piix4.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-powermac.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-savage4.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-sis5595.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-sis630.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-sis96x.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-via.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-viapro.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/i2c-voodoo3.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/scx200_acb.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/busses/scx200_i2c.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/i2c/i2c-core.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/ieee1394/pcilynx.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/Makefile
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/core/addr.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/core/cma.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/core/device.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/Kconfig 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/Makefile 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/cxio_dbg.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/cxio_hal.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/cxio_hal.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/cxio_resource.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/cxio_resource.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/cxio_wr.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_cm.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_cm.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_cq.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_ev.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_mem.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_provider.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_provider.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_qp.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/iwch_user.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/hw/cxgb3/tcb.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/infiniband/ulp/ipoib/ipoib_cm.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/adbhid.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/apm_emu.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/mac_hid.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/therm_adt746x.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/via-cuda.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/via-macii.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/via-maciisi.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/via-pmu.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/macintosh/via-pmu68k.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/media/video/cafe_ccic.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/media/video/w9968cf.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/media/video/zoran_card.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/net/tg3.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/net/tg3.h
浏览文件 @ ac98695d
此差异已折叠。
drivers/rtc/rtc-ds1672.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/rtc/rtc-pcf8563.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/rtc/rtc-rs5c372.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/rtc/rtc-x1205.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/serial/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
drivers/serial/Makefile
浏览文件 @ ac98695d
此差异已折叠。
drivers/serial/mpc52xx_uart.c
浏览文件 @ ac98695d
此差异已折叠。
drivers/serial/of_serial.c 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
drivers/video/matrox/i2c-matroxfb.c
浏览文件 @ ac98695d
此差异已折叠。
fs/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/CHANGES
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/TODO
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/cifsfs.h
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/cifspdu.h
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/cifsproto.h
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/cifssmb.c
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/connect.c
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/file.c
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/inode.c
浏览文件 @ ac98695d
此差异已折叠。
fs/cifs/readdir.c
浏览文件 @ ac98695d
此差异已折叠。
fs/dcache.c
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/atomic.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/bitops.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/compat-signal.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/dma-mapping.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/mach-generic/dma-coherence.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/mach-ip27/dma-coherence.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/mach-ip32/dma-coherence.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/mach-jazz/dma-coherence.h 0 → 100644
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/spinlock.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/system.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-mips/uaccess.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/cell-pmu.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/floppy.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/spu.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/systbl.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/ucc_slow.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/udbg.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-powerpc/vdso.h
浏览文件 @ ac98695d
此差异已折叠。
include/asm-ppc/ibm4xx.h
浏览文件 @ ac98695d
此差异已折叠。
include/linux/i2c-id.h
浏览文件 @ ac98695d
此差异已折叠。
include/linux/i2c.h
浏览文件 @ ac98695d
此差异已折叠。
include/linux/pci_ids.h
浏览文件 @ ac98695d
此差异已折叠。
include/net/xfrm.h
浏览文件 @ ac98695d
此差异已折叠。
net/bridge/br_if.c
浏览文件 @ ac98695d
此差异已折叠。
net/bridge/br_notify.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/ipip.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/netfilter/ipt_REJECT.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/tcp_output.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/tunnel4.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/xfrm4_input.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/xfrm4_mode_tunnel.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv4/xfrm4_tunnel.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/Kconfig
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/inet6_hashtables.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/ip6_tunnel.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/sit.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/tunnel6.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/xfrm6_input.c
浏览文件 @ ac98695d
此差异已折叠。
net/ipv6/xfrm6_tunnel.c
浏览文件 @ ac98695d
此差异已折叠。
net/sched/sch_hfsc.c
浏览文件 @ ac98695d
此差异已折叠。
net/xfrm/xfrm_policy.c
浏览文件 @ ac98695d
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或