amd7930: Convert to pure OF driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

amd7930: Convert to pure OF driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller
1 parent 5dc2536bb8
Showing 1 changed file with 20 additions and 63 deletions Side-by-side Diff
sound/sparc/amd7930.c
 /*
  * Driver for AMD7930 sound chips found on Sparcs.
- * Copyright (C) 2002 David S. Miller <davem@redhat.com>
+ * Copyright (C) 2002, 2008 David S. Miller <davem@davemloft.net>
  *
  * Based entirely upon drivers/sbus/audio/amd7930.c which is:
  * Copyright (C) 1996,1997 Thomas K. Dyas (tdyas@eden.rutgers.edu)
@@ -35,6 +35,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
  
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -44,7 +46,6 @@
  
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sbus.h>
 #include <asm/prom.h>
  
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
  
@@ -335,8 +336,8 @@
 	int			pgain;
 	int			mgain;
  
+	struct of_device	*op;
 	unsigned int		irq;
-	unsigned int		regs_size;
 	struct snd_amd7930	*next;
 };
  
  
@@ -920,13 +921,16 @@
  
 static int snd_amd7930_free(struct snd_amd7930 *amd)
 {
+	struct of_device *op = amd->op;
+
 	amd7930_idle(amd);
  
 	if (amd->irq)
 		free_irq(amd->irq, amd);
  
 	if (amd->regs)
-		sbus_iounmap(amd->regs, amd->regs_size);
+		of_iounmap(&op->resource[0], amd->regs,
+			   resource_size(&op->resource[0]));
  
 	kfree(amd);
  
  
  
@@ -945,13 +949,12 @@
 };
  
 static int __devinit snd_amd7930_create(struct snd_card *card,
-					struct resource *rp,
-					unsigned int reg_size,
+					struct of_device *op,
 					int irq, int dev,
 					struct snd_amd7930 **ramd)
 {
-	unsigned long flags;
 	struct snd_amd7930 *amd;
+	unsigned long flags;
 	int err;
  
 	*ramd = NULL;
  
@@ -961,9 +964,10 @@
  
 	spin_lock_init(&amd->lock);
 	amd->card = card;
-	amd->regs_size = reg_size;
+	amd->op = op;
  
-	amd->regs = sbus_ioremap(rp, 0, amd->regs_size, "amd7930");
+	amd->regs = of_ioremap(&op->resource[0], 0,
+			       resource_size(&op->resource[0]), "amd7930");
 	if (!amd->regs) {
 		snd_printk("amd7930-%d: Unable to map chip registers.\n", dev);
 		return -EIO;
  
  
  
@@ -1012,13 +1016,16 @@
 	return 0;
 }
  
-static int __devinit amd7930_attach_common(struct resource *rp, int irq)
+static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
+	struct resource *rp = &op->resource[0];
 	static int dev_num;
 	struct snd_card *card;
 	struct snd_amd7930 *amd;
-	int err;
+	int err, irq;
  
+	irq = op->irqs[0];
+
 	if (dev_num >= SNDRV_CARDS)
 		return -ENODEV;
 	if (!enable[dev_num]) {
@@ -1038,8 +1045,7 @@
 		(unsigned long long)rp->start,
 		irq);
  
-	if ((err = snd_amd7930_create(card, rp,
-				      (rp->end - rp->start) + 1,
+	if ((err = snd_amd7930_create(card, op,
 				      irq, dev_num, &amd)) < 0)
 		goto out_err;
  
@@ -1064,42 +1070,6 @@
 	return err;
 }
  
-static int __devinit amd7930_obio_attach(struct device_node *dp)
-{
-	const struct linux_prom_registers *regs;
-	const struct linux_prom_irqs *irqp;
-	struct resource res, *rp;
-	int len;
-
-	irqp = of_get_property(dp, "intr", &len);
-	if (!irqp) {
-		snd_printk("%s: Firmware node lacks IRQ property.\n",
-			   dp->full_name);
-		return -ENODEV;
-	}
-
-	regs = of_get_property(dp, "reg", &len);
-	if (!regs) {
-		snd_printk("%s: Firmware node lacks register property.\n",
-			   dp->full_name);
-		return -ENODEV;
-	}
-
-	rp = &res;
-	rp->start = regs->phys_addr;
-	rp->end = rp->start + regs->reg_size - 1;
-	rp->flags = IORESOURCE_IO | (regs->which_io & 0xff);
-
-	return amd7930_attach_common(rp, irqp->pri);
-}
-
-static int __devinit amd7930_sbus_probe(struct of_device *dev, const struct of_device_id *match)
-{
-	struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-
-	return amd7930_attach_common(&sdev->resource[0], sdev->irqs[0]);
-}
-
 static struct of_device_id amd7930_match[] = {
 	{
 		.name = "audio",
@@ -1115,20 +1085,7 @@
  
 static int __init amd7930_init(void)
 {
-	struct device_node *dp;
-
-	/* Try to find the sun4c "audio" node first. */
-	dp = of_find_node_by_path("/");
-	dp = dp->child;
-	while (dp) {
-		if (!strcmp(dp->name, "audio"))
-			amd7930_obio_attach(dp);
-
-		dp = dp->sibling;
-	}
-
-	/* Probe each SBUS for amd7930 chips. */
-	return of_register_driver(&amd7930_sbus_driver, &sbus_bus_type);
+	return of_register_driver(&amd7930_sbus_driver, &of_bus_type);
 }
  
 static void __exit amd7930_exit(void)
