evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

Browse source 
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  drivers/ide/palm_bk3710.c buildfix
  ide: fix Falcon IDE breakage
  ide: fix IDE PMAC breakage
This commit is contained in:
Linus Torvalds 2009-01-26 09:46:29 -08:00
commit 2927fceafc
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/ide/falconide.c
View file

@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = {
static const struct ide_port_info falconide_port_info = { static const struct ide_port_info falconide_port_info = {
.tp_ops = &falconide_tp_ops, .tp_ops = &falconide_tp_ops,
.host_flags = IDE_HFLAG_NO_DMA, .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE,
}; };
static void __init falconide_setup_ports(hw_regs_t *hw) static void __init falconide_setup_ports(hw_regs_t *hw)

3
drivers/ide/ide-probe.c
View file

@ -649,7 +649,8 @@ static int ide_register_port(ide_hwif_t *hwif)
/* register with global device tree */ /* register with global device tree */
dev_set_name(&hwif->gendev, hwif->name); dev_set_name(&hwif->gendev, hwif->name);
hwif->gendev.driver_data = hwif; hwif->gendev.driver_data = hwif;
hwif->gendev.parent = hwif->dev; if (hwif->gendev.parent == NULL)
hwif->gendev.parent = hwif->dev;
hwif->gendev.release = hwif_release_dev; hwif->gendev.release = hwif_release_dev;
ret = device_register(&hwif->gendev); ret = device_register(&hwif->gendev);

11
drivers/ide/palm_bk3710.c
View file

@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
{ {
struct clk *clk; struct clk *clk;
struct resource *mem, *irq; struct resource *mem, *irq;
unsigned long base, rate; void __iomem *base;
unsigned long rate;
int i, rc; int i, rc;
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
base = IO_ADDRESS(mem->start); base = IO_ADDRESS(mem->start);
/* Configure the Palm Chip controller */ /* Configure the Palm Chip controller */
palm_bk3710_chipinit((void __iomem *)base); palm_bk3710_chipinit(base);
for (i = 0; i < IDE_NR_PORTS - 2; i++) for (i = 0; i < IDE_NR_PORTS - 2; i++)
hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; hw.io_ports_array[i] = (unsigned long)
hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; (base + IDE_PALM_ATA_PRI_REG_OFFSET + i);
hw.io_ports.ctl_addr = (unsigned long)
(base + IDE_PALM_ATA_PRI_CTL_OFFSET);
hw.irq = irq->start; hw.irq = irq->start;
hw.dev = &pdev->dev; hw.dev = &pdev->dev;
hw.chipset = ide_palm3710; hw.chipset = ide_palm3710;