Move GGL0001 ACPI code to generic ChromeOS code
The only difference in this code on all our platforms is the array describing the GPIOs. Hence, only keep that array in the mainboard ChromeOS directory and move everything else to generic ChromeOS ACPI code. Change-Id: I9fc75842af64530c1255bea1c5f803c5316d6da6 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1278 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Stefan Reinauer
Patrick Georgi
parent
48214899c3
commit
2198c583b2
|
|
@ -17,98 +17,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
Device (CRHW)
|
||||
{
|
||||
Name(_HID, EISAID("GGL0001"))
|
||||
|
||||
Method(_STA, 0, Serialized)
|
||||
{
|
||||
Return (0xb)
|
||||
}
|
||||
|
||||
Method(CHSW, 0, Serialized)
|
||||
{
|
||||
Name (WSHC, Package() { VBT3 })
|
||||
Return (WSHC)
|
||||
}
|
||||
|
||||
Method(FWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW1, "")
|
||||
ToString(VBT5, 63, DIW1)
|
||||
Name (DIWF, Package() { DIW1 })
|
||||
Return(DIWF)
|
||||
}
|
||||
|
||||
Method(FRID, 0, Serialized)
|
||||
{
|
||||
Name (DIR1, "")
|
||||
ToString(VBT6, 63, DIR1)
|
||||
Name (DIRF, Package() { DIR1 })
|
||||
Return (DIRF)
|
||||
}
|
||||
|
||||
Method(HWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW0, "")
|
||||
ToString(VBT4, 255, DIW0)
|
||||
Name (DIWH, Package() { DIW0 })
|
||||
Return (DIWH)
|
||||
}
|
||||
|
||||
Method(BINF, 0, Serialized)
|
||||
{
|
||||
Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
|
||||
Return (FNIB)
|
||||
}
|
||||
|
||||
Method(GPIO, 0, Serialized)
|
||||
{
|
||||
Name(OIPG, Package() {
|
||||
Package() { 0x001, 0, 22, "CougarPoint" }, // recovery button
|
||||
Package() { 0x002, 1, 57, "CougarPoint" }, // developer switch
|
||||
Package() { 0x003, 0, 48, "CougarPoint" }, // firmware write protect
|
||||
})
|
||||
Return (OIPG)
|
||||
|
||||
}
|
||||
|
||||
Method(VBNV, 0, Serialized)
|
||||
{
|
||||
Name(VNBV, Package() {
|
||||
// See src/vendorcode/google/chromeos/Kconfig
|
||||
// for the definition of these:
|
||||
CONFIG_VBNV_OFFSET,
|
||||
CONFIG_VBNV_SIZE
|
||||
})
|
||||
Return(VNBV)
|
||||
}
|
||||
|
||||
Method(VDAT, 0, Serialized)
|
||||
{
|
||||
Name(TAD0,"")
|
||||
ToBuffer(CHVD, TAD0)
|
||||
Name (TADV, Package() { TAD0 })
|
||||
Return (TADV)
|
||||
}
|
||||
|
||||
Method(FMAP, 0, Serialized)
|
||||
{
|
||||
Name(PAMF, Package() { VBT9 })
|
||||
Return(PAMF)
|
||||
}
|
||||
|
||||
Method(MECK, 0, Serialized)
|
||||
{
|
||||
Name(HASH, Package() { MEHH })
|
||||
Return(HASH)
|
||||
}
|
||||
|
||||
Method(MLST, 0, Serialized)
|
||||
{
|
||||
Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
|
||||
"GPIO", "VBNV", "VDAT", "FMAP", "MECK"
|
||||
})
|
||||
Return (TSLM)
|
||||
}
|
||||
}
|
||||
Name(OIPG, Package() {
|
||||
Package() { 0x001, 0, 22, "CougarPoint" }, // recovery button
|
||||
Package() { 0x002, 1, 57, "CougarPoint" }, // developer switch
|
||||
Package() { 0x003, 0, 48, "CougarPoint" }, // firmware write protect
|
||||
})
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ DefinitionBlock(
|
|||
}
|
||||
|
||||
#include "acpi/chromeos.asl"
|
||||
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
|
||||
|
||||
/* Chipset specific sleep states */
|
||||
#include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
|
||||
|
|
|
|||
|
|
@ -17,98 +17,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
Device (CRHW)
|
||||
{
|
||||
Name(_HID, EISAID("GGL0001"))
|
||||
Name(OIPG, Package() {
|
||||
Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
|
||||
Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
|
||||
Package() { 0x003, 1, 24, "CougarPoint" }, // firmware write protect
|
||||
})
|
||||
|
||||
Method(_STA, 0, Serialized)
|
||||
{
|
||||
Return (0xb)
|
||||
}
|
||||
|
||||
Method(CHSW, 0, Serialized)
|
||||
{
|
||||
Name (WSHC, Package() { VBT3 })
|
||||
Return (WSHC)
|
||||
}
|
||||
|
||||
Method(FWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW1, "")
|
||||
ToString(VBT5, 63, DIW1)
|
||||
Name (DIWF, Package() { DIW1 })
|
||||
Return(DIWF)
|
||||
}
|
||||
|
||||
Method(FRID, 0, Serialized)
|
||||
{
|
||||
Name (DIR1, "")
|
||||
ToString(VBT6, 63, DIR1)
|
||||
Name (DIRF, Package() { DIR1 })
|
||||
Return (DIRF)
|
||||
}
|
||||
|
||||
Method(HWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW0, "")
|
||||
ToString(VBT4, 255, DIW0)
|
||||
Name (DIWH, Package() { DIW0 })
|
||||
Return (DIWH)
|
||||
}
|
||||
|
||||
Method(BINF, 0, Serialized)
|
||||
{
|
||||
Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
|
||||
Return (FNIB)
|
||||
}
|
||||
|
||||
Method(GPIO, 0, Serialized)
|
||||
{
|
||||
Name(OIPG, Package() {
|
||||
Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
|
||||
Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
|
||||
Package() { 0x003, 1, 24, "CougarPoint" }, // firmware write protect
|
||||
})
|
||||
Return (OIPG)
|
||||
|
||||
}
|
||||
|
||||
Method(VBNV, 0, Serialized)
|
||||
{
|
||||
Name(VNBV, Package() {
|
||||
// See src/vendorcode/google/chromeos/Kconfig
|
||||
// for the definition of these:
|
||||
CONFIG_VBNV_OFFSET,
|
||||
CONFIG_VBNV_SIZE
|
||||
})
|
||||
Return(VNBV)
|
||||
}
|
||||
|
||||
Method(VDAT, 0, Serialized)
|
||||
{
|
||||
Name(TAD0,"")
|
||||
ToBuffer(CHVD, TAD0)
|
||||
Name (TADV, Package() { TAD0 })
|
||||
Return (TADV)
|
||||
}
|
||||
|
||||
Method(FMAP, 0, Serialized)
|
||||
{
|
||||
Name(PAMF, Package() { VBT9 })
|
||||
Return(PAMF)
|
||||
}
|
||||
|
||||
Method(MECK, 0, Serialized)
|
||||
{
|
||||
Name(HASH, Package() { MEHH })
|
||||
Return(HASH)
|
||||
}
|
||||
|
||||
Method(MLST, 0, Serialized)
|
||||
{
|
||||
Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
|
||||
"GPIO", "VBNV", "VDAT", "FMAP", "MECK"
|
||||
})
|
||||
Return (TSLM)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ DefinitionBlock(
|
|||
}
|
||||
|
||||
#include "acpi/chromeos.asl"
|
||||
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
|
||||
|
||||
/* Chipset specific sleep states */
|
||||
#include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
|
||||
|
|
|
|||
|
|
@ -17,98 +17,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
Device (CRHW)
|
||||
{
|
||||
Name(_HID, EISAID("GGL0001"))
|
||||
|
||||
Method(_STA, 0, Serialized)
|
||||
{
|
||||
Return (0xb)
|
||||
}
|
||||
|
||||
Method(CHSW, 0, Serialized)
|
||||
{
|
||||
Name (WSHC, Package() { VBT3 })
|
||||
Return (WSHC)
|
||||
}
|
||||
|
||||
Method(FWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW1, "")
|
||||
ToString(VBT5, 63, DIW1)
|
||||
Name (DIWF, Package() { DIW1 })
|
||||
Return(DIWF)
|
||||
}
|
||||
|
||||
Method(FRID, 0, Serialized)
|
||||
{
|
||||
Name (DIR1, "")
|
||||
ToString(VBT6, 63, DIR1)
|
||||
Name (DIRF, Package() { DIR1 })
|
||||
Return (DIRF)
|
||||
}
|
||||
|
||||
Method(HWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW0, "")
|
||||
ToString(VBT4, 255, DIW0)
|
||||
Name (DIWH, Package() { DIW0 })
|
||||
Return (DIWH)
|
||||
}
|
||||
|
||||
Method(BINF, 0, Serialized)
|
||||
{
|
||||
Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
|
||||
Return (FNIB)
|
||||
}
|
||||
|
||||
Method(GPIO, 0, Serialized)
|
||||
{
|
||||
Name(OIPG, Package() {
|
||||
Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
|
||||
Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
|
||||
Package() { 0x003, 1, 68, "CougarPoint" }, // firmware write protect
|
||||
})
|
||||
Return (OIPG)
|
||||
|
||||
}
|
||||
|
||||
Method(VBNV, 0, Serialized)
|
||||
{
|
||||
Name(VNBV, Package() {
|
||||
// See src/vendorcode/google/chromeos/Kconfig
|
||||
// for the definition of these:
|
||||
CONFIG_VBNV_OFFSET,
|
||||
CONFIG_VBNV_SIZE
|
||||
})
|
||||
Return(VNBV)
|
||||
}
|
||||
|
||||
Method(VDAT, 0, Serialized)
|
||||
{
|
||||
Name(TAD0,"")
|
||||
ToBuffer(CHVD, TAD0)
|
||||
Name (TADV, Package() { TAD0 })
|
||||
Return (TADV)
|
||||
}
|
||||
|
||||
Method(FMAP, 0, Serialized)
|
||||
{
|
||||
Name(PAMF, Package() { VBT9 })
|
||||
Return(PAMF)
|
||||
}
|
||||
|
||||
Method(MECK, 0, Serialized)
|
||||
{
|
||||
Name(HASH, Package() { MEHH })
|
||||
Return(HASH)
|
||||
}
|
||||
|
||||
Method(MLST, 0, Serialized)
|
||||
{
|
||||
Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
|
||||
"GPIO", "VBNV", "VDAT", "FMAP", "MECK"
|
||||
})
|
||||
Return (TSLM)
|
||||
}
|
||||
}
|
||||
Name(OIPG, Package() {
|
||||
Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
|
||||
Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
|
||||
Package() { 0x003, 1, 68, "CougarPoint" }, // firmware write protect
|
||||
})
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ DefinitionBlock(
|
|||
}
|
||||
|
||||
#include "acpi/chromeos.asl"
|
||||
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
|
||||
|
||||
/* Chipset specific sleep states */
|
||||
#include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
Device (CRHW)
|
||||
{
|
||||
Name(_HID, EISAID("GGL0001"))
|
||||
|
||||
Method(_STA, 0, Serialized)
|
||||
{
|
||||
Return (0xb)
|
||||
}
|
||||
|
||||
Method(CHSW, 0, Serialized)
|
||||
{
|
||||
Name (WSHC, Package() { VBT3 })
|
||||
Return (WSHC)
|
||||
}
|
||||
|
||||
Method(FWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW1, "")
|
||||
ToString(VBT5, 63, DIW1)
|
||||
Name (DIWF, Package() { DIW1 })
|
||||
Return(DIWF)
|
||||
}
|
||||
|
||||
Method(FRID, 0, Serialized)
|
||||
{
|
||||
Name (DIR1, "")
|
||||
ToString(VBT6, 63, DIR1)
|
||||
Name (DIRF, Package() { DIR1 })
|
||||
Return (DIRF)
|
||||
}
|
||||
|
||||
Method(HWID, 0, Serialized)
|
||||
{
|
||||
Name (DIW0, "")
|
||||
ToString(VBT4, 255, DIW0)
|
||||
Name (DIWH, Package() { DIW0 })
|
||||
Return (DIWH)
|
||||
}
|
||||
|
||||
Method(BINF, 0, Serialized)
|
||||
{
|
||||
Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
|
||||
Return (FNIB)
|
||||
}
|
||||
|
||||
Method(GPIO, 0, Serialized)
|
||||
{
|
||||
Return (OIPG)
|
||||
|
||||
}
|
||||
|
||||
Method(VBNV, 0, Serialized)
|
||||
{
|
||||
Name(VNBV, Package() {
|
||||
// See src/vendorcode/google/chromeos/Kconfig
|
||||
// for the definition of these:
|
||||
CONFIG_VBNV_OFFSET,
|
||||
CONFIG_VBNV_SIZE
|
||||
})
|
||||
Return(VNBV)
|
||||
}
|
||||
|
||||
Method(VDAT, 0, Serialized)
|
||||
{
|
||||
Name(TAD0,"")
|
||||
ToBuffer(CHVD, TAD0)
|
||||
Name (TADV, Package() { TAD0 })
|
||||
Return (TADV)
|
||||
}
|
||||
|
||||
Method(FMAP, 0, Serialized)
|
||||
{
|
||||
Name(PAMF, Package() { VBT9 })
|
||||
Return(PAMF)
|
||||
}
|
||||
|
||||
Method(MECK, 0, Serialized)
|
||||
{
|
||||
Name(HASH, Package() { MEHH })
|
||||
Return(HASH)
|
||||
}
|
||||
|
||||
Method(MLST, 0, Serialized)
|
||||
{
|
||||
Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
|
||||
"GPIO", "VBNV", "VDAT", "FMAP", "MECK"
|
||||
})
|
||||
Return (TSLM)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue