summaryrefslogtreecommitdiff
path: root/src/mainboard/hp
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-08 09:32:44 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-16 13:20:24 +0000
commit760970fb38157fc9023a3d71efaa8585bbdc9d7b (patch)
tree4e2bf9d08a9f8af542a3d53742549f9c9bd8d6c0 /src/mainboard/hp
parent872b42486a80cdd85bd95fdca344dfea80ddc340 (diff)
AGESA fam16kb boards: Clean up devicetree
Remove double nesting of chip northbridge/amd. There is requirement to keep SPD address map in the same chip block with device 0:18.2. Change-Id: Id3a161c54341d0c5c569ea6118ee6f890b7f62e6 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30735 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/hp')
-rw-r--r--src/mainboard/hp/abm/devicetree.cb104
1 files changed, 52 insertions, 52 deletions
diff --git a/src/mainboard/hp/abm/devicetree.cb b/src/mainboard/hp/abm/devicetree.cb
index c9ca1d8480..c7a7510157 100644
--- a/src/mainboard/hp/abm/devicetree.cb
+++ b/src/mainboard/hp/abm/devicetree.cb
@@ -22,60 +22,59 @@ chip northbridge/amd/agesa/family16kb/root_complex
device domain 0 on
subsystemid 0x1022 0x1410 inherit
- chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
+ chip northbridge/amd/agesa/family16kb
+ device pci 0.0 on end # Root Complex
+ device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
+ device pci 1.1 on end # Internal Multimedia
+ device pci 2.0 on end # PCIe Host Bridge
+ device pci 2.1 off end # unused
+ device pci 2.2 on end # GPP0: NIC
+ device pci 2.3 on end # GPP1: NIC
+ device pci 2.4 off end # GPP2: unused
+ device pci 2.5 off end # GPP3: unused
+ end #chip northbridge/amd/agesa/family16kb
- chip northbridge/amd/agesa/family16kb # PCI side of HT root complex
- device pci 0.0 on end # Root Complex
- device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
- device pci 1.1 on end # Internal Multimedia
- device pci 2.0 on end # PCIe Host Bridge
- device pci 2.1 off end # unused
- device pci 2.2 on end # GPP0: NIC
- device pci 2.3 on end # GPP1: NIC
- device pci 2.4 off end # GPP2: unused
- device pci 2.5 off end # GPP3: unused
- end #chip northbridge/amd/agesa/family16kb
-
- chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
- device pci 11.0 on end # SATA
- device pci 12.0 on end # USB
- device pci 12.2 on end # USB
- device pci 13.0 on end # USB
- device pci 13.2 on end # USB
- device pci 14.0 on # SM
- chip drivers/generic/generic #dimm 0-0-0
- device i2c 50 on end
+ chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
+ device pci 11.0 on end # SATA
+ device pci 12.0 on end # USB
+ device pci 12.2 on end # USB
+ device pci 13.0 on end # USB
+ device pci 13.2 on end # USB
+ device pci 14.0 on # SM
+ chip drivers/generic/generic #dimm 0-0-0
+ device i2c 50 on end
+ end
+ end # SM
+ device pci 14.2 off end # HDA 0x4383
+ device pci 14.3 on # LPC 0x439d
+ chip superio/nuvoton/nct5104d
+ device pnp 4e.0 off end # FDC
+ device pnp 4e.2 on # COM1
+ io 0x60 = 0x3f8
+ irq 0x70 = 4
+ end
+ device pnp 4e.3 on # COM2
+ io 0x60 = 0x2f8
+ irq 0x70 = 3
+ end
+ device pnp 4e.7 off end # GPIO
+ device pnp 4e.8 off end # GPIO/WDT
+ device pnp 4e.f off end # GPIO
+ device pnp 4e.10 off end # COM3 used by port 80
+ device pnp 4e.11 on # COM4
+ io 0x60 = 0x2e8
+ irq 0x70 = 3
end
- end # SM
- device pci 14.2 off end # HDA 0x4383
- device pci 14.3 on # LPC 0x439d
- chip superio/nuvoton/nct5104d
- device pnp 4e.0 off end # FDC
- device pnp 4e.2 on # COM1
- io 0x60 = 0x3f8
- irq 0x70 = 4
- end
- device pnp 4e.3 on # COM2
- io 0x60 = 0x2f8
- irq 0x70 = 3
- end
- device pnp 4e.7 off end # GPIO
- device pnp 4e.8 off end # GPIO/WDT
- device pnp 4e.f off end # GPIO
- device pnp 4e.10 off end # COM3 used by port 80
- device pnp 4e.11 on # COM4
- io 0x60 = 0x2e8
- irq 0x70 = 3
- end
- device pnp 4e.14 off end # PORT80
- register "irq_trigger_type" = "0" # 0 edge, 1 level
- end # nct5104d
- end #LPC
- device pci 14.7 off end # SD
- device pci 16.0 on end # USB
- device pci 16.2 on end # USB
- end #chip southbridge/amd/agesa/hudson
+ device pnp 4e.14 off end # PORT80
+ register "irq_trigger_type" = "0" # 0 edge, 1 level
+ end # nct5104d
+ end #LPC
+ device pci 14.7 off end # SD
+ device pci 16.0 on end # USB
+ device pci 16.2 on end # USB
+ end #chip southbridge/amd/agesa/hudson
+ chip northbridge/amd/agesa/family16kb
device pci 18.0 on end
device pci 18.1 on end
device pci 18.2 on end
@@ -86,6 +85,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
{
{ {0xA0, 0x00}, {0x00, 0x00}, }, // socket 0 - Channel 0 - 8-bit SPD addresses
}"
- end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
+ end
+
end #domain
end #northbridge/amd/agesa/family16kb/root_complex