ide/macide: Convert Mac IDE driver to platform driver (50c5feee) · Commits · 戴 / test

arch/m68k/configs/mac_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ CONFIG_DUMMY_IRQ=m
		CONFIG_IDE=y
		CONFIG_IDE_GD_ATAPI=y
		CONFIG_BLK_DEV_IDECD=y
		CONFIG_BLK_DEV_PLATFORM=y
		CONFIG_BLK_DEV_MAC_IDE=y
		CONFIG_RAID_ATTRS=m
		CONFIG_SCSI=y

arch/m68k/configs/multi_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -346,6 +346,7 @@ CONFIG_DUMMY_IRQ=m
		CONFIG_IDE=y
		CONFIG_IDE_GD_ATAPI=y
		CONFIG_BLK_DEV_IDECD=y
		CONFIG_BLK_DEV_PLATFORM=y
		CONFIG_BLK_DEV_GAYLE=y
		CONFIG_BLK_DEV_BUDDHA=y
		CONFIG_BLK_DEV_FALCON_IDE=y

arch/m68k/mac/config.c

+41 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <linux/init.h>
		#include <linux/vt_kern.h>
		#include <linux/platform_device.h>
		#include <linux/ata_platform.h>
		#include <linux/adb.h>
		#include <linux/cuda.h>
		#include <linux/pmu.h>
		@@ -940,6 +941,26 @@ static const struct resource mac_scsi_ccl_rsrc[] __initconst = {
		},
		};

		static const struct resource mac_ide_quadra_rsrc[] __initconst = {
		DEFINE_RES_MEM(0x50F1A000, 0x104),
		DEFINE_RES_IRQ(IRQ_NUBUS_F),
		};

		static const struct resource mac_ide_pb_rsrc[] __initconst = {
		DEFINE_RES_MEM(0x50F1A000, 0x104),
		DEFINE_RES_IRQ(IRQ_NUBUS_C),
		};

		static const struct resource mac_pata_baboon_rsrc[] __initconst = {
		DEFINE_RES_MEM(0x50F1A000, 0x38),
		DEFINE_RES_MEM(0x50F1A038, 0x04),
		DEFINE_RES_IRQ(IRQ_BABOON_1),
		};

		static const struct pata_platform_info mac_pata_baboon_data __initconst = {
		.ioport_shift = 2,
		};

		int __init mac_platform_init(void)
		{
		phys_addr_t swim_base = 0;
		@@ -1048,6 +1069,26 @@ int __init mac_platform_init(void)
		break;
		}

		/*
		* IDE device
		*/

		switch (macintosh_config->ide_type) {
		case MAC_IDE_QUADRA:
		platform_device_register_simple("mac_ide", -1,
		mac_ide_quadra_rsrc, ARRAY_SIZE(mac_ide_quadra_rsrc));
		break;
		case MAC_IDE_PB:
		platform_device_register_simple("mac_ide", -1,
		mac_ide_pb_rsrc, ARRAY_SIZE(mac_ide_pb_rsrc));
		break;
		case MAC_IDE_BABOON:
		platform_device_register_resndata(NULL, "pata_platform", -1,
		mac_pata_baboon_rsrc, ARRAY_SIZE(mac_pata_baboon_rsrc),
		&mac_pata_baboon_data, sizeof(mac_pata_baboon_data));
		break;
		}

		/*
		* Ethernet device
		*/

drivers/ide/Kconfig

+4 −3

Original line number	Diff line number	Diff line
		@@ -744,9 +744,10 @@ config BLK_DEV_MAC_IDE
		depends on MAC
		help
		This is the IDE driver for the on-board IDE interface on some m68k
		Macintosh models. It supports both the `Quadra style' (used in
		Quadra/ Centris 630 and Performa 588 models) and `Powerbook style'
		(used in the Powerbook 150 and 190 models) IDE interface.
		Macintosh models, namely Quadra/Centris 630, Performa 588 and
		Powerbook 150. The IDE interface on the Powerbook 190 is not
		supported by this driver and requires BLK_DEV_PLATFORM or
		PATA_PLATFORM.

		Say Y if you have such an Macintosh model and want to use IDE
		devices (hard disks, CD-ROM drives, etc.) that are connected to the

drivers/ide/macide.c

+43 −23

Original line number	Diff line number	Diff line
		@@ -18,10 +18,11 @@
		#include <linux/delay.h>
		#include <linux/ide.h>
		#include <linux/module.h>
		#include <linux/platform_device.h>

		#include <asm/macintosh.h>
		#include <asm/macints.h>
		#include <asm/mac_baboon.h>

		#define DRV_NAME "mac_ide"

		#define IDE_BASE 0x50F1A000 /* Base address of IDE controller */

		@@ -100,42 +101,61 @@ static const char *mac_ide_name[] =
		* Probe for a Macintosh IDE interface
		*/

		static int __init macide_init(void)
		static int mac_ide_probe(struct platform_device *pdev)
		{
		unsigned long base;
		int irq;
		struct resource mem, irq;
		struct ide_hw hw, *hws[] = { &hw };
		struct ide_port_info d = macide_port_info;
		struct ide_host *host;
		int rc;

		if (!MACH_IS_MAC)
		return -ENODEV;

		switch (macintosh_config->ide_type) {
		case MAC_IDE_QUADRA:
		base = IDE_BASE;
		irq = IRQ_NUBUS_F;
		break;
		case MAC_IDE_PB:
		base = IDE_BASE;
		irq = IRQ_NUBUS_C;
		break;
		case MAC_IDE_BABOON:
		base = BABOON_BASE;
		d.port_ops = NULL;
		irq = IRQ_BABOON_1;
		break;
		default:
		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!mem)
		return -ENODEV;

		irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
		if (!irq)
		return -ENODEV;

		if (!devm_request_mem_region(&pdev->dev, mem->start,
		resource_size(mem), DRV_NAME)) {
		dev_err(&pdev->dev, "resources busy\n");
		return -EBUSY;
		}

		printk(KERN_INFO "ide: Macintosh %s IDE controller\n",
		mac_ide_name[macintosh_config->ide_type - 1]);

		macide_setup_ports(&hw, base, irq);
		macide_setup_ports(&hw, mem->start, irq->start);

		return ide_host_add(&d, hws, 1, NULL);
		rc = ide_host_add(&d, hws, 1, &host);
		if (rc)
		return rc;

		platform_set_drvdata(pdev, host);
		return 0;
		}

		module_init(macide_init);
		static int mac_ide_remove(struct platform_device *pdev)
		{
		struct ide_host *host = platform_get_drvdata(pdev);

		ide_host_remove(host);
		return 0;
		}

		static struct platform_driver mac_ide_driver = {
		.driver = {
		.name = DRV_NAME,
		},
		.probe = mac_ide_probe,
		.remove = mac_ide_remove,
		};

		module_platform_driver(mac_ide_driver);

		MODULE_ALIAS("platform:" DRV_NAME);
		MODULE_LICENSE("GPL");

Admin message