audio ok

hc

2023-12-11 223293205a7265c8b02882461ba8996650048ade

 kernel/include/linux/of_irq.h
..
..
@@ -32,10 +32,7 @@
32
32
 }
33
33
 #endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
34
34
 
35
-extern int of_irq_domain_map(const struct irq_fwspec *in, struct irq_fwspec *out);
36
35
 extern int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq);
37
-extern int of_irq_parse_one(struct device_node *device, int index,
38
-			  struct of_phandle_args *out_irq);
39
36
 extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data);
40
37
 extern int of_irq_to_resource(struct device_node *dev, int index,
41
38
 			      struct resource *r);
..
..
@@ -43,6 +40,8 @@
43
40
 extern void of_irq_init(const struct of_device_id *matches);
44
41
 
45
42
 #ifdef CONFIG_OF_IRQ
43
+extern int of_irq_parse_one(struct device_node *device, int index,
44
+			  struct of_phandle_args *out_irq);
46
45
 extern int of_irq_count(struct device_node *dev);
47
46
 extern int of_irq_get(struct device_node *dev, int index);
48
47
 extern int of_irq_get_byname(struct device_node *dev, const char *name);
..
..
@@ -53,10 +52,16 @@
53
52
 					    struct device_node *np,
54
53
 					    enum irq_domain_bus_token token);
55
54
 extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
56
-						       u32 rid);
55
+							u32 id,
56
+							u32 bus_token);
57
57
 extern void of_msi_configure(struct device *dev, struct device_node *np);
58
-u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
58
+u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in);
59
59
 #else
60
+static inline int of_irq_parse_one(struct device_node *device, int index,
61
+				   struct of_phandle_args *out_irq)
62
+{
63
+	return -EINVAL;
64
+}
60
65
 static inline int of_irq_count(struct device_node *dev)
61
66
 {
62
67
 	return 0;
..
..
@@ -86,17 +91,17 @@
86
91
 	return NULL;
87
92
 }
88
93
 static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
89
-							      u32 rid)
94
+						u32 id, u32 bus_token)
90
95
 {
91
96
 	return NULL;
92
97
 }
93
98
 static inline void of_msi_configure(struct device *dev, struct device_node *np)
94
99
 {
95
100
 }
96
-static inline u32 of_msi_map_rid(struct device *dev,
97
-				 struct device_node *msi_np, u32 rid_in)
101
+static inline u32 of_msi_map_id(struct device *dev,
102
+				 struct device_node *msi_np, u32 id_in)
98
103
 {
99
-	return rid_in;
104
+	return id_in;
100
105
 }
101
106
 #endif
102
107