Revert "Set USB power plane to off during restart"

This reverts commit ca35998d29.
This commit is contained in:
Jeremy Soller
2019-11-20 08:43:58 -07:00
parent f81e2ad385
commit 8a3dadab7c
2 changed files with 0 additions and 74 deletions

View File

@@ -29,32 +29,6 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *params) {
cnl_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
}
static int ec_cmd(u8 value) {
int i = 1000000;
while ((inb(0x66) & 2) == 2 && i > 0) {
i -= 1;
}
if (i == 0) {
return 1;
} else {
outb(value, 0x66);
return 0;
}
}
static int ec_write(u8 value) {
int i = 1000000;
while ((inb(0x66) & 2) == 2 && i > 0) {
i -= 1;
}
if (i == 0) {
return 1;
} else {
outb(value, 0x62);
return 0;
}
}
static u8 superio_read(u8 reg) {
outb(reg, 0x2E);
return inb(0x2F);
@@ -93,17 +67,6 @@ static void mainboard_init(struct device *dev) {
printk(BIOS_INFO, "system76: EC init\n");
// Set USB power plane to off during restart
if (!ec_cmd(0x96)) {
if (!ec_write(0x00)) {
printk(BIOS_INFO, "system76: set USB power plane to off during restart\n");
} else {
printk(BIOS_INFO, "system76: failed to send USB power plane data\n");
}
} else {
printk(BIOS_INFO, "system76: failed to send USB power plane command\n");
}
// Black magic - force enable camera toggle
u16 addr = 0x01CA;
u8 value = i2ec_read(addr);

View File

@@ -29,32 +29,6 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *params) {
cnl_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
}
static int ec_cmd(u8 value) {
int i = 1000000;
while ((inb(0x66) & 2) == 2 && i > 0) {
i -= 1;
}
if (i == 0) {
return 1;
} else {
outb(value, 0x66);
return 0;
}
}
static int ec_write(u8 value) {
int i = 1000000;
while ((inb(0x66) & 2) == 2 && i > 0) {
i -= 1;
}
if (i == 0) {
return 1;
} else {
outb(value, 0x62);
return 0;
}
}
static u8 superio_read(u8 reg) {
outb(reg, 0x2E);
return inb(0x2F);
@@ -93,17 +67,6 @@ static void mainboard_init(struct device *dev) {
printk(BIOS_INFO, "system76: EC init\n");
// Set USB power plane to off during restart
if (!ec_cmd(0x96)) {
if (!ec_write(0x00)) {
printk(BIOS_INFO, "system76: set USB power plane to off during restart\n");
} else {
printk(BIOS_INFO, "system76: failed to send USB power plane data\n");
}
} else {
printk(BIOS_INFO, "system76: failed to send USB power plane command\n");
}
// Black magic - force enable camera toggle
u16 addr = 0x01CA;
u8 value = i2ec_read(addr);