summaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/t530
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-10-28 23:43:20 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2014-11-19 21:09:51 +0100
commit36fa5b80843d836518eb89f46747e80ed6b5d96f (patch)
treea36f498a48aaa8764df768ff3616ff476f62a07b /src/mainboard/lenovo/t530
parent10dd0e3171bc631fd5d83d4f42aa376edd3c6d55 (diff)
downloadcoreboot-36fa5b80843d836518eb89f46747e80ed6b5d96f.tar.xz
i82801ix,bd82x6x,ibexpeak: rewrite expresscard hotplug
This implementation is more compact, unified and works with windows as well. Tested under windows and under Debian GNU/Linux. Change-Id: I585dec12e17e22d829baa3f2dc7aecc174f9d3b5 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7296 Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Nicolas Reinecke <nr@das-labor.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/lenovo/t530')
-rw-r--r--src/mainboard/lenovo/t530/acpi/gpe.asl13
-rw-r--r--src/mainboard/lenovo/t530/devicetree.cb2
-rw-r--r--src/mainboard/lenovo/t530/dsdt.asl4
-rw-r--r--src/mainboard/lenovo/t530/mainboard.c8
4 files changed, 2 insertions, 25 deletions
diff --git a/src/mainboard/lenovo/t530/acpi/gpe.asl b/src/mainboard/lenovo/t530/acpi/gpe.asl
deleted file mode 100644
index eb489d5c4e..0000000000
--- a/src/mainboard/lenovo/t530/acpi/gpe.asl
+++ /dev/null
@@ -1,13 +0,0 @@
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP03.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP03.HPCS)
- If (\_SB.PCI0.RP03.PDC)
- {
- Store (0x01, \_SB.PCI0.RP03.PDC)
- Notify (\_SB.PCI0.RP03, 0x00)
- }
- }
- }
diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb
index 397bb9f5ed..ec3913c5f6 100644
--- a/src/mainboard/lenovo/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/devicetree.cb
@@ -75,6 +75,8 @@ chip northbridge/intel/sandybridge
register "c2_latency" = "101" # c2 not supported
register "p_cnt_throttling_supported" = "1"
+ register "pcie_hotplug_map" = "{ 0, 0, 1, 0, 0, 0, 0, 0 }"
+
device pci 14.0 on end # USB 3.0 Controller
device pci 16.0 on end # Management Engine Interface 1
device pci 16.1 off end # Management Engine Interface 2
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
index c73f795074..85e2b4f9e0 100644
--- a/src/mainboard/lenovo/t530/dsdt.asl
+++ b/src/mainboard/lenovo/t530/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP03_IS_EXPRESSCARD 1
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define HAVE_LCD_SCREEN 1
@@ -42,9 +41,6 @@ DefinitionBlock(
// global NVS and variables
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
- // General Purpose Events
- //#include "acpi/gpe.asl"
-
#include <cpu/intel/model_206ax/acpi/cpu.asl>
Scope (\_SB) {
diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index f8c9daee35..14e19604b8 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/mainboard.c
@@ -56,14 +56,6 @@ static void mainboard_init(device_t dev)
connected to anything and hence we don't init it.
*/
pc_keyboard_init();
-
- /* Enable expresscard hotplug events. */
- pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
- 0xd8,
- pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)), 0xd8)
- | (1 << 30));
- pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
- 0x42, 0x142);
}
// mainboard_enable is executed as first thing after