mb/lenovo: Get rid of device_t
Use of device_t has been abandoned in ramstage. Change-Id: Ic044fc074c43db683fcd85ce92a36a8c5a464a67 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/26101 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
This commit is contained in:
		
				
					committed by
					
						
						Martin Roth
					
				
			
			
				
	
			
			
			
						parent
						
							a29d234b24
						
					
				
				
					commit
					64b759e201
				
			@@ -29,7 +29,7 @@ static void pavilion_cold_boot_init(void)
 | 
				
			|||||||
	lenovo_g505s_ec_init();
 | 
						lenovo_g505s_ec_init();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 | 
						printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -145,7 +145,7 @@ static void *smp_write_config_table(void *v)
 | 
				
			|||||||
	/* on board NIC & Slot PCIE.  */
 | 
						/* on board NIC & Slot PCIE.  */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* PCI slots */
 | 
						/* PCI slots */
 | 
				
			||||||
	device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
 | 
						struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
 | 
				
			||||||
	if (dev && dev->enabled) {
 | 
						if (dev && dev->enabled) {
 | 
				
			||||||
		u8 bus_pci = dev->link_list->secondary;
 | 
							u8 bus_pci = dev->link_list->secondary;
 | 
				
			||||||
		/* PCI_SLOT 0. */
 | 
							/* PCI_SLOT 0. */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <ec/lenovo/h8/h8.h>
 | 
					#include <ec/lenovo/h8/h8.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,7 +65,7 @@ static void mainboard_smbios_strings(
 | 
				
			|||||||
	       fwvh >> 4, fwvh & 0x0f, fwvl >> 4, 0x41 + (fwvl & 0xf));
 | 
						       fwvh >> 4, fwvh & 0x0f, fwvl >> 4, 0x41 + (fwvl & 0xf));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	dev->ops->get_smbios_strings = mainboard_smbios_strings,
 | 
						dev->ops->get_smbios_strings = mainboard_smbios_strings,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@
 | 
				
			|||||||
#include <device/device.h>
 | 
					#include <device/device.h>
 | 
				
			||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_CENTERING,
 | 
										GMA_INT15_PANEL_FIT_CENTERING,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <ec/lenovo/h8/h8.h>
 | 
					#include <ec/lenovo/h8/h8.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <ec/lenovo/h8/h8.h>
 | 
					#include <ec/lenovo/h8/h8.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@ void h8_mainboard_init_dock (void)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <ec/lenovo/h8/h8.h>
 | 
					#include <ec/lenovo/h8/h8.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* mainboard_enable is executed as first thing after
 | 
					/* mainboard_enable is executed as first thing after
 | 
				
			||||||
enumerate_buses(). */
 | 
					enumerate_buses(). */
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
// mainboard_enable is executed as first thing after
 | 
					// mainboard_enable is executed as first thing after
 | 
				
			||||||
// enumerate_buses().
 | 
					// enumerate_buses().
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,10 +39,10 @@ int get_cst_entries(acpi_cstate_t **entries)
 | 
				
			|||||||
	return ARRAY_SIZE(cst_entries);
 | 
						return ARRAY_SIZE(cst_entries);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_init(device_t dev)
 | 
					static void mainboard_init(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct southbridge_intel_i82801gx_config *config;
 | 
						struct southbridge_intel_i82801gx_config *config;
 | 
				
			||||||
	device_t idedev;
 | 
						struct device *idedev;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
@@ -74,7 +74,7 @@ static void mainboard_init(device_t dev)
 | 
				
			|||||||
	ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
 | 
						ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	dev->ops->init = mainboard_init;
 | 
						dev->ops->init = mainboard_init;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <ec/lenovo/h8/h8.h>
 | 
					#include <ec/lenovo/h8/h8.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <ec/lenovo/h8/h8.h>
 | 
					#include <ec/lenovo/h8/h8.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,12 +17,12 @@
 | 
				
			|||||||
#include <drivers/intel/gma/int15.h>
 | 
					#include <drivers/intel/gma/int15.h>
 | 
				
			||||||
#include <drivers/lenovo/lenovo.h>
 | 
					#include <drivers/lenovo/lenovo.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void fill_ssdt(device_t device)
 | 
					static void fill_ssdt(struct device *device)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
 | 
						drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_CENTERING,
 | 
										GMA_INT15_PANEL_FIT_CENTERING,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,7 +45,7 @@ int get_cst_entries(acpi_cstate_t ** entries)
 | 
				
			|||||||
	return ARRAY_SIZE(cst_entries);
 | 
						return ARRAY_SIZE(cst_entries);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_init(device_t dev)
 | 
					static void mainboard_init(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	printk(BIOS_SPEW, "starting SPI configuration\n");
 | 
						printk(BIOS_SPEW, "starting SPI configuration\n");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -73,12 +73,12 @@ static void mainboard_init(device_t dev)
 | 
				
			|||||||
	printk(BIOS_SPEW, "SPI configured\n");
 | 
						printk(BIOS_SPEW, "SPI configured\n");
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void fill_ssdt(device_t device)
 | 
					static void fill_ssdt(struct device *device)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
 | 
						drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	u16 pmbase;
 | 
						u16 pmbase;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
// mainboard_enable is executed as first thing after
 | 
					// mainboard_enable is executed as first thing after
 | 
				
			||||||
// enumerate_buses().
 | 
					// enumerate_buses().
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
// mainboard_enable is executed as first thing after
 | 
					// mainboard_enable is executed as first thing after
 | 
				
			||||||
// enumerate_buses().
 | 
					// enumerate_buses().
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,9 +69,9 @@ int get_cst_entries(acpi_cstate_t **entries)
 | 
				
			|||||||
	return ARRAY_SIZE(cst_entries);
 | 
						return ARRAY_SIZE(cst_entries);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_init(device_t dev)
 | 
					static void mainboard_init(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	device_t idedev, sdhci_dev;
 | 
						struct device *idedev, *sdhci_dev;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ec_clr_bit(0x03, 2);
 | 
						ec_clr_bit(0x03, 2);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -115,12 +115,12 @@ static void mainboard_init(device_t dev)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void fill_ssdt(device_t device)
 | 
					static void fill_ssdt(struct device *device)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 1);
 | 
						drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	dev->ops->init = mainboard_init;
 | 
						dev->ops->init = mainboard_init;
 | 
				
			||||||
	dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
 | 
						dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,10 +39,10 @@ int get_cst_entries(acpi_cstate_t **entries)
 | 
				
			|||||||
	return ARRAY_SIZE(cst_entries);
 | 
						return ARRAY_SIZE(cst_entries);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_init(device_t dev)
 | 
					static void mainboard_init(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct southbridge_intel_i82801gx_config *config;
 | 
						struct southbridge_intel_i82801gx_config *config;
 | 
				
			||||||
	device_t idedev;
 | 
						struct device *idedev;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
						install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS,
 | 
				
			||||||
					GMA_INT15_PANEL_FIT_DEFAULT,
 | 
										GMA_INT15_PANEL_FIT_DEFAULT,
 | 
				
			||||||
@@ -74,7 +74,7 @@ static void mainboard_init(device_t dev)
 | 
				
			|||||||
	ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
 | 
						ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(device_t dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	dev->ops->init = mainboard_init;
 | 
						dev->ops->init = mainboard_init;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user