1	1	/*
2	2	* Driver for AMD7930 sound chips found on Sparcs.
3		- * Copyright (C) 2002 David S. Miller <davem@redhat.com>
	3	+ * Copyright (C) 2002, 2008 David S. Miller <davem@davemloft.net>
4	4	*
5	5	* Based entirely upon drivers/sbus/audio/amd7930.c which is:
6	6	* Copyright (C) 1996,1997 Thomas K. Dyas (tdyas@eden.rutgers.edu)
...	...	@@ -35,6 +35,8 @@
35	35	#include <linux/init.h>
36	36	#include <linux/interrupt.h>
37	37	#include <linux/moduleparam.h>
	38	+#include <linux/of.h>
	39	+#include <linux/of_device.h>
38	40
39	41	#include <sound/core.h>
40	42	#include <sound/pcm.h>
...	...	@@ -44,7 +46,6 @@
44	46
45	47	#include <asm/io.h>
46	48	#include <asm/irq.h>
47		-#include <asm/sbus.h>
48	49	#include <asm/prom.h>
49	50
50	51	static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
51	52
...	...	@@ -335,8 +336,8 @@
335	336	int pgain;
336	337	int mgain;
337	338
	339	+ struct of_device *op;
338	340	unsigned int irq;
339		- unsigned int regs_size;
340	341	struct snd_amd7930 *next;
341	342	};
342	343
343	344
...	...	@@ -920,13 +921,16 @@
920	921
921	922	static int snd_amd7930_free(struct snd_amd7930 *amd)
922	923	{
	924	+ struct of_device *op = amd->op;
	925	+
923	926	amd7930_idle(amd);
924	927
925	928	if (amd->irq)
926	929	free_irq(amd->irq, amd);
927	930
928	931	if (amd->regs)
929		- sbus_iounmap(amd->regs, amd->regs_size);
	932	+ of_iounmap(&op->resource[0], amd->regs,
	933	+ resource_size(&op->resource[0]));
930	934
931	935	kfree(amd);
932	936
933	937
934	938
...	...	@@ -945,13 +949,12 @@
945	949	};
946	950
947	951	static int __devinit snd_amd7930_create(struct snd_card *card,
948		- struct resource *rp,
949		- unsigned int reg_size,
	952	+ struct of_device *op,
950	953	int irq, int dev,
951	954	struct snd_amd7930 **ramd)
952	955	{
953		- unsigned long flags;
954	956	struct snd_amd7930 *amd;
	957	+ unsigned long flags;
955	958	int err;
956	959
957	960	*ramd = NULL;
958	961
...	...	@@ -961,9 +964,10 @@
961	964
962	965	spin_lock_init(&amd->lock);
963	966	amd->card = card;
964		- amd->regs_size = reg_size;
	967	+ amd->op = op;
965	968
966		- amd->regs = sbus_ioremap(rp, 0, amd->regs_size, "amd7930");
	969	+ amd->regs = of_ioremap(&op->resource[0], 0,
	970	+ resource_size(&op->resource[0]), "amd7930");
967	971	if (!amd->regs) {
968	972	snd_printk("amd7930-%d: Unable to map chip registers.\n", dev);
969	973	return -EIO;
970	974
971	975
972	976
...	...	@@ -1012,13 +1016,16 @@
1012	1016	return 0;
1013	1017	}
1014	1018
1015		-static int __devinit amd7930_attach_common(struct resource *rp, int irq)
	1019	+static int __devinit amd7930_sbus_probe(struct of_device op, const struct of_device_id match)
1016	1020	{
	1021	+ struct resource *rp = &op->resource[0];
1017	1022	static int dev_num;
1018	1023	struct snd_card *card;
1019	1024	struct snd_amd7930 *amd;
1020		- int err;
	1025	+ int err, irq;
1021	1026
	1027	+ irq = op->irqs[0];
	1028	+
1022	1029	if (dev_num >= SNDRV_CARDS)
1023	1030	return -ENODEV;
1024	1031	if (!enable[dev_num]) {
...	...	@@ -1038,8 +1045,7 @@
1038	1045	(unsigned long long)rp->start,
1039	1046	irq);
1040	1047
1041		- if ((err = snd_amd7930_create(card, rp,
1042		- (rp->end - rp->start) + 1,
	1048	+ if ((err = snd_amd7930_create(card, op,
1043	1049	irq, dev_num, &amd)) < 0)
1044	1050	goto out_err;
1045	1051
...	...	@@ -1064,42 +1070,6 @@
1064	1070	return err;
1065	1071	}
1066	1072
1067		-static int __devinit amd7930_obio_attach(struct device_node *dp)
1068		-{
1069		- const struct linux_prom_registers *regs;
1070		- const struct linux_prom_irqs *irqp;
1071		- struct resource res, *rp;
1072		- int len;
1073		-
1074		- irqp = of_get_property(dp, "intr", &len);
1075		- if (!irqp) {
1076		- snd_printk("%s: Firmware node lacks IRQ property.\n",
1077		- dp->full_name);
1078		- return -ENODEV;
1079		- }
1080		-
1081		- regs = of_get_property(dp, "reg", &len);
1082		- if (!regs) {
1083		- snd_printk("%s: Firmware node lacks register property.\n",
1084		- dp->full_name);
1085		- return -ENODEV;
1086		- }
1087		-
1088		- rp = &res;
1089		- rp->start = regs->phys_addr;
1090		- rp->end = rp->start + regs->reg_size - 1;
1091		- rp->flags = IORESOURCE_IO \| (regs->which_io & 0xff);
1092		-
1093		- return amd7930_attach_common(rp, irqp->pri);
1094		-}
1095		-
1096		-static int __devinit amd7930_sbus_probe(struct of_device dev, const struct of_device_id match)
1097		-{
1098		- struct sbus_dev *sdev = to_sbus_device(&dev->dev);
1099		-
1100		- return amd7930_attach_common(&sdev->resource[0], sdev->irqs[0]);
1101		-}
1102		-
1103	1073	static struct of_device_id amd7930_match[] = {
1104	1074	{
1105	1075	.name = "audio",
...	...	@@ -1115,20 +1085,7 @@
1115	1085
1116	1086	static int __init amd7930_init(void)
1117	1087	{
1118		- struct device_node *dp;
1119		-
1120		- /* Try to find the sun4c "audio" node first. */
1121		- dp = of_find_node_by_path("/");
1122		- dp = dp->child;
1123		- while (dp) {
1124		- if (!strcmp(dp->name, "audio"))
1125		- amd7930_obio_attach(dp);
1126		-
1127		- dp = dp->sibling;
1128		- }
1129		-
1130		- /* Probe each SBUS for amd7930 chips. */
1131		- return of_register_driver(&amd7930_sbus_driver, &sbus_bus_type);
	1088	+ return of_register_driver(&amd7930_sbus_driver, &of_bus_type);
1132	1089	}
1133	1090
1134	1091	static void __exit amd7930_exit(void)