Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 88129
b: refs/heads/master
c: a02fe13
h: refs/heads/master
i:
  88127: ab9c127
v: v3
  • Loading branch information
Josef Bacik authored and James Morris committed Apr 3, 2008
1 parent 30a5588 commit 5116689
Show file tree
Hide file tree
Showing 37 changed files with 153 additions and 259 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ba51fd75cc3789be83f0d6f878dabbb0cb19bca
refs/heads/master: a02fe13297af26c13d004b1d44f391c077094ea0
37 changes: 1 addition & 36 deletions trunk/arch/powerpc/boot/dts/cm5200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,30 +212,13 @@
ethernet@3000 {
device_type = "network";
compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
reg = <3000 400>;
reg = <3000 800>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>;
phy-handle = <&phy0>;
};

mdio@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
reg = <3000 400>; // fec range, since we need to setup fec interrupts
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
interrupt-parent = <&mpc5200_pic>;

phy0: ethernet-phy@0 {
device_type = "ethernet-phy";
reg = <0>;
};
};

i2c@3d40 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
reg = <3d40 40>;
interrupts = <2 10 0>;
Expand All @@ -248,22 +231,4 @@
reg = <8000 4000>;
};
};

lpb {
model = "fsl,lpb";
compatible = "fsl,lpb";
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 fc000000 2000000>;

// 16-bit flash device at LocalPlus Bus CS0
flash@0,0 {
compatible = "cfi-flash";
reg = <0 0 2000000>;
bank-width = <2>;
device-width = <2>;
#size-cells = <1>;
#address-cells = <1>;
};
};
};
15 changes: 0 additions & 15 deletions trunk/arch/powerpc/boot/dts/lite5200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,21 +258,6 @@
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>;
phy-handle = <&phy0>;
};

mdio@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200-mdio";
reg = <3000 400>; // fec range, since we need to setup fec interrupts
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
interrupt-parent = <&mpc5200_pic>;

phy0:ethernet-phy@1 {
device_type = "ethernet-phy";
reg = <1>;
};
};

ata@3a00 {
Expand Down
63 changes: 28 additions & 35 deletions trunk/arch/powerpc/boot/dts/motionpro.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
interrupt-parent = <&mpc5200_pic>;
};


spi@f00 {
compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
reg = <f00 20>;
Expand Down Expand Up @@ -208,25 +209,10 @@
ethernet@3000 {
device_type = "network";
compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
reg = <3000 400>;
reg = <3000 800>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>;
phy-handle = <&phy0>;
};

mdio@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
reg = <3000 400>; // fec range, since we need to setup fec interrupts
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
interrupt-parent = <&mpc5200_pic>;

phy0: ethernet-phy@2 {
device_type = "ethernet-phy";
reg = <2>;
};
};

ata@3a00 {
Expand All @@ -237,19 +223,11 @@
};

i2c@3d40 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
reg = <3d40 40>;
interrupts = <2 10 0>;
interrupt-parent = <&mpc5200_pic>;
fsl5200-clocking;

rtc@68 {
device_type = "rtc";
compatible = "dallas,ds1339";
reg = <68>;
};
};

sram@8000 {
Expand All @@ -262,8 +240,7 @@
compatible = "fsl,lpb";
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 ff000000 01000000
1 0 50000000 00010000
ranges = <1 0 50000000 00010000
2 0 50010000 00010000
3 0 50020000 00010000>;

Expand Down Expand Up @@ -294,15 +271,31 @@
compatible = "promess,pro_module_dio";
reg = <3 800 2>;
};
};

// 16-bit flash device at LocalPlus Bus CS0
flash@0,0 {
compatible = "cfi-flash";
reg = <0 0 01000000>;
bank-width = <2>;
device-width = <2>;
#size-cells = <1>;
#address-cells = <1>;
};
pci@f0000d00 {
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";
reg = <f0000d00 100>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
c000 0 0 2 &mpc5200_pic 1 1 3
c000 0 0 3 &mpc5200_pic 1 2 3
c000 0 0 4 &mpc5200_pic 1 3 3

c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
c800 0 0 2 &mpc5200_pic 1 2 3
c800 0 0 3 &mpc5200_pic 1 3 3
c800 0 0 4 &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 a 0>;
interrupt-parent = <&mpc5200_pic>;
bus-range = <0 0>;
ranges = <42000000 0 80000000 80000000 0 20000000
02000000 0 a0000000 a0000000 0 10000000
01000000 0 00000000 b0000000 0 01000000>;
};
};
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/mpc8377_mds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,14 @@
};

