Nicolas Provost has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75993?usp=email )
Change subject: lenovo/l420: fix HDA definition and various typos. ......................................................................
lenovo/l420: fix HDA definition and various typos.
Change-Id: I34e480c9911712281ad7405a405a65dc37ff77df Signed-off-by: Nicolas Provost dev@npsoft.fr --- M src/mainboard/lenovo/l420/Makefile.inc M src/mainboard/lenovo/l420/dsdt.asl M src/mainboard/lenovo/l420/early_init.c M src/mainboard/lenovo/l420/hda_verb.c M src/mainboard/lenovo/l420/mainboard.c D src/mainboard/lenovo/l420/seabios.config M src/mainboard/lenovo/l420/smihandler.c M src/mainboard/lenovo/l420/status.txt 8 files changed, 47 insertions(+), 127 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/75993/1
diff --git a/src/mainboard/lenovo/l420/Makefile.inc b/src/mainboard/lenovo/l420/Makefile.inc index eef814f..e4b6fbf 100644 --- a/src/mainboard/lenovo/l420/Makefile.inc +++ b/src/mainboard/lenovo/l420/Makefile.inc @@ -6,4 +6,3 @@ ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads bootblock-y += early_init.c romstage-y += early_init.c - diff --git a/src/mainboard/lenovo/l420/dsdt.asl b/src/mainboard/lenovo/l420/dsdt.asl index f574eca..8a8bd1b 100644 --- a/src/mainboard/lenovo/l420/dsdt.asl +++ b/src/mainboard/lenovo/l420/dsdt.asl @@ -14,7 +14,7 @@ ACPI_DSDT_REV_2, OEM_ID, ACPI_TABLE_CREATOR, - 0x20230620 // OEM revision + 0x20230621 // OEM revision ) { #include <acpi/dsdt_top.asl> diff --git a/src/mainboard/lenovo/l420/early_init.c b/src/mainboard/lenovo/l420/early_init.c index 2b73335..1e3bdc5 100644 --- a/src/mainboard/lenovo/l420/early_init.c +++ b/src/mainboard/lenovo/l420/early_init.c @@ -8,7 +8,7 @@
/* USB map: - ECHCI1: + EHCI1: 0 -> USB0 eSata Combo 1 -> USB1 (AUO3), OC0 2 -> Express Card @@ -16,7 +16,7 @@ 4 -> WLAN 5 -> WWAN 6 -> x - ECHCI2: + EHCI2: 7 -> x 8 -> USB3, OC4 9 -> USB2, OC4 diff --git a/src/mainboard/lenovo/l420/hda_verb.c b/src/mainboard/lenovo/l420/hda_verb.c index 0c19c91..bbb3402 100644 --- a/src/mainboard/lenovo/l420/hda_verb.c +++ b/src/mainboard/lenovo/l420/hda_verb.c @@ -8,22 +8,46 @@ #include <device/azalia_device.h>
const u32 cim_verb_data[] = { - 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - schematic shows CX20672 */ - 0x17aa21ce, /* Subsystem ID */ - 13, /* Number of 4 dword sets */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21dd, /* Subsystem ID */ + 18, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0, 0x17aa21dd), - AZALIA_PIN_CFG(0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0, 0x1a, 0x61a19050), - AZALIA_PIN_CFG(0, 0x1b, 0x04a11060), - AZALIA_PIN_CFG(0, 0x1c, 0x6121401f), - AZALIA_PIN_CFG(0, 0x1d, 0x40f001f0), - AZALIA_PIN_CFG(0, 0x1e, 0x40f001f0), - AZALIA_PIN_CFG(0, 0x1f, 0x90170110), - AZALIA_PIN_CFG(0, 0x20, 0x40f001f0), - AZALIA_PIN_CFG(0, 0x22, 0x40f001f0), - AZALIA_PIN_CFG(0, 0x23, 0x90a60170), + + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0, 0x0a, 0x04a11020), + + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0, 0x0b, 0x0421101f), + + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0, 0x0c, 0x40f000f0), + + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0, 0x0d, 0x90170110), + + /* Not connected */ + AZALIA_PIN_CFG(0, 0x0f, 0x40f000f0), + + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0, 0x11, 0xd5a30140), + AZALIA_PIN_CFG(0, 0x12, 0x90a60140), + AZALIA_PIN_CFG(0, 0x14, 0x90170110), + AZALIA_PIN_CFG(0, 0x15, 0x03211020), + AZALIA_PIN_CFG(0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + + 0x01970804, + 0x01870803, + 0x01470740, + 0x00970600, + + AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0, 0x1e, 0x411111f0),
/* Misc entries */ + 0x00370600, + 0x00270600, 0x00b707C0, /* Enable PortB as Output with HP amp */ 0x00d70740, /* Enable PortD as Output */ 0x0017a200, /* Disable ClkEn of PortSenseTst */ @@ -33,13 +57,11 @@ Enable Combo Jack Detection */ 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - 0x00170500, /* Padding */ - 0x00170500, /* Padding */
/* --- Codec #3 --- */ - 0x80862805, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(3, 0x80860101), AZALIA_PIN_CFG(3, 0x05, 0x18560010), AZALIA_PIN_CFG(3, 0x06, 0x18560020), diff --git a/src/mainboard/lenovo/l420/mainboard.c b/src/mainboard/lenovo/l420/mainboard.c index f98b4b1..3b4ef59 100644 --- a/src/mainboard/lenovo/l420/mainboard.c +++ b/src/mainboard/lenovo/l420/mainboard.c @@ -15,8 +15,6 @@ GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); }
- struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; - diff --git a/src/mainboard/lenovo/l420/seabios.config b/src/mainboard/lenovo/l420/seabios.config deleted file mode 100644 index ac62482..0000000 --- a/src/mainboard/lenovo/l420/seabios.config +++ /dev/null @@ -1,98 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# SeaBIOS Configuration -# - -# -# General Features -# -CONFIG_COREBOOT=y -# CONFIG_QEMU is not set -# CONFIG_CSM is not set -# CONFIG_QEMU_HARDWARE is not set -CONFIG_THREADS=y -CONFIG_RELOCATE_INIT=y -CONFIG_BOOTMENU=y -# CONFIG_BOOTSPLASH is not set -CONFIG_BOOTORDER=y -CONFIG_HOST_BIOS_GEOMETRY=y -CONFIG_COREBOOT_FLASH=y -CONFIG_LZMA=y -CONFIG_CBFS_LOCATION=0 -CONFIG_MULTIBOOT=y -CONFIG_ENTRY_EXTRASTACK=y -CONFIG_MALLOC_UPPERMEMORY=y -CONFIG_ROM_SIZE=0 - -# -# Hardware support -# -CONFIG_ATA=y -# CONFIG_ATA_DMA is not set -# CONFIG_ATA_PIO32 is not set -CONFIG_AHCI=y -CONFIG_SDCARD=y -# CONFIG_MEGASAS is not set -# CONFIG_FLOPPY is not set -# CONFIG_FLASH_FLOPPY is not set -# CONFIG_NVME is not set -CONFIG_PS2PORT=y -CONFIG_USB=y -CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y -CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y -CONFIG_USB_MSC=y -CONFIG_USB_UAS=y -CONFIG_USB_HUB=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_MOUSE=y -CONFIG_SERIAL=y -CONFIG_SERCON=y -CONFIG_LPT=y -CONFIG_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=y - -# -# BIOS interfaces -# -CONFIG_DRIVES=y -CONFIG_CDROM_BOOT=y -CONFIG_CDROM_EMU=y -CONFIG_PCIBIOS=y -CONFIG_APMBIOS=y -CONFIG_PNPBIOS=y -CONFIG_OPTIONROMS=y -CONFIG_PMM=y -CONFIG_BOOT=y -CONFIG_KEYBOARD=y -CONFIG_KBD_CALL_INT15_4F=y -CONFIG_MOUSE=y -CONFIG_S3_RESUME=y -CONFIG_VGAHOOKS=y -# CONFIG_DISABLE_A20 is not set -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -# CONFIG_NO_VGABIOS is not set -# CONFIG_VGA_GEODEGX2 is not set -# CONFIG_VGA_GEODELX is not set -CONFIG_VGA_COREBOOT=y -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_EMULATE_TEXT=y -CONFIG_VGA_FIXUP_ASM=y -CONFIG_VGA_ALLOCATE_EXTRA_STACK=y -CONFIG_VGA_EXTRA_STACK_SIZE=512 -CONFIG_VGA_VBE=y - -# -# Debugging -# -CONFIG_DEBUG_LEVEL=1 -# CONFIG_DEBUG_SERIAL is not set -# CONFIG_DEBUG_SERIAL_MMIO is not set -CONFIG_DEBUG_COREBOOT=y diff --git a/src/mainboard/lenovo/l420/smihandler.c b/src/mainboard/lenovo/l420/smihandler.c index 41fd1fb..48148fd 100644 --- a/src/mainboard/lenovo/l420/smihandler.c +++ b/src/mainboard/lenovo/l420/smihandler.c @@ -68,4 +68,3 @@ } } } - diff --git a/src/mainboard/lenovo/l420/status.txt b/src/mainboard/lenovo/l420/status.txt index f6a0c4f..ce992c5 100644 --- a/src/mainboard/lenovo/l420/status.txt +++ b/src/mainboard/lenovo/l420/status.txt @@ -15,7 +15,7 @@ Keyboard | OK |22/11/20| Touchpad | Should work |23/06/20| (present in device tree) Trackpoint | Should work |23/06/20| (present in device tree) -Audio | OK |22/11/20| +Audio | OK |23/06/21| WLAN | Should work | | (present in device tree) WWAN | Should work | | (present in device tree) SATA | OK |22/11/20| @@ -31,6 +31,6 @@ Battery | OK |22/11/20| Charge ok. Status report to do (ACPI).
ChangeLog: -22/11/20: initial port to v4.18 -23/06/21: adapted to master - +22/11/20: initial port to v4.18 (Nicolas Provost) +23/06/21: port to master branch (Nicolas Provost) +23/06/21: fix HDA definition (Nicolas Provost)
-
Nicolas Provost (Code Review)