Commit fcc94683 authored by Paul Mackerras's avatar Paul Mackerras

PPC32: Fix ide_init_hwif_ports for powermac.

parent bc5cba36
...@@ -81,8 +81,9 @@ extern void pmac_read_rtc_time(void); ...@@ -81,8 +81,9 @@ extern void pmac_read_rtc_time(void);
extern void pmac_calibrate_decr(void); extern void pmac_calibrate_decr(void);
extern void pmac_pcibios_fixup(void); extern void pmac_pcibios_fixup(void);
extern void pmac_find_bridges(void); extern void pmac_find_bridges(void);
extern int pmac_ide_check_base(ide_ioreg_t base); extern unsigned long pmac_ide_get_base(int index);
extern ide_ioreg_t pmac_ide_get_base(int index); extern void pmac_ide_init_hwif_ports(hw_regs_t *hw,
unsigned long data_port, unsigned long ctrl_port, int *irq);
extern void pmac_nvram_update(void); extern void pmac_nvram_update(void);
extern unsigned char pmac_nvram_read_byte(int addr); extern unsigned char pmac_nvram_read_byte(int addr);
...@@ -630,6 +631,13 @@ pmac_init(unsigned long r3, unsigned long r4, unsigned long r5, ...@@ -630,6 +631,13 @@ pmac_init(unsigned long r3, unsigned long r4, unsigned long r5,
ppc_md.feature_call = pmac_do_feature_call; ppc_md.feature_call = pmac_do_feature_call;
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
#ifdef CONFIG_BLK_DEV_IDE_PMAC
ppc_ide_md.ide_init_hwif = pmac_ide_init_hwif_ports;
ppc_ide_md.default_io_base = pmac_ide_get_base;
#endif /* CONFIG_BLK_DEV_IDE_PMAC */
#endif /* defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) */
#ifdef CONFIG_BOOTX_TEXT #ifdef CONFIG_BOOTX_TEXT
ppc_md.progress = pmac_progress; ppc_md.progress = pmac_progress;
#endif /* CONFIG_BOOTX_TEXT */ #endif /* CONFIG_BOOTX_TEXT */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment