sparc32: Convert apc to OF driver. (7e7e2f03) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sparc/kernel/apc.c

+38 −34

Original line number	Diff line number	Diff line
		@@ -12,9 +12,10 @@
		#include <linux/miscdevice.h>
		#include <linux/smp_lock.h>
		#include <linux/pm.h>
		#include <linux/of.h>
		#include <linux/of_device.h>

		#include <asm/io.h>
		#include <asm/sbus.h>
		#include <asm/oplib.h>
		#include <asm/uaccess.h>
		#include <asm/auxio.h>
		@@ -29,8 +30,7 @@
		#define APC_OBPNAME "power-management"
		#define APC_DEVNAME "apc"

		volatile static u8 __iomem *regs;
		static int apc_regsize;
		static u8 __iomem *regs;
		static int apc_no_idle __initdata = 0;

		#define apc_readb(offs) (sbus_readb(regs+offs))
		@@ -69,9 +69,9 @@ static void apc_swift_idle(void)
		#endif
		}

		static inline void apc_free(void)
		static inline void apc_free(struct of_device *op)
		{
		sbus_iounmap(regs, apc_regsize);
		of_iounmap(&op->resource[0], regs, resource_size(&op->resource[0]));
		}

		static int apc_open(struct inode inode, struct file f)
		@@ -153,37 +153,22 @@ static const struct file_operations apc_fops = {

		static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };

		static int __init apc_probe(void)
		static int __devinit apc_probe(struct of_device *op,
		const struct of_device_id *match)
		{
		struct sbus_bus *sbus = NULL;
		struct sbus_dev *sdev = NULL;
		int iTmp = 0;
		int err;

		for_each_sbus(sbus) {
		for_each_sbusdev(sdev, sbus) {
		if (!strcmp(sdev->prom_name, APC_OBPNAME)) {
		goto sbus_done;
		}
		}
		}

		sbus_done:
		if (!sdev) {
		return -ENODEV;
		}

		apc_regsize = sdev->reg_addrs[0].reg_size;
		regs = sbus_ioremap(&sdev->resource[0], 0,
		apc_regsize, APC_OBPNAME);
		regs = of_ioremap(&op->resource[0], 0,
		resource_size(&op->resource[0]), APC_OBPNAME);
		if (!regs) {
		printk(KERN_ERR "%s: unable to map registers\n", APC_DEVNAME);
		return -ENODEV;
		}

		iTmp = misc_register(&apc_miscdev);
		if (iTmp != 0) {
		err = misc_register(&apc_miscdev);
		if (err) {
		printk(KERN_ERR "%s: unable to register device\n", APC_DEVNAME);
		apc_free();
		apc_free(op);
		return -ENODEV;
		}

		@@ -193,12 +178,31 @@ sbus_done:

		printk(KERN_INFO "%s: power management initialized%s\n",
		APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : "");

		return 0;
		}

		static struct of_device_id apc_match[] = {
		{
		.name = APC_OBPNAME,
		},
		{},
		};
		MODULE_DEVICE_TABLE(of, apc_match);

		static struct of_platform_driver apc_driver = {
		.name = "apc",
		.match_table = apc_match,
		.probe = apc_probe,
		};

		static int __init apc_init(void)
		{
		return of_register_driver(&apc_driver, &of_bus_type);
		}

		/* This driver is not critical to the boot process
		* and is easiest to ioremap when SBus is already
		* initialized, so we install ourselves thusly:
		*/
		__initcall(apc_probe);

		__initcall(apc_init);