Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45424
b: refs/heads/master
c: 656829e
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Jan 9, 2007
1 parent e1e330f commit 85ceace
Show file tree
Hide file tree
Showing 65 changed files with 718 additions and 393 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: a037b0a43f6abafc4f725f7c7f46d577d1c44c96
refs/heads/master: 656829e2d052b1da4a72aa2ac39ad733a78530ce
4 changes: 2 additions & 2 deletions trunk/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ rtc@<addr> rtc *-rtc Real time clock
mscan@<addr> mscan *-mscan CAN bus controller
pci@<addr> pci *-pci PCI bridge
serial@<addr> serial *-psc-uart PSC in serial mode
i2s@<addr> i2s *-psc-i2s PSC in i2s mode
ac97@<addr> ac97 *-psc-ac97 PSC in ac97 mode
i2s@<addr> sound *-psc-i2s PSC in i2s mode
ac97@<addr> sound *-psc-ac97 PSC in ac97 mode
spi@<addr> spi *-psc-spi PSC in spi mode
irda@<addr> irda *-psc-irda PSC in IrDA mode
spi@<addr> spi *-spi MPC52xx spi device
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ config PPC_EFIKA
select RTAS_PROC
select PPC_MPC52xx
select PPC_NATIVE
default y
default n

config PPC_LITE5200
bool "Freescale Lite5200 Eval Board"
Expand Down Expand Up @@ -471,7 +471,7 @@ config PPC_PREP
select PPC_INDIRECT_PCI
select PPC_UDBG_16550
select PPC_NATIVE
default y
default n

config PPC_MAPLE
depends on PPC_MULTIPLATFORM && PPC64
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/lite5200.dts
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@

// PSC3 in CODEC mode example
i2s@2400 { // PSC3
device_type = "i2s";
device_type = "sound";
compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s";
reg = <2400 100>;
interrupts = <2 3 0>;
Expand All @@ -265,7 +265,7 @@

// PSC6 in AC97 mode example
ac97@2c00 { // PSC6
device_type = "ac97";
device_type = "sound";
compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97";
reg = <2c00 100>;
interrupts = <2 4 0>;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/lite5200b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

// PSC3 in CODEC mode example
i2s@2400 { // PSC3
device_type = "i2s";
device_type = "sound";
compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s";
reg = <2400 100>;
interrupts = <2 3 0>;
Expand All @@ -270,7 +270,7 @@

// PSC6 in AC97 mode example
ac97@2c00 { // PSC6
device_type = "ac97";
device_type = "sound";
compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97";
reg = <2c00 100>;
interrupts = <2 4 0>;
Expand Down
Loading

0 comments on commit 85ceace

Please sign in to comment.