Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144072
b: refs/heads/master
c: 592578a
h: refs/heads/master
v: v3
  • Loading branch information
Richard Retanubun authored and Greg Ungerer committed Apr 22, 2009
1 parent 93bab33 commit 365ffc1
Show file tree
Hide file tree
Showing 299 changed files with 7,748 additions and 4,741 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a4277bf122e907e4fec509fc0bd9bf5fde30b14e
refs/heads/master: 592578a1dd1be0c940e36f769acdd3cc6651a7a1
89 changes: 77 additions & 12 deletions trunk/Documentation/powerpc/booting-without-of.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ Table of Contents
2) Representing devices without a current OF specification
a) PHY nodes
b) Interrupt controllers
c) 4xx/Axon EMAC ethernet nodes
d) Xilinx IP cores
e) USB EHCI controllers
f) MDIO on GPIOs
g) SPI busses
c) CFI or JEDEC memory-mapped NOR flash
d) 4xx/Axon EMAC ethernet nodes
e) Xilinx IP cores
f) USB EHCI controllers
g) MDIO on GPIOs
h) SPI busses

VII - Marvell Discovery mv64[345]6x System Controller chips
1) The /system-controller node
Expand Down Expand Up @@ -998,7 +999,7 @@ compatibility.
translation of SOC addresses for memory mapped SOC registers.
- bus-frequency: Contains the bus frequency for the SOC node.
Typically, the value of this field is filled in by the boot
loader.
loader.


Recommended properties:
Expand Down Expand Up @@ -1286,7 +1287,71 @@ platforms are moved over to use the flattened-device-tree model.
device_type = "open-pic";
};

c) 4xx/Axon EMAC ethernet nodes
c) CFI or JEDEC memory-mapped NOR flash

Flash chips (Memory Technology Devices) are often used for solid state
file systems on embedded devices.

- compatible : should contain the specific model of flash chip(s)
used, if known, followed by either "cfi-flash" or "jedec-flash"
- reg : Address range of the flash chip
- bank-width : Width (in bytes) of the flash bank. Equal to the
device width times the number of interleaved chips.
- device-width : (optional) Width of a single flash chip. If
omitted, assumed to be equal to 'bank-width'.
- #address-cells, #size-cells : Must be present if the flash has
sub-nodes representing partitions (see below). In this case
both #address-cells and #size-cells must be equal to 1.

For JEDEC compatible devices, the following additional properties
are defined:

- vendor-id : Contains the flash chip's vendor id (1 byte).
- device-id : Contains the flash chip's device id (1 byte).

In addition to the information on the flash bank itself, the
device tree may optionally contain additional information
describing partitions of the flash address space. This can be
used on platforms which have strong conventions about which
portions of the flash are used for what purposes, but which don't
use an on-flash partition table such as RedBoot.

Each partition is represented as a sub-node of the flash device.
Each node's name represents the name of the corresponding
partition of the flash device.

Flash partitions
- reg : The partition's offset and size within the flash bank.
- label : (optional) The label / name for this flash partition.
If omitted, the label is taken from the node name (excluding
the unit address).
- read-only : (optional) This parameter, if present, is a hint to
Linux that this flash partition should only be mounted
read-only. This is usually used for flash partitions
containing early-boot firmware images or data which should not
be clobbered.

Example:

flash@ff000000 {
compatible = "amd,am29lv128ml", "cfi-flash";
reg = <ff000000 01000000>;
bank-width = <4>;
device-width = <1>;
#address-cells = <1>;
#size-cells = <1>;
fs@0 {
label = "fs";
reg = <0 f80000>;
};
firmware@f80000 {
label ="firmware";
reg = <f80000 80000>;
read-only;
};
};

d) 4xx/Axon EMAC ethernet nodes

The EMAC ethernet controller in IBM and AMCC 4xx chips, and also
the Axon bridge. To operate this needs to interact with a ths
Expand Down Expand Up @@ -1434,7 +1499,7 @@ platforms are moved over to use the flattened-device-tree model.
available.
For Axon: 0x0000012a

d) Xilinx IP cores
e) Xilinx IP cores

The Xilinx EDK toolchain ships with a set of IP cores (devices) for use
in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range
Expand Down Expand Up @@ -1696,7 +1761,7 @@ platforms are moved over to use the flattened-device-tree model.
listed above, nodes for these devices should include a phy-handle
property, and may include other common network device properties
like local-mac-address.

iv) Xilinx Uartlite

Xilinx uartlite devices are simple fixed speed serial ports.
Expand Down Expand Up @@ -1728,7 +1793,7 @@ platforms are moved over to use the flattened-device-tree model.
- reg-offset : A value of 3 is required
- reg-shift : A value of 2 is required

e) USB EHCI controllers
f) USB EHCI controllers

Required properties:
- compatible : should be "usb-ehci".
Expand All @@ -1754,7 +1819,7 @@ platforms are moved over to use the flattened-device-tree model.
big-endian;
};

