Remove unused ide0_enable and sata0_enable entries from SB7xx

and SB600.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5781 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb
index f6ed95929352b5aaffaee83d2ac0dc57b59f97bf..d13c5dadc15d417ce09216d6d384cc5f4853bfeb 100644 (file)
--- a/src/mainboard/amd/dbm690t/devicetree.cb
+++ b/src/mainboard/amd/dbm690t/devicetree.cb
@@ -106,8 +106,6 @@ chip northbridge/amd/amdk8/root_complex
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # ACI 0x4382
                                        device pci 14.6 on end # MCI 0x438e
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb600
                        end #  device pci 18.0

diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb
index d09fdd02385c4d3edb867fe10fc541425ed04801..796598961798aa5674f4444fcb85e070ab79adb3 100644 (file)
--- a/src/mainboard/amd/mahogany/devicetree.cb
+++ b/src/mainboard/amd/mahogany/devicetree.cb
@@ -106,10 +106,7 @@ chip northbridge/amd/amdk8/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb
index d73e07933c34a121a133a3c686eeae1400c0ad98..d1f26d114a82a2f41ae6b8c2e08e1503e6968388 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/devicetree.cb
+++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb
@@ -97,10 +97,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb
index 435e03b2c252cd7937399f42b3839574354a06a1..76f0fe7fc76bf9668582cc03f117d9db6e12d53b 100644 (file)
--- a/src/mainboard/amd/pistachio/devicetree.cb
+++ b/src/mainboard/amd/pistachio/devicetree.cb
@@ -68,9 +68,6 @@ chip northbridge/amd/amdk8/root_complex
                                device pci 14.4 on end # PCI 0x4384
                                device pci 14.5 on end # ACI 0x4382
                                device pci 14.6 on end # MCI 0x438e
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb600
                        end #  device pci 18.0
 

diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb
index c725aaae2605b4b939372f8c36b0b6974a85a1e1..0a263610f15962a551df9a6eb9a440ae77a20d51 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/devicetree.cb
+++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb
@@ -98,10 +98,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb
index a17f83d2d05a5c3613fa2ae64bab779de67b225c..945c3965446de75d9356afa979737b745132993b 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/devicetree.cb
+++ b/src/mainboard/asrock/939a785gmh/devicetree.cb
@@ -116,10 +116,7 @@ chip northbridge/amd/amdk8/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
index 9f7e8dbcda21bdf9623785ce9f800931ca93db6d..dc7bd10a80df320562f8a8ff44d026adef42a1ed 100644 (file)
--- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb
+++ b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
@@ -98,10 +98,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb
index 962d4e0c2be71e24e57f6958c8527e47e7c4b9ed..59e1502dd7c0ef1b27db6237f1b234e6032ab0a3 100644 (file)
--- a/src/mainboard/gigabyte/ma78gm/devicetree.cb
+++ b/src/mainboard/gigabyte/ma78gm/devicetree.cb
@@ -97,10 +97,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/jetway/pa78vm5/devicetree.cb b/src/mainboard/jetway/pa78vm5/devicetree.cb
index cc43ceb2c16d74d675effae9ab47274cebbded32..42d3262cadc73b5b74fcf50b52282377c9dadad4 100644 (file)
--- a/src/mainboard/jetway/pa78vm5/devicetree.cb
+++ b/src/mainboard/jetway/pa78vm5/devicetree.cb
@@ -97,10 +97,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        end             #LPC
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # USB 2
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
-                                       register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb700
                        end #  device pci 18.0
 

diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb
index 5dd617b26d7d1b9ed0606ef1fe3b13171b07f806..aac5d5e3a0fe0156e0570c1c36afb6dcdf21c720 100644 (file)
--- a/src/mainboard/kontron/kt690/devicetree.cb
+++ b/src/mainboard/kontron/kt690/devicetree.cb
@@ -110,8 +110,6 @@ chip northbridge/amd/amdk8/root_complex
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # ACI 0x4382
                                        device pci 14.6 on end # MCI 0x438e
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "hda_viddid" = "0x10ec0888"
                                end     #southbridge/amd/sb600
                        end #  device pci 18.0

diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb
index 4c9b07df320c2b506c00e6b6bce06c81aecd9a99..90e443b50c320fbeb09055d90f29fca8279e7833 100644 (file)
--- a/src/mainboard/technexion/tim5690/devicetree.cb
+++ b/src/mainboard/technexion/tim5690/devicetree.cb
@@ -106,8 +106,6 @@ chip northbridge/amd/amdk8/root_complex
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # ACI 0x4382
                                        device pci 14.6 on end # MCI 0x438e
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb600
                        end #  device pci 18.0

diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb
index f6ed95929352b5aaffaee83d2ac0dc57b59f97bf..d13c5dadc15d417ce09216d6d384cc5f4853bfeb 100644 (file)
--- a/src/mainboard/technexion/tim8690/devicetree.cb
+++ b/src/mainboard/technexion/tim8690/devicetree.cb
@@ -106,8 +106,6 @@ chip northbridge/amd/amdk8/root_complex
                                        device pci 14.4 on end # PCI 0x4384
                                        device pci 14.5 on end # ACI 0x4382
                                        device pci 14.6 on end # MCI 0x438e
-                                       register "ide0_enable" = "1"
-                                       register "sata0_enable" = "1"
                                        register "hda_viddid" = "0x10ec0882"
                                end     #southbridge/amd/sb600
                        end #  device pci 18.0

diff --git a/src/southbridge/amd/sb600/chip.h b/src/southbridge/amd/sb600/chip.h
index 4dc4c16274943b911869482cb2f606b06d81fe5f..ce40f18bf39a82bd6a09fa3060dd8b3a7f0baa3c 100644 (file)
--- a/src/southbridge/amd/sb600/chip.h
+++ b/src/southbridge/amd/sb600/chip.h
@@ -22,8 +22,6 @@
 
 struct southbridge_amd_sb600_config
 {
-       u32 ide0_enable : 1;
-       u32 sata0_enable : 1;
        u32 hda_viddid;
 };
 struct chip_operations;

diff --git a/src/southbridge/amd/sb600/sb600_ide.c b/src/southbridge/amd/sb600/sb600_ide.c
index 4bd38d5422ee0b20ceb18efe3b623dc253b00cac..363cd3f28c818008ff73ca780992e8b0ebd1dd05 100644 (file)
--- a/src/southbridge/amd/sb600/sb600_ide.c
+++ b/src/southbridge/amd/sb600/sb600_ide.c
@@ -26,11 +26,9 @@
 
 static void ide_init(struct device *dev)
 {
-       struct southbridge_amd_sb600_config *conf;
        /* Enable ide devices so the linux ide driver will work */
        u32 dword;
        u8 byte;
-       conf = dev->chip_info;
 
        /* RPR10.1 disable MSI */
        dword = pci_read_config32(dev, 0x70);

diff --git a/src/southbridge/amd/sb700/chip.h b/src/southbridge/amd/sb700/chip.h
index d4eac3619a95e0f7155601ef5fc6e9bf8b3b7729..acdb2b712c9efa2c9d729208e7d7735742b16899 100644 (file)
--- a/src/southbridge/amd/sb700/chip.h
+++ b/src/southbridge/amd/sb700/chip.h
@@ -22,10 +22,7 @@
 
 struct southbridge_amd_sb700_config
 {
-       u32 ide0_enable : 1;
-       u32 sata0_enable : 1;
        u32 boot_switch_sata_ide : 1;
-       u32 hda_viddid;
 };
 struct chip_operations;
 extern struct chip_operations southbridge_amd_sb700_ops;