sata@18000 {
compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
compatible = "fsl,mpc8379-sata";
reg = <0x18000 0x1000>;
interrupts = <44 0x8>;
interrupt-parent = <&ipic>;
};

sata@19000 {
compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
compatible = "fsl,mpc8379-sata";
reg = <0x19000 0x1000>;
interrupts = <45 0x8>;
interrupt-parent = <&ipic>;
Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8377_rdb.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,15 @@
mode = "cpu";
};

/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
usb@23000 {
compatible = "fsl-usb2-dr";
reg = <0x23000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&ipic>;
interrupts = <38 0x8>;
phy_type = "ulpi";
phy_type = "utmi";
};

mdio@24520 {
Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8378_rdb.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,15 @@
mode = "cpu";
};

/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
usb@23000 {
compatible = "fsl-usb2-dr";
reg = <0x23000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&ipic>;
interrupts = <38 0x8>;
phy_type = "ulpi";
phy_type = "utmi";
};

mdio@24520 {
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/powerpc/boot/dts/mpc8379_mds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,28 +255,28 @@
};

sata@18000 {
compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
compatible = "fsl,mpc8379-sata";
reg = <0x18000 0x1000>;
interrupts = <44 0x8>;
interrupt-parent = <&ipic>;
};

sata@19000 {
compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
compatible = "fsl,mpc8379-sata";
reg = <0x19000 0x1000>;
interrupts = <45 0x8>;
interrupt-parent = <&ipic>;
};

sata@1a000 {
compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
compatible = "fsl,mpc8379-sata";
reg = <0x1a000 0x1000>;
interrupts = <46 0x8>;
interrupt-parent = <&ipic>;
};

sata@1b000 {
compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
compatible = "fsl,mpc8379-sata";
reg = <0x1b000 0x1000>;
interrupts = <47 0x8>;
interrupt-parent = <&ipic>;
Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/powerpc/boot/dts/mpc8379_rdb.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,15 @@
mode = "cpu";
};

/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
usb@23000 {
compatible = "fsl-usb2-dr";
reg = <0x23000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&ipic>;
interrupts = <38 0x8>;
phy_type = "ulpi";
phy_type = "utmi";
};

mdio@24520 {
Expand Down
42 changes: 1 addition & 41 deletions trunk/arch/powerpc/boot/dts/tqm5200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,10 @@
ethernet@3000 {
device_type = "network";
compatible = "fsl,mpc5200-fec";
reg = <3000 400>;
reg = <3000 800>;
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>;
phy-handle = <&phy0>;
};

mdio@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
reg = <3000 400>; // fec range, since we need to setup fec interrupts
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
interrupt-parent = <&mpc5200_pic>;

phy0: ethernet-phy@0 {
device_type = "ethernet-phy";
reg = <0>;
};
};

ata@3a00 {
Expand All @@ -156,19 +141,11 @@
};

i2c@3d40 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,mpc5200-i2c","fsl-i2c";
reg = <3d40 40>;
interrupts = <2 10 0>;
interrupt-parent = <&mpc5200_pic>;
fsl5200-clocking;

rtc@68 {
device_type = "rtc";
compatible = "dallas,ds1307";
reg = <68>;
};
};

sram@8000 {
Expand All @@ -177,23 +154,6 @@
};
};

lpb {
model = "fsl,lpb";
compatible = "fsl,lpb";
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 fc000000 02000000>;

flash@0,0 {
compatible = "cfi-flash";
reg = <0 0 02000000>;
bank-width = <4>;
device-width = <2>;
#size-cells = <1>;
#address-cells = <1>;
};
};

pci@f0000d00 {
#interrupt-cells = <1>;
#size-cells = <2>;
Expand Down
11 changes: 8 additions & 3 deletions trunk/arch/powerpc/configs/mpc832x_mds_defconfig
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25-rc7
# Mon Mar 31 11:36:51 2008
# Linux kernel version: 2.6.25-rc6
# Mon Mar 24 08:48:16 2008
#
# CONFIG_PPC64 is not set

Expand Down Expand Up @@ -628,7 +628,8 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_IPMI_HANDLER is not set
CONFIG_HW_RANDOM=y
# CONFIG_NVRAM is not set
# CONFIG_GEN_RTC is not set
CONFIG_GEN_RTC=y
# CONFIG_GEN_RTC_X is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_RAW_DRIVER is not set
Expand Down Expand Up @@ -823,6 +824,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y

#
# Conflicting RTC option has been selected, check GEN_RTC and RTC
#
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
Expand Down
Loading

0 comments on commit 5116689

Please sign in to comment.