Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / arch / x86 / include / asm / arch-baytrail / fsp / fsp_vpd.h

diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
index 82862f6..8c07b37 100644 (file)
--- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
@@ -47,8 +47,8 @@ struct __packed upd_region {
        uint8_t enable_azalia;                  /* Offset 0x002f */
        uint32_t azalia_config_ptr;             /* Offset 0x0030 */
        uint8_t enable_xhci;                    /* Offset 0x0034 */
-       uint8_t enable_lpe;                     /* Offset 0x0035 */
-       uint8_t lpss_sio_enable_pci_mode;       /* Offset 0x0036 */
+       uint8_t lpe_mode;                       /* Offset 0x0035 */
+       uint8_t lpss_sio_mode;                  /* Offset 0x0036 */
        uint8_t enable_dma0;                    /* Offset 0x0037 */
        uint8_t enable_dma1;                    /* Offset 0x0038 */
        uint8_t enable_i2_c0;                   /* Offset 0x0039 */
@@ -64,24 +64,23 @@ struct __packed upd_region {
        uint8_t igd_dvmt50_pre_alloc;           /* Offset 0x0043 */
        uint8_t aperture_size;                  /* Offset 0x0044 */
        uint8_t gtt_size;                       /* Offset 0x0045 */
-       uint32_t serial_debug_port_address;     /* Offset 0x0046 */
-       uint8_t serial_debug_port_type;         /* Offset 0x004a */
+       uint8_t reserved2[5];                   /* Offset 0x0046 */
        uint8_t mrc_debug_msg;                  /* Offset 0x004b */
        uint8_t isp_enable;                     /* Offset 0x004c */
-       uint8_t scc_enable_pci_mode;            /* Offset 0x004d */
+       uint8_t scc_mode;                       /* Offset 0x004d */
        uint8_t igd_render_standby;             /* Offset 0x004e */
        uint8_t txe_uma_enable;                 /* Offset 0x004f */
        uint8_t os_selection;                   /* Offset 0x0050 */
        uint8_t emmc45_ddr50_enabled;           /* Offset 0x0051 */
        uint8_t emmc45_hs200_enabled;           /* Offset 0x0052 */
        uint8_t emmc45_retune_timer_value;      /* Offset 0x0053 */
-       uint8_t unused_upd_space1[156];         /* Offset 0x0054 */
+       uint8_t enable_igd;                     /* Offset 0x0054 */
+       uint8_t unused_upd_space1[155];         /* Offset 0x0055 */
        struct memory_down_data memory_params;  /* Offset 0x00f0 */
        uint16_t terminator;                    /* Offset 0x0100 */
 };
 
 #define VPD_IMAGE_ID           0x3157454956594C56      /* 'VLYVIEW1' */
-#define VPD_IMAGE_REV          0x00000303
 
 struct __packed vpd_region {
        uint64_t sign;                          /* Offset 0x0000 */