f) MDIO on GPIOs
g) MDIO on GPIOs

Currently defined compatibles:
- virtual,gpio-mdio
Expand All @@ -1774,7 +1839,7 @@ platforms are moved over to use the flattened-device-tree model.
&qe_pio_c 6>;
};

g) SPI (Serial Peripheral Interface) busses
h) SPI (Serial Peripheral Interface) busses

SPI busses can be described with a node for the SPI master device
and a set of child nodes for each SPI slave on the bus. For this
Expand Down
80 changes: 0 additions & 80 deletions trunk/Documentation/powerpc/dts-bindings/mtd-physmap.txt

This file was deleted.

18 changes: 6 additions & 12 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1337,9 +1337,12 @@ L: cbe-oss-dev@ozlabs.org
W: http://www.ibm.com/developerworks/power/cell/
S: Supported
F: arch/powerpc/include/asm/cell*.h
F: arch/powerpc/include/asm/lv1call.h
F: arch/powerpc/include/asm/ps3*.h
F: arch/powerpc/include/asm/spu*.h
F: arch/powerpc/oprofile/*cell*
F: arch/powerpc/platforms/cell/
F: arch/powerpc/platforms/ps3/

CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
P: David Vrabel
Expand Down Expand Up @@ -2758,7 +2761,7 @@ IDE SUBSYSTEM
P: Bartlomiej Zolnierkiewicz
M: bzolnier@gmail.com
L: linux-ide@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
S: Maintained
F: Documentation/ide/
F: drivers/ide/
Expand Down Expand Up @@ -3991,8 +3994,8 @@ NETWORKING [GENERAL]
P: David S. Miller
M: davem@davemloft.net
L: netdev@vger.kernel.org
W: http://www.linuxfoundation.org/en/Net
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
W: http://linux-net.osdl.org/
T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
S: Maintained
F: net/
F: include/net/
Expand Down Expand Up @@ -4033,13 +4036,6 @@ F: net/wireless/
F: include/net/ieee80211*
F: include/net/wireless.h

NETWORKING DRIVERS
L: netdev@vger.kernel.org
W: http://www.linuxfoundation.org/en/Net
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
S: Odd Fixes
F: drivers/net/

NETXEN (1/10) GbE SUPPORT
P: Dhananjay Phadke
M: dhananjay@netxen.com
Expand Down Expand Up @@ -4511,9 +4507,7 @@ F: arch/powerpc/include/asm/ps3*.h
F: arch/powerpc/platforms/ps3/
F: drivers/*/ps3*
F: drivers/ps3/
F: drivers/rtc/rtc-ps3.c
F: drivers/usb/host/*ps3.c
F: sound/ppc/snd_ps3*

PS3VRAM DRIVER
P: Jim Paris
Expand Down
2 changes: 1 addition & 1 deletion trunk/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
EXTRAVERSION = -rc3
EXTRAVERSION = -rc2
NAME = Temporary Tasmanian Devil

# *DOCUMENTATION*
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/alpha/include/asm/percpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS];

#endif /* SMP */

#include <asm-generic/percpu.h>
#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name)

#endif /* __ALPHA_PERCPU_H */
2 changes: 0 additions & 2 deletions trunk/arch/arm/include/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,6 @@
#define __NR_dup3 (__NR_SYSCALL_BASE+358)
#define __NR_pipe2 (__NR_SYSCALL_BASE+359)
#define __NR_inotify_init1 (__NR_SYSCALL_BASE+360)
#define __NR_preadv (__NR_SYSCALL_BASE+361)
#define __NR_pwritev (__NR_SYSCALL_BASE+362)

/*
* The following SWIs are ARM private.
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/arm/kernel/calls.S
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,6 @@
CALL(sys_dup3)
CALL(sys_pipe2)
/* 360 */ CALL(sys_inotify_init1)
CALL(sys_preadv)
CALL(sys_pwritev)
#ifndef syscalls_counted
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
#define syscalls_counted
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-imx/include/mach/gpio.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef _IMX_GPIO_H

#include <linux/kernel.h>
#include <mach/hardware.h>
#include <mach/imx-regs.h>

#define IMX_GPIO_ALLOC_MODE_NORMAL 0
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-kirkwood/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
#include <plat/cache-feroceon-l2.h>
#include <plat/ehci-orion.h>
#include <plat/mvsdio.h>
Expand Down
42 changes: 0 additions & 42 deletions trunk/arch/arm/mach-kirkwood/include/mach/bridge-regs.h

This file was deleted.

2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-kirkwood/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* published by the Free Software Foundation.
*/

#include <mach/bridge-regs.h>
#include <mach/kirkwood.h>

.macro addruart,rx
mrc p15, 0, \rx, c1, c0
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-kirkwood/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* warranty of any kind, whether express or implied.
*/

#include <mach/bridge-regs.h>
#include <mach/kirkwood.h>

.macro disable_fiq
.endm
Expand Down
Loading

0 comments on commit 365ffc1

Please sign in to comment.