diff options
Diffstat (limited to 'src/mainboard/prodrive')
| -rw-r--r-- | src/mainboard/prodrive/atlas/Kconfig | 3 | ||||
| -rw-r--r-- | src/mainboard/prodrive/atlas/mainboard.c | 2 | ||||
| -rw-r--r-- | src/mainboard/prodrive/atlas/vpd.c | 1 | ||||
| -rw-r--r-- | src/mainboard/prodrive/hermes/devicetree.cb | 7 | ||||
| -rw-r--r-- | src/mainboard/prodrive/hermes/hda_verb.c | 48 | ||||
| -rw-r--r-- | src/mainboard/prodrive/hermes/mainboard.c | 1 | ||||
| -rw-r--r-- | src/mainboard/prodrive/hermes/smbios.c | 2 |
7 files changed, 29 insertions, 35 deletions
diff --git a/src/mainboard/prodrive/atlas/Kconfig b/src/mainboard/prodrive/atlas/Kconfig index 5a3f3118d3c0..b40e2b796b3b 100644 --- a/src/mainboard/prodrive/atlas/Kconfig +++ b/src/mainboard/prodrive/atlas/Kconfig @@ -47,9 +47,6 @@ config MAINBOARD_SMBIOS_MANUFACTURER string default "Prodrive Technologies B.V." -config DIMM_SPD_SIZE - default 512 - config UART_FOR_CONSOLE int default 0 diff --git a/src/mainboard/prodrive/atlas/mainboard.c b/src/mainboard/prodrive/atlas/mainboard.c index 0128670d9c13..84888366559c 100644 --- a/src/mainboard/prodrive/atlas/mainboard.c +++ b/src/mainboard/prodrive/atlas/mainboard.c @@ -5,7 +5,7 @@ #include <device/device.h> #include <gpio.h> #include <smbios.h> -#include <string.h> +#include <stdio.h> #include <types.h> #include "gpio.h" diff --git a/src/mainboard/prodrive/atlas/vpd.c b/src/mainboard/prodrive/atlas/vpd.c index ba249a94d7a1..badbc6e3d19c 100644 --- a/src/mainboard/prodrive/atlas/vpd.c +++ b/src/mainboard/prodrive/atlas/vpd.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <console/console.h> +#include <stdio.h> #include <string.h> #include <types.h> diff --git a/src/mainboard/prodrive/hermes/devicetree.cb b/src/mainboard/prodrive/hermes/devicetree.cb index ea9f6731f7c9..ee73800c40ff 100644 --- a/src/mainboard/prodrive/hermes/devicetree.cb +++ b/src/mainboard/prodrive/hermes/devicetree.cb @@ -170,12 +170,7 @@ chip soc/intel/cannonlake # This device does not have any function on CNP-H, but it needs # to be here so that the resource allocator is aware of UART 2. device ref i2c4 hidden end - device ref uart2 hidden # in ACPI mode - chip soc/intel/common/block/uart - register "devid" = "PCI_DID_INTEL_CNP_H_UART2" - device generic 0 hidden end - end - end + device ref uart2 hidden end # in ACPI mode device ref pcie_rp21 on smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT1" "SlotDataBusWidth4X" register "PcieRpEnable[20]" = "1" diff --git a/src/mainboard/prodrive/hermes/hda_verb.c b/src/mainboard/prodrive/hermes/hda_verb.c index cab4fd344b13..d1ad64f570c6 100644 --- a/src/mainboard/prodrive/hermes/hda_verb.c +++ b/src/mainboard/prodrive/hermes/hda_verb.c @@ -12,22 +12,22 @@ const u32 cim_verb_data[] = { AZALIA_SUBVENDOR(0, 0x1d336700), /* Pin widgets */ - AZALIA_PIN_CFG(0, 0x11, 0x411111f0), /* SPDIF-OUT2 - disabled */ - AZALIA_PIN_CFG(0, 0x12, 0x411111f0), /* digital MIC - disabled */ - AZALIA_PIN_CFG(0, 0x14, 0x01014430), /* PORT D - rear line out */ - AZALIA_PIN_CFG(0, 0x16, 0x411111f0), /* PORT G - disabled */ - AZALIA_PIN_CFG(0, 0x17, 0x411111f0), /* PORT H - disabled */ - AZALIA_PIN_CFG(0, 0x18, 0x01a19c50), /* PORT B - rear mic in */ - AZALIA_PIN_CFG(0, 0x1c, 0x411111f0), /* CD audio - disabled */ - AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), /* BEEPIN */ - AZALIA_PIN_CFG(0, 0x1e, 0x01452160), /* SPDIF-OUT */ - AZALIA_PIN_CFG(0, 0x1f, 0x01c52170), /* SPDIF-IN */ + AZALIA_PIN_CFG(0, 0x11, AZALIA_PIN_CFG_NC(0)), /* SPDIF-OUT2 - disabled */ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), /* Digital MIC - disabled */ + AZALIA_PIN_CFG(0, 0x14, 0x01014430), /* Port D - rear line out */ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), /* Port G - disabled */ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), /* Port H - disabled */ + AZALIA_PIN_CFG(0, 0x18, 0x01a19c50), /* Port B - rear mic in */ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), /* CD audio - disabled */ + AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), /* BEEPIN */ + AZALIA_PIN_CFG(0, 0x1e, 0x01452160), /* SPDIF-OUT */ + AZALIA_PIN_CFG(0, 0x1f, 0x01c52170), /* SPDIF-IN */ /* Config for R02 and older */ - AZALIA_PIN_CFG(0, 0x19, 0x02214c40), /* port F - front hp out */ - AZALIA_PIN_CFG(0, 0x1a, 0x901001f0), /* port C - internal speaker */ - AZALIA_PIN_CFG(0, 0x1b, 0x01813c10), /* port E - rear line in/mic - Blue */ - AZALIA_PIN_CFG(0, 0x15, 0x02a19c20), /* port A - audio hdr input */ + AZALIA_PIN_CFG(0, 0x19, 0x02214c40), /* Port F - front hp out */ + AZALIA_PIN_CFG(0, 0x1a, 0x901001f0), /* Port C - internal speaker */ + AZALIA_PIN_CFG(0, 0x1b, 0x01813c10), /* Port E - rear line in/mic - Blue */ + AZALIA_PIN_CFG(0, 0x15, 0x02a19c20), /* Port A - audio hdr input */ /* * VerbTable: CFL Display Audio Codec @@ -67,10 +67,10 @@ const u32 pc_beep_verbs[0] = {}; AZALIA_ARRAY_SIZES; static const u32 r04_verb_data[] = { - AZALIA_PIN_CFG(0, 0x19, 0x02a19c20), /* PORT F - front mic in */ - AZALIA_PIN_CFG(0, 0x1a, 0x01813c51), /* PORT C - rear line in (mic support) */ - AZALIA_PIN_CFG(0, 0x1b, 0x411111f0), /* PORT E - disabled */ - AZALIA_PIN_CFG(0, 0x15, 0x411111f0), /* PORT A - disabled */ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c20), /* Port F - front mic in */ + AZALIA_PIN_CFG(0, 0x1a, 0x01813c51), /* Port C - rear line in (mic support) */ + AZALIA_PIN_CFG(0, 0x1b, AZALIA_PIN_CFG_NC(0)), /* Port E - disabled */ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), /* Port A - disabled */ }; static u32 get_port_c_vref_cfg(uint8_t blue_rear_vref) @@ -95,15 +95,15 @@ static u32 get_port_b_vref_cfg(uint8_t pink_rear_vref) switch (pink_rear_vref) { default: case 0: - return 0x411110f0; /* Disabled (Hi-Z) */ + return 0; /* Disabled (Hi-Z) */ case 1: - return 0x411111f0; /* 50% of LDO out */ + return 1; /* 50% of LDO out */ case 2: - return 0x411114f0; /* 80% of LDO out */ + return 4; /* 80% of LDO out */ case 3: - return 0x411115f0; /* 100% of LDO out */ + return 5; /* 100% of LDO out */ case 4: - return 0x411112f0; /* Ground */ + return 2; /* Ground */ } } @@ -145,7 +145,7 @@ static void mainboard_r0x_configure_alc888(u8 *base, u32 viddid) * persist after codec resets, a custom Realtek driver (ab)uses NID 0x12 * to restore port B Vref after resetting the codec. */ - AZALIA_PIN_CFG(0, 0x12, port_b_vref_cfg), + AZALIA_PIN_CFG(0, 0x12, 0x411110f0 | port_b_vref_cfg << 8), AZALIA_PIN_CFG(0, 0x19, front_mic_cfg), AZALIA_PIN_CFG(0, 0x1b, front_panel_cfg), 0x0205000d, /* Pin 37 vrefo hidden register - used as port C vref */ diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c index b0bf0dd98629..6d0da8d41150 100644 --- a/src/mainboard/prodrive/hermes/mainboard.c +++ b/src/mainboard/prodrive/hermes/mainboard.c @@ -16,6 +16,7 @@ #include <intelblocks/pmclib.h> #include <smbios.h> #include <soc/pm.h> +#include <stdio.h> #include <string.h> #include <types.h> diff --git a/src/mainboard/prodrive/hermes/smbios.c b/src/mainboard/prodrive/hermes/smbios.c index 923ce8170c3e..2f2869a9d507 100644 --- a/src/mainboard/prodrive/hermes/smbios.c +++ b/src/mainboard/prodrive/hermes/smbios.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <smbios.h> -#include <string.h> +#include <stdio.h> #include <types.h> #include "eeprom.h" |