Tegra210: Add lost-in-merge fixes:
- misplaced '#ifdef notyet' in max77620.c - misnamed 'xusb_gate' clock in tegra210_clk_per.c
This commit is contained in:
parent
2edcc10cb1
commit
30ae416898
@ -396,10 +396,10 @@ max77620_attach(device_t dev)
|
||||
rv = 0;
|
||||
LOCK_INIT(sc);
|
||||
|
||||
#ifdef notyet /* Interrupt parent is not implemented */
|
||||
rid = 0;
|
||||
sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
|
||||
RF_ACTIVE);
|
||||
#ifdef notyet /* Interrupt parent is not implemented */
|
||||
if (sc->irq_res == NULL) {
|
||||
device_printf(dev, "Cannot allocate interrupt.\n");
|
||||
rv = ENXIO;
|
||||
|
@ -412,7 +412,7 @@ static struct pgate_def pgate_def[] = {
|
||||
GATE(EMC_IOBIST, "emc_iobist", "clk_m", W(10)),
|
||||
GATE(SATA_IOBIST, "sata_iobist", "clk_m", W(12)),
|
||||
GATE(MIPI_IOBIST, "mipi_iobist", "clk_m", W(13)),
|
||||
GATE(XUSB_GATE, "xusb", "clk_m", W(15)),
|
||||
GATE(XUSB_GATE, "xusb_gate", "clk_m", W(15)),
|
||||
GATE(CILAB, "cilab", "pc_cilab", W(16)),
|
||||
GATE(CILCD, "cilcd", "pc_cilcd", W(17)),
|
||||
GATE(CILE, "cilef", "pc_cilef", W(18)),
|
||||
|
Loading…
Reference in New Issue
Block a user