summaryrefslogtreecommitdiff
path: root/src/mainboard/nokia
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/nokia')
-rw-r--r--src/mainboard/nokia/ip530/Kconfig25
-rw-r--r--src/mainboard/nokia/ip530/devicetree.cb11
2 files changed, 11 insertions, 25 deletions
diff --git a/src/mainboard/nokia/ip530/Kconfig b/src/mainboard/nokia/ip530/Kconfig
index 0eac00a3ab..b5abb89d58 100644
--- a/src/mainboard/nokia/ip530/Kconfig
+++ b/src/mainboard/nokia/ip530/Kconfig
@@ -45,29 +45,4 @@ config IRQ_SLOT_COUNT
int
default 22
-## Configuration for the PCMCIA-Cardbus controller.
-config TI_PCMCIA_CARDBUS_CMDR
- hex
- default 0x0107
-
-config TI_PCMCIA_CARDBUS_CLSR
- hex
- default 0x00
-
-config TI_PCMCIA_CARDBUS_CLTR
- hex
- default 0x40
-
-config TI_PCMCIA_CARDBUS_BCR
- hex
- default 0x07C0
-
-config TI_PCMCIA_CARDBUS_SCR
- hex
- default 0x08449060
-
-config TI_PCMCIA_CARDBUS_MRR
- hex
- default 0x00007522
-
endif # BOARD_NOKIA_IP530
diff --git a/src/mainboard/nokia/ip530/devicetree.cb b/src/mainboard/nokia/ip530/devicetree.cb
index 3cfbc8fb0f..ac6d78ed75 100644
--- a/src/mainboard/nokia/ip530/devicetree.cb
+++ b/src/mainboard/nokia/ip530/devicetree.cb
@@ -28,6 +28,17 @@ chip northbridge/intel/i440bx # Northbridge
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
+ device pci f.0 on
+ chip southbridge/ti/pci1x2x
+ device pci 00.0 on
+
+ end
+ register "cltr" = "0x40"
+ register "bcr" = "0x7c0"
+ register "scr" = "0x08449060"
+ register "mrr" = "0x00007522"
+ end
+ end
device pci 7.0 on # ISA bridge
chip superio/smsc/smscsuperio # Super I/O (SMSC FDC37B787)
device pnp 3f0.0 off end # Floppy (No connector)