A set of cleanups for the generic interrupt subsystem:
- Consolidate on one set of functions for the interrupt domain code to
get rid of pointlessly duplicated code with only marginal different
semantics.
- Update the documentation accordingly and consolidate the coding style
of the irqdomain header.
-----BEGIN PGP SIGNATURE-----
iQJHBAABCgAxFiEEQp8+kY+LLUocC4bMphj1TA10mKEFAmgzd+MTHHRnbHhAbGlu
dXRyb25peC5kZQAKCRCmGPVMDXSYodTRD/0RmG5tngCbEJmTw6lPDQzRZH4OO3ja
yRYlyBipemoRmvJRGjV4uHqN2QPrdOuoqMuyBO1aWcMdkpww5bAHcbgSFrlGM1lW
kqtaxVMbufPiLQSGYe7OQf478CE1ykoBd5Va8whFKrtA73qEUdEMfWT0stspg780
7BlmQOemL91p7Ytf03FbDdo8tZ5Xu9uXGAulwY9FZsFtsCNyvhl7nOv5Sk8ZQtGO
xHRCeunjZLWR+IaK59hdakvQybXwSnjT6jODp96nlyKABEKSPShGSPFDWd3g9px7
4911QwgnvTbcrsk6YmQEmPIOgXZzypjbnjpJr8tFpTbkVIy+6chi5cBJzXoqsUaM
ylTwFcUQNvcP8yF447qb+nyPFKM5xsC07W0UpZMuJUDmhhPRtDm5pK0jpsif96GP
l4aMsWe65PUmXHQqLdE89RJXAa8XQ2qspKVtNKq9DmEVgTviQ09Z9SSQIx4U0yIx
w+YPde8kH2+O+YtMUn/MmfHhUP4MKya7j5zd8Bnv8wLBi7XGPPA5EKKh9I0dz9m+
X94lweNXyH+Q8U9mt2cQf8VG8Yzgk0eeC0sliJIlybwRgEgRcQbVWw0VvZUA1ySa
VBlaj3SinO90FEQ0CctT51ss2mUJ/XsGCnxpiGZXfqIZzFbyD1YfZQnXJH0H67DI
CqdHw22I27Mu/A==
=9nLp
-----END PGP SIGNATURE-----
Merge tag 'irq-cleanups-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq cleanups from Thomas Gleixner:
"A set of cleanups for the generic interrupt subsystem:
- Consolidate on one set of functions for the interrupt domain code
to get rid of pointlessly duplicated code with only marginal
different semantics.
- Update the documentation accordingly and consolidate the coding
style of the irqdomain header"
* tag 'irq-cleanups-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
irqdomain: Consolidate coding style
irqdomain: Fix kernel-doc and add it to Documentation
Documentation: irqdomain: Update it
Documentation: irq-domain.rst: Simple improvements
Documentation: irq/concepts: Minor improvements
Documentation: irq/concepts: Add commas and reflow
irqdomain: Improve kernel-docs of functions
irqdomain: Make struct irq_domain_info variables const
irqdomain: Use irq_domain_instantiate()'s return value as initializers
irqdomain: Drop irq_linear_revmap()
pinctrl: keembay: Switch to irq_find_mapping()
irqchip/armada-370-xp: Switch to irq_find_mapping()
gpu: ipu-v3: Switch to irq_find_mapping()
gpio: idt3243x: Switch to irq_find_mapping()
sh: Switch to irq_find_mapping()
powerpc: Switch to irq_find_mapping()
irqdomain: Drop irq_domain_add_*() functions
powerpc: Switch irq_domain_add_nomap() to use fwnode
thermal: Switch to irq_domain_create_linear()
soc: Switch to irq_domain_create_*()
...
pull/1250/head
Linus Torvalds
commit
2bd1bea5fa
|
|
@ -410,8 +410,6 @@ which are used in the generic IRQ layer.
|
|||
.. kernel-doc:: include/linux/interrupt.h
|
||||
:internal:
|
||||
|
||||
.. kernel-doc:: include/linux/irqdomain.h
|
||||
|
||||
Public Functions Provided
|
||||
=========================
|
||||
|
||||
|
|
|
|||
|
|
@ -2,23 +2,24 @@
|
|||
What is an IRQ?
|
||||
===============
|
||||
|
||||
An IRQ is an interrupt request from a device.
|
||||
Currently they can come in over a pin, or over a packet.
|
||||
Several devices may be connected to the same pin thus
|
||||
sharing an IRQ.
|
||||
An IRQ is an interrupt request from a device. Currently, they can come
|
||||
in over a pin, or over a packet. Several devices may be connected to
|
||||
the same pin thus sharing an IRQ. Such as on legacy PCI bus: All devices
|
||||
typically share 4 lanes/pins. Note that each device can request an
|
||||
interrupt on each of the lanes.
|
||||
|
||||
An IRQ number is a kernel identifier used to talk about a hardware
|
||||
interrupt source. Typically this is an index into the global irq_desc
|
||||
array, but except for what linux/interrupt.h implements the details
|
||||
are architecture specific.
|
||||
interrupt source. Typically, this is an index into the global irq_desc
|
||||
array or sparse_irqs tree. But except for what linux/interrupt.h
|
||||
implements, the details are architecture specific.
|
||||
|
||||
An IRQ number is an enumeration of the possible interrupt sources on a
|
||||
machine. Typically what is enumerated is the number of input pins on
|
||||
all of the interrupt controller in the system. In the case of ISA
|
||||
what is enumerated are the 16 input pins on the two i8259 interrupt
|
||||
controllers.
|
||||
machine. Typically, what is enumerated is the number of input pins on
|
||||
all of the interrupt controllers in the system. In the case of ISA,
|
||||
what is enumerated are the 8 input pins on each of the two i8259
|
||||
interrupt controllers.
|
||||
|
||||
Architectures can assign additional meaning to the IRQ numbers, and
|
||||
are encouraged to in the case where there is any manual configuration
|
||||
of the hardware involved. The ISA IRQs are a classic example of
|
||||
are encouraged to in the case where there is any manual configuration
|
||||
of the hardware involved. The ISA IRQs are a classic example of
|
||||
assigning this kind of additional meaning.
|
||||
|
|
|
|||
|
|
@ -1,59 +1,77 @@
|
|||
===============================================
|
||||
The irq_domain interrupt number mapping library
|
||||
The irq_domain Interrupt Number Mapping Library
|
||||
===============================================
|
||||
|
||||
The current design of the Linux kernel uses a single large number
|
||||
space where each separate IRQ source is assigned a different number.
|
||||
This is simple when there is only one interrupt controller, but in
|
||||
systems with multiple interrupt controllers the kernel must ensure
|
||||
space where each separate IRQ source is assigned a unique number.
|
||||
This is simple when there is only one interrupt controller. But in
|
||||
systems with multiple interrupt controllers, the kernel must ensure
|
||||
that each one gets assigned non-overlapping allocations of Linux
|
||||
IRQ numbers.
|
||||
|
||||
The number of interrupt controllers registered as unique irqchips
|
||||
show a rising tendency: for example subdrivers of different kinds
|
||||
shows a rising tendency. For example, subdrivers of different kinds
|
||||
such as GPIO controllers avoid reimplementing identical callback
|
||||
mechanisms as the IRQ core system by modelling their interrupt
|
||||
handlers as irqchips, i.e. in effect cascading interrupt controllers.
|
||||
handlers as irqchips. I.e. in effect cascading interrupt controllers.
|
||||
|
||||
Here the interrupt number loose all kind of correspondence to
|
||||
hardware interrupt numbers: whereas in the past, IRQ numbers could
|
||||
be chosen so they matched the hardware IRQ line into the root
|
||||
interrupt controller (i.e. the component actually fireing the
|
||||
interrupt line to the CPU) nowadays this number is just a number.
|
||||
So in the past, IRQ numbers could be chosen so that they match the
|
||||
hardware IRQ line into the root interrupt controller (i.e. the
|
||||
component actually firing the interrupt line to the CPU). Nowadays,
|
||||
this number is just a number and the number loose all kind of
|
||||
correspondence to hardware interrupt numbers.
|
||||
|
||||
For this reason we need a mechanism to separate controller-local
|
||||
interrupt numbers, called hardware irq's, from Linux IRQ numbers.
|
||||
For this reason, we need a mechanism to separate controller-local
|
||||
interrupt numbers, called hardware IRQs, from Linux IRQ numbers.
|
||||
|
||||
The irq_alloc_desc*() and irq_free_desc*() APIs provide allocation of
|
||||
irq numbers, but they don't provide any support for reverse mapping of
|
||||
IRQ numbers, but they don't provide any support for reverse mapping of
|
||||
the controller-local IRQ (hwirq) number into the Linux IRQ number
|
||||
space.
|
||||
|
||||
The irq_domain library adds mapping between hwirq and IRQ numbers on
|
||||
top of the irq_alloc_desc*() API. An irq_domain to manage mapping is
|
||||
preferred over interrupt controller drivers open coding their own
|
||||
The irq_domain library adds a mapping between hwirq and IRQ numbers on
|
||||
top of the irq_alloc_desc*() API. An irq_domain to manage the mapping
|
||||
is preferred over interrupt controller drivers open coding their own
|
||||
reverse mapping scheme.
|
||||
|
||||
irq_domain also implements translation from an abstract irq_fwspec
|
||||
structure to hwirq numbers (Device Tree and ACPI GSI so far), and can
|
||||
be easily extended to support other IRQ topology data sources.
|
||||
irq_domain also implements a translation from an abstract struct
|
||||
irq_fwspec to hwirq numbers (Device Tree, non-DT firmware node, ACPI
|
||||
GSI, and software node so far), and can be easily extended to support
|
||||
other IRQ topology data sources. The implementation is performed
|
||||
without any extra platform support code.
|
||||
|
||||
irq_domain usage
|
||||
irq_domain Usage
|
||||
================
|
||||
struct irq_domain could be defined as an irq domain controller. That
|
||||
is, it handles the mapping between hardware and virtual interrupt
|
||||
numbers for a given interrupt domain. The domain structure is
|
||||
generally created by the PIC code for a given PIC instance (though a
|
||||
domain can cover more than one PIC if they have a flat number model).
|
||||
It is the domain callbacks that are responsible for setting the
|
||||
irq_chip on a given irq_desc after it has been mapped.
|
||||
|
||||
An interrupt controller driver creates and registers an irq_domain by
|
||||
calling one of the irq_domain_add_*() or irq_domain_create_*() functions
|
||||
(each mapping method has a different allocator function, more on that later).
|
||||
The function will return a pointer to the irq_domain on success. The caller
|
||||
must provide the allocator function with an irq_domain_ops structure.
|
||||
The host code and data structures use a fwnode_handle pointer to
|
||||
identify the domain. In some cases, and in order to preserve source
|
||||
code compatibility, this fwnode pointer is "upgraded" to a DT
|
||||
device_node. For those firmware infrastructures that do not provide a
|
||||
unique identifier for an interrupt controller, the irq_domain code
|
||||
offers a fwnode allocator.
|
||||
|
||||
An interrupt controller driver creates and registers a struct irq_domain
|
||||
by calling one of the irq_domain_create_*() functions (each mapping
|
||||
method has a different allocator function, more on that later). The
|
||||
function will return a pointer to the struct irq_domain on success. The
|
||||
caller must provide the allocator function with a struct irq_domain_ops
|
||||
pointer.
|
||||
|
||||
In most cases, the irq_domain will begin empty without any mappings
|
||||
between hwirq and IRQ numbers. Mappings are added to the irq_domain
|
||||
by calling irq_create_mapping() which accepts the irq_domain and a
|
||||
hwirq number as arguments. If a mapping for the hwirq doesn't already
|
||||
exist then it will allocate a new Linux irq_desc, associate it with
|
||||
the hwirq, and call the .map() callback so the driver can perform any
|
||||
required hardware setup.
|
||||
hwirq number as arguments. If a mapping for the hwirq doesn't already
|
||||
exist, irq_create_mapping() allocates a new Linux irq_desc, associates
|
||||
it with the hwirq, and calls the :c:member:`irq_domain_ops.map()`
|
||||
callback. In there, the driver can perform any required hardware
|
||||
setup.
|
||||
|
||||
Once a mapping has been established, it can be retrieved or used via a
|
||||
variety of methods:
|
||||
|
|
@ -63,8 +81,6 @@ variety of methods:
|
|||
mapping.
|
||||
- irq_find_mapping() returns a Linux IRQ number for a given domain and
|
||||
hwirq number, and 0 if there was no mapping
|
||||
- irq_linear_revmap() is now identical to irq_find_mapping(), and is
|
||||
deprecated
|
||||
- generic_handle_domain_irq() handles an interrupt described by a
|
||||
domain and a hwirq number
|
||||
|
||||
|
|
@ -77,9 +93,10 @@ be allocated.
|
|||
|
||||
If the driver has the Linux IRQ number or the irq_data pointer, and
|
||||
needs to know the associated hwirq number (such as in the irq_chip
|
||||
callbacks) then it can be directly obtained from irq_data->hwirq.
|
||||
callbacks) then it can be directly obtained from
|
||||
:c:member:`irq_data.hwirq`.
|
||||
|
||||
Types of irq_domain mappings
|
||||
Types of irq_domain Mappings
|
||||
============================
|
||||
|
||||
There are several mechanisms available for reverse mapping from hwirq
|
||||
|
|
@ -92,7 +109,6 @@ Linear
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_linear()
|
||||
irq_domain_create_linear()
|
||||
|
||||
The linear reverse map maintains a fixed size table indexed by the
|
||||
|
|
@ -105,19 +121,13 @@ map are fixed time lookup for IRQ numbers, and irq_descs are only
|
|||
allocated for in-use IRQs. The disadvantage is that the table must be
|
||||
as large as the largest possible hwirq number.
|
||||
|
||||
irq_domain_add_linear() and irq_domain_create_linear() are functionally
|
||||
equivalent, except for the first argument is different - the former
|
||||
accepts an Open Firmware specific 'struct device_node', while the latter
|
||||
accepts a more general abstraction 'struct fwnode_handle'.
|
||||
|
||||
The majority of drivers should use the linear map.
|
||||
The majority of drivers should use the Linear map.
|
||||
|
||||
Tree
|
||||
----
|
||||
|
||||
::
|
||||
|
||||
irq_domain_add_tree()
|
||||
irq_domain_create_tree()
|
||||
|
||||
The irq_domain maintains a radix tree map from hwirq numbers to Linux
|
||||
|
|
@ -129,11 +139,6 @@ since it doesn't need to allocate a table as large as the largest
|
|||
hwirq number. The disadvantage is that hwirq to IRQ number lookup is
|
||||
dependent on how many entries are in the table.
|
||||
|
||||
irq_domain_add_tree() and irq_domain_create_tree() are functionally
|
||||
equivalent, except for the first argument is different - the former
|
||||
accepts an Open Firmware specific 'struct device_node', while the latter
|
||||
accepts a more general abstraction 'struct fwnode_handle'.
|
||||
|
||||
Very few drivers should need this mapping.
|
||||
|
||||
No Map
|
||||
|
|
@ -141,7 +146,7 @@ No Map
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_nomap()
|
||||
irq_domain_create_nomap()
|
||||
|
||||
The No Map mapping is to be used when the hwirq number is
|
||||
programmable in the hardware. In this case it is best to program the
|
||||
|
|
@ -159,8 +164,6 @@ Legacy
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_simple()
|
||||
irq_domain_add_legacy()
|
||||
irq_domain_create_simple()
|
||||
irq_domain_create_legacy()
|
||||
|
||||
|
|
@ -189,13 +192,13 @@ supported. For example, ISA controllers would use the legacy map for
|
|||
mapping Linux IRQs 0-15 so that existing ISA drivers get the correct IRQ
|
||||
numbers.
|
||||
|
||||
Most users of legacy mappings should use irq_domain_add_simple() or
|
||||
irq_domain_create_simple() which will use a legacy domain only if an IRQ range
|
||||
is supplied by the system and will otherwise use a linear domain mapping.
|
||||
The semantics of this call are such that if an IRQ range is specified then
|
||||
descriptors will be allocated on-the-fly for it, and if no range is
|
||||
specified it will fall through to irq_domain_add_linear() or
|
||||
irq_domain_create_linear() which means *no* irq descriptors will be allocated.
|
||||
Most users of legacy mappings should use irq_domain_create_simple()
|
||||
which will use a legacy domain only if an IRQ range is supplied by the
|
||||
system and will otherwise use a linear domain mapping. The semantics of
|
||||
this call are such that if an IRQ range is specified then descriptors
|
||||
will be allocated on-the-fly for it, and if no range is specified it
|
||||
will fall through to irq_domain_create_linear() which means *no* irq
|
||||
descriptors will be allocated.
|
||||
|
||||
A typical use case for simple domains is where an irqchip provider
|
||||
is supporting both dynamic and static IRQ assignments.
|
||||
|
|
@ -206,13 +209,7 @@ that the driver using the simple domain call irq_create_mapping()
|
|||
before any irq_find_mapping() since the latter will actually work
|
||||
for the static IRQ assignment case.
|
||||
|
||||
irq_domain_add_simple() and irq_domain_create_simple() as well as
|
||||
irq_domain_add_legacy() and irq_domain_create_legacy() are functionally
|
||||
equivalent, except for the first argument is different - the former
|
||||
accepts an Open Firmware specific 'struct device_node', while the latter
|
||||
accepts a more general abstraction 'struct fwnode_handle'.
|
||||
|
||||
Hierarchy IRQ domain
|
||||
Hierarchy IRQ Domain
|
||||
--------------------
|
||||
|
||||
On some architectures, there may be multiple interrupt controllers
|
||||
|
|
@ -253,20 +250,40 @@ There are four major interfaces to use hierarchy irq_domain:
|
|||
4) irq_domain_deactivate_irq(): deactivate interrupt controller hardware
|
||||
to stop delivering the interrupt.
|
||||
|
||||
Following changes are needed to support hierarchy irq_domain:
|
||||
The following is needed to support hierarchy irq_domain:
|
||||
|
||||
1) a new field 'parent' is added to struct irq_domain; it's used to
|
||||
1) The :c:member:`parent` field in struct irq_domain is used to
|
||||
maintain irq_domain hierarchy information.
|
||||
2) a new field 'parent_data' is added to struct irq_data; it's used to
|
||||
build hierarchy irq_data to match hierarchy irq_domains. The irq_data
|
||||
is used to store irq_domain pointer and hardware irq number.
|
||||
3) new callbacks are added to struct irq_domain_ops to support hierarchy
|
||||
irq_domain operations.
|
||||
2) The :c:member:`parent_data` field in struct irq_data is used to
|
||||
build hierarchy irq_data to match hierarchy irq_domains. The
|
||||
irq_data is used to store irq_domain pointer and hardware irq
|
||||
number.
|
||||
3) The :c:member:`alloc()`, :c:member:`free()`, and other callbacks in
|
||||
struct irq_domain_ops to support hierarchy irq_domain operations.
|
||||
|
||||
With support of hierarchy irq_domain and hierarchy irq_data ready, an
|
||||
irq_domain structure is built for each interrupt controller, and an
|
||||
With the support of hierarchy irq_domain and hierarchy irq_data ready,
|
||||
an irq_domain structure is built for each interrupt controller, and an
|
||||
irq_data structure is allocated for each irq_domain associated with an
|
||||
IRQ. Now we could go one step further to support stacked(hierarchy)
|
||||
IRQ.
|
||||
|
||||
For an interrupt controller driver to support hierarchy irq_domain, it
|
||||
needs to:
|
||||
|
||||
1) Implement irq_domain_ops.alloc() and irq_domain_ops.free()
|
||||
2) Optionally, implement irq_domain_ops.activate() and
|
||||
irq_domain_ops.deactivate().
|
||||
3) Optionally, implement an irq_chip to manage the interrupt controller
|
||||
hardware.
|
||||
4) There is no need to implement irq_domain_ops.map() and
|
||||
irq_domain_ops.unmap(). They are unused with hierarchy irq_domain.
|
||||
|
||||
Note the hierarchy irq_domain is in no way x86-specific, and is
|
||||
heavily used to support other architectures, such as ARM, ARM64 etc.
|
||||
|
||||
Stacked irq_chip
|
||||
~~~~~~~~~~~~~~~~
|
||||
|
||||
Now, we could go one step further to support stacked (hierarchy)
|
||||
irq_chip. That is, an irq_chip is associated with each irq_data along
|
||||
the hierarchy. A child irq_chip may implement a required action by
|
||||
itself or by cooperating with its parent irq_chip.
|
||||
|
|
@ -276,22 +293,28 @@ with the hardware managed by itself and may ask for services from its
|
|||
parent irq_chip when needed. So we could achieve a much cleaner
|
||||
software architecture.
|
||||
|
||||
For an interrupt controller driver to support hierarchy irq_domain, it
|
||||
needs to:
|
||||
|
||||
1) Implement irq_domain_ops.alloc and irq_domain_ops.free
|
||||
2) Optionally implement irq_domain_ops.activate and
|
||||
irq_domain_ops.deactivate.
|
||||
3) Optionally implement an irq_chip to manage the interrupt controller
|
||||
hardware.
|
||||
4) No need to implement irq_domain_ops.map and irq_domain_ops.unmap,
|
||||
they are unused with hierarchy irq_domain.
|
||||
|
||||
Hierarchy irq_domain is in no way x86 specific, and is heavily used to
|
||||
support other architectures, such as ARM, ARM64 etc.
|
||||
|
||||
Debugging
|
||||
=========
|
||||
|
||||
Most of the internals of the IRQ subsystem are exposed in debugfs by
|
||||
turning CONFIG_GENERIC_IRQ_DEBUGFS on.
|
||||
|
||||
Structures and Public Functions Provided
|
||||
========================================
|
||||
|
||||
This chapter contains the autogenerated documentation of the structures
|
||||
and exported kernel API functions which are used for IRQ domains.
|
||||
|
||||
.. kernel-doc:: include/linux/irqdomain.h
|
||||
|
||||
.. kernel-doc:: kernel/irq/irqdomain.c
|
||||
:export:
|
||||
|
||||
Internal Functions Provided
|
||||
===========================
|
||||
|
||||
This chapter contains the autogenerated documentation of the internal
|
||||
functions.
|
||||
|
||||
.. kernel-doc:: kernel/irq/irqdomain.c
|
||||
:internal:
|
||||
|
|
|
|||
|
|
@ -60,8 +60,6 @@ irq_domain和一个hwirq号作为参数。 如果hwirq的映射还不存在，
|
|||
|
||||
- irq_find_mapping()返回给定域和hwirq的Linux IRQ号，如果没有映射则返回0。
|
||||
|
||||
- irq_linear_revmap()现与irq_find_mapping()相同，已被废弃。
|
||||
|
||||
- generic_handle_domain_irq()处理一个由域和hwirq号描述的中断。
|
||||
|
||||
请注意，irq域的查找必须发生在与RCU读临界区兼容的上下文中。
|
||||
|
|
@ -83,7 +81,6 @@ irq_domain映射的类型
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_linear()
|
||||
irq_domain_create_linear()
|
||||
|
||||
线性反向映射维护了一个固定大小的表，该表以hwirq号为索引。 当一个hwirq被映射
|
||||
|
|
@ -104,7 +101,6 @@ irq_domain_add_linear()和irq_domain_create_linear()在功能上是等价的，
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_tree()
|
||||
irq_domain_create_tree()
|
||||
|
||||
irq_domain维护着从hwirq号到Linux IRQ的radix的树状映射。 当一个hwirq被映射时，
|
||||
|
|
@ -124,7 +120,7 @@ irq_domain_add_tree()和irq_domain_create_tree()在功能上是等价的，除
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_nomap()
|
||||
irq_domain_create_nomap()
|
||||
|
||||
当硬件中的hwirq号是可编程的时候，就可以采用无映射类型。 在这种情况下，最好将
|
||||
Linux IRQ号编入硬件本身，这样就不需要映射了。 调用irq_create_direct_mapping()
|
||||
|
|
@ -138,8 +134,6 @@ Linux IRQ号编入硬件本身，这样就不需要映射了。 调用irq_create
|
|||
|
||||
::
|
||||
|
||||
irq_domain_add_simple()
|
||||
irq_domain_add_legacy()
|
||||
irq_domain_create_simple()
|
||||
irq_domain_create_legacy()
|
||||
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)
|
|||
if (parent)
|
||||
panic("DeviceTree incore intc not a root irq controller\n");
|
||||
|
||||
root_domain = irq_domain_add_linear(intc, nr_cpu_irqs, &arcv2_irq_ops, NULL);
|
||||
root_domain = irq_domain_create_linear(of_fwnode_handle(intc), nr_cpu_irqs, &arcv2_irq_ops, NULL);
|
||||
if (!root_domain)
|
||||
panic("root irq domain not avail\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -112,8 +112,9 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)
|
|||
if (parent)
|
||||
panic("DeviceTree incore intc not a root irq controller\n");
|
||||
|
||||
root_domain = irq_domain_add_linear(intc, NR_CPU_IRQS,
|
||||
&arc_intc_domain_ops, NULL);
|
||||
root_domain = irq_domain_create_linear(of_fwnode_handle(intc),
|
||||
NR_CPU_IRQS,
|
||||
&arc_intc_domain_ops, NULL);
|
||||
if (!root_domain)
|
||||
panic("root irq domain not avail\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -391,7 +391,8 @@ idu_of_init(struct device_node *intc, struct device_node *parent)
|
|||
|
||||
pr_info("MCIP: IDU supports %u common irqs\n", nr_irqs);
|
||||
|
||||
domain = irq_domain_add_linear(intc, nr_irqs, &idu_irq_ops, NULL);
|
||||
domain = irq_domain_create_linear(of_fwnode_handle(intc), nr_irqs,
|
||||
&idu_irq_ops, NULL);
|
||||
|
||||
/* Parent interrupts (core-intc) are already mapped */
|
||||
|
||||
|
|
|
|||
|
|
@ -416,9 +416,9 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
|
|||
writel_relaxed(~0, irqbase + SA1111_INTSTATCLR0);
|
||||
writel_relaxed(~0, irqbase + SA1111_INTSTATCLR1);
|
||||
|
||||
sachip->irqdomain = irq_domain_add_linear(NULL, SA1111_IRQ_NR,
|
||||
&sa1111_irqdomain_ops,
|
||||
sachip);
|
||||
sachip->irqdomain = irq_domain_create_linear(NULL, SA1111_IRQ_NR,
|
||||
&sa1111_irqdomain_ops,
|
||||
sachip);
|
||||
if (!sachip->irqdomain) {
|
||||
irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -209,9 +209,8 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
domain = irq_domain_add_hierarchy(parent_domain, 0, 0,
|
||||
node, &exynos_pmu_domain_ops,
|
||||
NULL);
|
||||
domain = irq_domain_create_hierarchy(parent_domain, 0, 0, of_fwnode_handle(node),
|
||||
&exynos_pmu_domain_ops, NULL);
|
||||
if (!domain) {
|
||||
iounmap(pmu_base_addr);
|
||||
pmu_base_addr = NULL;
|
||||
|
|
|
|||
|
|
@ -201,8 +201,8 @@ static void __init mxc_init_irq(void __iomem *irqbase)
|
|||
WARN_ON(irq_base < 0);
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "fsl,avic");
|
||||
domain = irq_domain_add_legacy(np, AVIC_NUM_IRQS, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
domain = irq_domain_create_legacy(of_fwnode_handle(np), AVIC_NUM_IRQS, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
WARN_ON(!domain);
|
||||
|
||||
for (i = 0; i < AVIC_NUM_IRQS / 32; i++, irq_base += 32)
|
||||
|
|
|
|||
|
|
@ -245,9 +245,8 @@ static int __init imx_gpc_init(struct device_node *node,
|
|||
if (WARN_ON(!gpc_base))
|
||||
return -ENOMEM;
|
||||
|
||||
domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
|
||||
node, &imx_gpc_domain_ops,
|
||||
NULL);
|
||||
domain = irq_domain_create_hierarchy(parent_domain, 0, GPC_MAX_IRQS, of_fwnode_handle(node),
|
||||
&imx_gpc_domain_ops, NULL);
|
||||
if (!domain) {
|
||||
iounmap(gpc_base);
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -175,8 +175,8 @@ static int __init tzic_init_dt(struct device_node *np, struct device_node *p)
|
|||
irq_base = irq_alloc_descs(-1, 0, TZIC_NUM_IRQS, numa_node_id());
|
||||
WARN_ON(irq_base < 0);
|
||||
|
||||
domain = irq_domain_add_legacy(np, TZIC_NUM_IRQS, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
domain = irq_domain_create_legacy(of_fwnode_handle(np), TZIC_NUM_IRQS, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
WARN_ON(!domain);
|
||||
|
||||
for (i = 0; i < 4; i++, irq_base += 32)
|
||||
|
|
|
|||
|
|
@ -220,8 +220,7 @@ void __init omap1_init_irq(void)
|
|||
omap_l2_irq = irq_base;
|
||||
omap_l2_irq -= NR_IRQS_LEGACY;
|
||||
|
||||
domain = irq_domain_add_legacy(NULL, nr_irqs, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
domain = irq_domain_create_legacy(NULL, nr_irqs, irq_base, 0, &irq_domain_simple_ops, NULL);
|
||||
|
||||
pr_info("Total of %lu interrupts in %i interrupt banks\n",
|
||||
nr_irqs, irq_bank_count);
|
||||
|
|
|
|||
|
|
@ -585,9 +585,8 @@ static int __init wakeupgen_init(struct device_node *node,
|
|||
wakeupgen_ops = &am43xx_wakeupgen_ops;
|
||||
}
|
||||
|
||||
domain = irq_domain_add_hierarchy(parent_domain, 0, max_irqs,
|
||||
node, &wakeupgen_domain_ops,
|
||||
NULL);
|
||||
domain = irq_domain_create_hierarchy(parent_domain, 0, max_irqs, of_fwnode_handle(node),
|
||||
&wakeupgen_domain_ops, NULL);
|
||||
if (!domain) {
|
||||
iounmap(wakeupgen_base);
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -147,9 +147,8 @@ pxa_init_irq_common(struct device_node *node, int irq_nr,
|
|||
int n;
|
||||
|
||||
pxa_internal_irq_nr = irq_nr;
|
||||
pxa_irq_domain = irq_domain_add_legacy(node, irq_nr,
|
||||
PXA_IRQ(0), 0,
|
||||
&pxa_irq_ops, NULL);
|
||||
pxa_irq_domain = irq_domain_create_legacy(of_fwnode_handle(node), irq_nr, PXA_IRQ(0), 0,
|
||||
&pxa_irq_ops, NULL);
|
||||
if (!pxa_irq_domain)
|
||||
panic("Unable to add PXA IRQ domain\n");
|
||||
irq_set_default_domain(pxa_irq_domain);
|
||||
|
|
|
|||
|
|
@ -600,12 +600,12 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
|
|||
IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
|
||||
|
||||
/* Setup irq domain on top of the generic chip. */
|
||||
ochip->domain = irq_domain_add_legacy(NULL,
|
||||
ochip->chip.ngpio,
|
||||
ochip->secondary_irq_base,
|
||||
ochip->secondary_irq_base,
|
||||
&irq_domain_simple_ops,
|
||||
ochip);
|
||||
ochip->domain = irq_domain_create_legacy(NULL,
|
||||
ochip->chip.ngpio,
|
||||
ochip->secondary_irq_base,
|
||||
ochip->secondary_irq_base,
|
||||
&irq_domain_simple_ops,
|
||||
ochip);
|
||||
if (!ochip->domain)
|
||||
panic("%s: couldn't allocate irq domain (DT).\n",
|
||||
ochip->chip.label);
|
||||
|
|
|
|||
|
|
@ -149,8 +149,8 @@ void __init ar2315_arch_init_irq(void)
|
|||
|
||||
ath25_irq_dispatch = ar2315_irq_dispatch;
|
||||
|
||||
domain = irq_domain_add_linear(NULL, AR2315_MISC_IRQ_COUNT,
|
||||
&ar2315_misc_irq_domain_ops, NULL);
|
||||
domain = irq_domain_create_linear(NULL, AR2315_MISC_IRQ_COUNT,
|
||||
&ar2315_misc_irq_domain_ops, NULL);
|
||||
if (!domain)
|
||||
panic("Failed to add IRQ domain");
|
||||
|
||||
|
|
|
|||
|
|
@ -143,8 +143,8 @@ void __init ar5312_arch_init_irq(void)
|
|||
|
||||
ath25_irq_dispatch = ar5312_irq_dispatch;
|
||||
|
||||
domain = irq_domain_add_linear(NULL, AR5312_MISC_IRQ_COUNT,
|
||||
&ar5312_misc_irq_domain_ops, NULL);
|
||||
domain = irq_domain_create_linear(NULL, AR5312_MISC_IRQ_COUNT,
|
||||
&ar5312_misc_irq_domain_ops, NULL);
|
||||
if (!domain)
|
||||
panic("Failed to add IRQ domain");
|
||||
|
||||
|
|
|
|||
|
|
@ -1503,8 +1503,8 @@ static int __init octeon_irq_init_ciu(
|
|||
/* Mips internal */
|
||||
octeon_irq_init_core();
|
||||
|
||||
ciu_domain = irq_domain_add_tree(
|
||||
ciu_node, &octeon_irq_domain_ciu_ops, dd);
|
||||
ciu_domain = irq_domain_create_tree(of_fwnode_handle(ciu_node), &octeon_irq_domain_ciu_ops,
|
||||
dd);
|
||||
irq_set_default_domain(ciu_domain);
|
||||
|
||||
/* CIU_0 */
|
||||
|
|
@ -1637,8 +1637,8 @@ static int __init octeon_irq_init_gpio(
|
|||
if (gpiod) {
|
||||
/* gpio domain host_data is the base hwirq number. */
|
||||
gpiod->base_hwirq = base_hwirq;
|
||||
irq_domain_add_linear(
|
||||
gpio_node, 16, &octeon_irq_domain_gpio_ops, gpiod);
|
||||
irq_domain_create_linear(of_fwnode_handle(gpio_node), 16,
|
||||
&octeon_irq_domain_gpio_ops, gpiod);
|
||||
} else {
|
||||
pr_warn("Cannot allocate memory for GPIO irq_domain.\n");
|
||||
return -ENOMEM;
|
||||
|
|
@ -2074,8 +2074,8 @@ static int __init octeon_irq_init_ciu2(
|
|||
/* Mips internal */
|
||||
octeon_irq_init_core();
|
||||
|
||||
ciu_domain = irq_domain_add_tree(
|
||||
ciu_node, &octeon_irq_domain_ciu2_ops, NULL);
|
||||
ciu_domain = irq_domain_create_tree(of_fwnode_handle(ciu_node), &octeon_irq_domain_ciu2_ops,
|
||||
NULL);
|
||||
irq_set_default_domain(ciu_domain);
|
||||
|
||||
/* CUI2 */
|
||||
|
|
@ -2331,11 +2331,12 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,
|
|||
}
|
||||
host_data->max_bits = val;
|
||||
|
||||
cib_domain = irq_domain_add_linear(ciu_node, host_data->max_bits,
|
||||
&octeon_irq_domain_cib_ops,
|
||||
host_data);
|
||||
cib_domain = irq_domain_create_linear(of_fwnode_handle(ciu_node),
|
||||
host_data->max_bits,
|
||||
&octeon_irq_domain_cib_ops,
|
||||
host_data);
|
||||
if (!cib_domain) {
|
||||
pr_err("ERROR: Couldn't irq_domain_add_linear()\n");
|
||||
pr_err("ERROR: Couldn't irq_domain_create_linear()\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -2918,8 +2919,8 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,
|
|||
* Initialize all domains to use the default domain. Specific major
|
||||
* blocks will overwrite the default domain as needed.
|
||||
*/
|
||||
domain = irq_domain_add_tree(ciu_node, &octeon_dflt_domain_ciu3_ops,
|
||||
ciu3_info);
|
||||
domain = irq_domain_create_tree(of_fwnode_handle(ciu_node), &octeon_dflt_domain_ciu3_ops,
|
||||
ciu3_info);
|
||||
for (i = 0; i < MAX_CIU3_DOMAINS; i++)
|
||||
ciu3_info->domain[i] = domain;
|
||||
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
|
|||
for (i = 0; i < MAX_IM; i++)
|
||||
irq_set_chained_handler(i + 2, ltq_hw_irq_handler);
|
||||
|
||||
ltq_domain = irq_domain_add_linear(node,
|
||||
ltq_domain = irq_domain_create_linear(of_fwnode_handle(node),
|
||||
(MAX_IM * INT_NUM_IM_OFFSET) + MIPS_CPU_IRQ_CASCADE,
|
||||
&irq_domain_ops, 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -469,8 +469,8 @@ static int ar2315_pci_probe(struct platform_device *pdev)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
apc->domain = irq_domain_add_linear(NULL, AR2315_PCI_IRQ_COUNT,
|
||||
&ar2315_pci_irq_domain_ops, apc);
|
||||
apc->domain = irq_domain_create_linear(NULL, AR2315_PCI_IRQ_COUNT,
|
||||
&ar2315_pci_irq_domain_ops, apc);
|
||||
if (!apc->domain) {
|
||||
dev_err(dev, "failed to add IRQ domain\n");
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -208,9 +208,10 @@ static int rt3883_pci_irq_init(struct device *dev,
|
|||
rt3883_pci_w32(rpc, 0, RT3883_PCI_REG_PCIENA);
|
||||
|
||||
rpc->irq_domain =
|
||||
irq_domain_add_linear(rpc->intc_of_node, RT3883_PCI_IRQ_COUNT,
|
||||
&rt3883_pci_irq_domain_ops,
|
||||
rpc);
|
||||
irq_domain_create_linear(of_fwnode_handle(rpc->intc_of_node),
|
||||
RT3883_PCI_IRQ_COUNT,
|
||||
&rt3883_pci_irq_domain_ops,
|
||||
rpc);
|
||||
if (!rpc->irq_domain) {
|
||||
dev_err(dev, "unable to add IRQ domain\n");
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node,
|
|||
/* route all INTC interrupts to MIPS HW0 interrupt */
|
||||
rt_intc_w32(0, INTC_REG_TYPE);
|
||||
|
||||
domain = irq_domain_add_legacy(node, RALINK_INTC_IRQ_COUNT,
|
||||
domain = irq_domain_create_legacy(of_fwnode_handle(node), RALINK_INTC_IRQ_COUNT,
|
||||
RALINK_INTC_IRQ_BASE, 0, &irq_domain_ops, NULL);
|
||||
if (!domain)
|
||||
panic("Failed to add irqdomain");
|
||||
|
|
|
|||
|
|
@ -69,7 +69,8 @@ void __init init_IRQ(void)
|
|||
|
||||
BUG_ON(!node);
|
||||
|
||||
domain = irq_domain_add_linear(node, NIOS2_CPU_NR_IRQS, &irq_ops, NULL);
|
||||
domain = irq_domain_create_linear(of_fwnode_handle(node),
|
||||
NIOS2_CPU_NR_IRQS, &irq_ops, NULL);
|
||||
BUG_ON(!domain);
|
||||
|
||||
irq_set_default_domain(domain);
|
||||
|
|
|
|||
|
|
@ -254,8 +254,9 @@ static struct uic * __init uic_init_one(struct device_node *node)
|
|||
}
|
||||
uic->dcrbase = *dcrreg;
|
||||
|
||||
uic->irqhost = irq_domain_add_linear(node, NR_UIC_INTS, &uic_host_ops,
|
||||
uic);
|
||||
uic->irqhost = irq_domain_create_linear(of_fwnode_handle(node),
|
||||
NR_UIC_INTS, &uic_host_ops,
|
||||
uic);
|
||||
if (! uic->irqhost)
|
||||
return NULL; /* FIXME: panic? */
|
||||
|
||||
|
|
@ -327,5 +328,5 @@ unsigned int uic_get_irq(void)
|
|||
msr = mfdcr(primary_uic->dcrbase + UIC_MSR);
|
||||
src = 32 - ffs(msr);
|
||||
|
||||
return irq_linear_revmap(primary_uic->irqhost, src);
|
||||
return irq_find_mapping(primary_uic->irqhost, src);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -188,7 +188,8 @@ mpc5121_ads_cpld_pic_init(void)
|
|||
|
||||
cpld_pic_node = of_node_get(np);
|
||||
|
||||
cpld_pic_host = irq_domain_add_linear(np, 16, &cpld_pic_host_ops, NULL);
|
||||
cpld_pic_host = irq_domain_create_linear(of_fwnode_handle(np), 16,
|
||||
&cpld_pic_host_ops, NULL);
|
||||
if (!cpld_pic_host) {
|
||||
printk(KERN_ERR "CPLD PIC: failed to allocate irq host!\n");
|
||||
goto end;
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ static void __init media5200_init_irq(void)
|
|||
|
||||
spin_lock_init(&media5200_irq.lock);
|
||||
|
||||
media5200_irq.irqhost = irq_domain_add_linear(fpga_np,
|
||||
media5200_irq.irqhost = irq_domain_create_linear(of_fwnode_handle(fpga_np),
|
||||
MEDIA5200_NUM_IRQS, &media5200_irq_ops, &media5200_irq);
|
||||
if (!media5200_irq.irqhost)
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -247,9 +247,9 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
|
|||
if (!cascade_virq)
|
||||
return;
|
||||
|
||||
gpt->irqhost = irq_domain_add_linear(node, 1, &mpc52xx_gpt_irq_ops, gpt);
|
||||
gpt->irqhost = irq_domain_create_linear(of_fwnode_handle(node), 1, &mpc52xx_gpt_irq_ops, gpt);
|
||||
if (!gpt->irqhost) {
|
||||
dev_err(gpt->dev, "irq_domain_add_linear() failed\n");
|
||||
dev_err(gpt->dev, "irq_domain_create_linear() failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -371,7 +371,7 @@ struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq)
|
|||
mutex_lock(&mpc52xx_gpt_list_mutex);
|
||||
list_for_each(pos, &mpc52xx_gpt_list) {
|
||||
gpt = container_of(pos, struct mpc52xx_gpt_priv, list);
|
||||
if (gpt->irqhost && irq == irq_linear_revmap(gpt->irqhost, 0)) {
|
||||
if (gpt->irqhost && irq == irq_find_mapping(gpt->irqhost, 0)) {
|
||||
mutex_unlock(&mpc52xx_gpt_list_mutex);
|
||||
return gpt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ void __init mpc52xx_init_irq(void)
|
|||
* As last step, add an irq host to translate the real
|
||||
* hw irq information provided by the ofw to linux virq
|
||||
*/
|
||||
mpc52xx_irqhost = irq_domain_add_linear(picnode,
|
||||
mpc52xx_irqhost = irq_domain_create_linear(of_fwnode_handle(picnode),
|
||||
MPC52xx_IRQ_HIGHTESTHWIRQ,
|
||||
&mpc52xx_irqhost_ops, NULL);
|
||||
|
||||
|
|
@ -515,5 +515,5 @@ unsigned int mpc52xx_get_irq(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
return irq_linear_revmap(mpc52xx_irqhost, irq);
|
||||
return irq_find_mapping(mpc52xx_irqhost, irq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
|
|||
if (cause >> (i + 16))
|
||||
break;
|
||||
}
|
||||
return irq_linear_revmap(socrates_fpga_pic_irq_host,
|
||||
return irq_find_mapping(socrates_fpga_pic_irq_host,
|
||||
(irq_hw_number_t)i);
|
||||
}
|
||||
|
||||
|
|
@ -278,7 +278,7 @@ void __init socrates_fpga_pic_init(struct device_node *pic)
|
|||
int i;
|
||||
|
||||
/* Setup an irq_domain structure */
|
||||
socrates_fpga_pic_irq_host = irq_domain_add_linear(pic,
|
||||
socrates_fpga_pic_irq_host = irq_domain_create_linear(of_fwnode_handle(pic),
|
||||
SOCRATES_FPGA_NUM_IRQS, &socrates_fpga_pic_host_ops, NULL);
|
||||
if (socrates_fpga_pic_irq_host == NULL) {
|
||||
pr_err("FPGA PIC: Unable to allocate host\n");
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ static int cpm_get_irq(struct irq_desc *desc)
|
|||
cpm_vec = in_be16(&data->reg->cpic_civr);
|
||||
cpm_vec >>= 11;
|
||||
|
||||
return irq_linear_revmap(data->host, cpm_vec);
|
||||
return irq_find_mapping(data->host, cpm_vec);
|
||||
}
|
||||
|
||||
static void cpm_cascade(struct irq_desc *desc)
|
||||
|
|
@ -110,7 +110,8 @@ static int cpm_pic_probe(struct platform_device *pdev)
|
|||
|
||||
out_be32(&data->reg->cpic_cimr, 0);
|
||||
|
||||
data->host = irq_domain_add_linear(dev->of_node, 64, &cpm_pic_host_ops, data);
|
||||
data->host = irq_domain_create_linear(of_fwnode_handle(dev->of_node),
|
||||
64, &cpm_pic_host_ops, data);
|
||||
if (!data->host)
|
||||
return -ENODEV;
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ unsigned int mpc8xx_get_irq(void)
|
|||
if (irq == PIC_VEC_SPURRIOUS)
|
||||
return 0;
|
||||
|
||||
return irq_linear_revmap(mpc8xx_pic_host, irq);
|
||||
return irq_find_mapping(mpc8xx_pic_host, irq);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -146,7 +146,8 @@ void __init mpc8xx_pic_init(void)
|
|||
if (!siu_reg)
|
||||
goto out;
|
||||
|
||||
mpc8xx_pic_host = irq_domain_add_linear(np, 64, &mpc8xx_pic_host_ops, NULL);
|
||||
mpc8xx_pic_host = irq_domain_create_linear(of_fwnode_handle(np), 64,
|
||||
&mpc8xx_pic_host_ops, NULL);
|
||||
if (!mpc8xx_pic_host)
|
||||
printk(KERN_ERR "MPC8xx PIC: failed to allocate irq host!\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -149,8 +149,9 @@ static struct irq_domain * __init flipper_pic_init(struct device_node *np)
|
|||
|
||||
__flipper_quiesce(io_base);
|
||||
|
||||
irq_domain = irq_domain_add_linear(np, FLIPPER_NR_IRQS,
|
||||
&flipper_irq_domain_ops, io_base);
|
||||
irq_domain = irq_domain_create_linear(of_fwnode_handle(np),
|
||||
FLIPPER_NR_IRQS,
|
||||
&flipper_irq_domain_ops, io_base);
|
||||
if (!irq_domain) {
|
||||
pr_err("failed to allocate irq_domain\n");
|
||||
return NULL;
|
||||
|
|
@ -172,7 +173,7 @@ unsigned int flipper_pic_get_irq(void)
|
|||
return 0; /* no more IRQs pending */
|
||||
|
||||
irq = __ffs(irq_status);
|
||||
return irq_linear_revmap(flipper_irq_host, irq);
|
||||
return irq_find_mapping(flipper_irq_host, irq);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -175,8 +175,9 @@ static struct irq_domain *__init hlwd_pic_init(struct device_node *np)
|
|||
|
||||
__hlwd_quiesce(io_base);
|
||||
|
||||
irq_domain = irq_domain_add_linear(np, HLWD_NR_IRQS,
|
||||
&hlwd_irq_domain_ops, io_base);
|
||||
irq_domain = irq_domain_create_linear(of_fwnode_handle(np),
|
||||
HLWD_NR_IRQS,
|
||||
&hlwd_irq_domain_ops, io_base);
|
||||
if (!irq_domain) {
|
||||
pr_err("failed to allocate irq_domain\n");
|
||||
iounmap(io_base);
|
||||
|
|
@ -189,7 +190,7 @@ static struct irq_domain *__init hlwd_pic_init(struct device_node *np)
|
|||
unsigned int hlwd_pic_get_irq(void)
|
||||
{
|
||||
unsigned int hwirq = __hlwd_pic_get_irq(hlwd_irq_host);
|
||||
return hwirq ? irq_linear_revmap(hlwd_irq_host, hwirq) : 0;
|
||||
return hwirq ? irq_find_mapping(hlwd_irq_host, hwirq) : 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ static unsigned int pmac_pic_get_irq(void)
|
|||
raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
|
||||
if (unlikely(irq < 0))
|
||||
return 0;
|
||||
return irq_linear_revmap(pmac_pic_host, irq);
|
||||
return irq_find_mapping(pmac_pic_host, irq);
|
||||
}
|
||||
|
||||
static int pmac_pic_host_match(struct irq_domain *h, struct device_node *node,
|
||||
|
|
@ -327,8 +327,9 @@ static void __init pmac_pic_probe_oldstyle(void)
|
|||
/*
|
||||
* Allocate an irq host
|
||||
*/
|
||||
pmac_pic_host = irq_domain_add_linear(master, max_irqs,
|
||||
&pmac_pic_host_ops, NULL);
|
||||
pmac_pic_host = irq_domain_create_linear(of_fwnode_handle(master),
|
||||
max_irqs,
|
||||
&pmac_pic_host_ops, NULL);
|
||||
BUG_ON(pmac_pic_host == NULL);
|
||||
irq_set_default_domain(pmac_pic_host);
|
||||
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ static int __init psurge_secondary_ipi_init(void)
|
|||
{
|
||||
int rc = -ENOMEM;
|
||||
|
||||
psurge_host = irq_domain_add_nomap(NULL, ~0, &psurge_host_ops, NULL);
|
||||
psurge_host = irq_domain_create_nomap(NULL, ~0, &psurge_host_ops, NULL);
|
||||
|
||||
if (psurge_host)
|
||||
psurge_secondary_virq = irq_create_direct_mapping(psurge_host);
|
||||
|
|
|
|||
|
|
@ -191,7 +191,8 @@ int __init opal_event_init(void)
|
|||
* fall back to the legacy method (opal_event_request(...))
|
||||
* anyway. */
|
||||
dn = of_find_compatible_node(NULL, NULL, "ibm,opal-event");
|
||||
opal_event_irqchip.domain = irq_domain_add_linear(dn, MAX_NUM_EVENTS,
|
||||
opal_event_irqchip.domain = irq_domain_create_linear(of_fwnode_handle(dn),
|
||||
MAX_NUM_EVENTS,
|
||||
&opal_event_domain_ops, &opal_event_irqchip);
|
||||
of_node_put(dn);
|
||||
if (!opal_event_irqchip.domain) {
|
||||
|
|
|
|||
|
|
@ -1897,7 +1897,7 @@ static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsigned
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
hose->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(hose->dn),
|
||||
hose->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(hose->dn),
|
||||
&pnv_msi_domain_info,
|
||||
hose->dev_domain);
|
||||
if (!hose->msi_domain) {
|
||||
|
|
|
|||
|
|
@ -743,7 +743,7 @@ void __init ps3_init_IRQ(void)
|
|||
unsigned cpu;
|
||||
struct irq_domain *host;
|
||||
|
||||
host = irq_domain_add_nomap(NULL, PS3_PLUG_MAX + 1, &ps3_host_ops, NULL);
|
||||
host = irq_domain_create_nomap(NULL, PS3_PLUG_MAX + 1, &ps3_host_ops, NULL);
|
||||
irq_set_default_domain(host);
|
||||
|
||||
for_each_possible_cpu(cpu) {
|
||||
|
|
|
|||
|
|
@ -633,7 +633,7 @@ static int __pseries_msi_allocate_domains(struct pci_controller *phb,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
phb->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(phb->dn),
|
||||
phb->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(phb->dn),
|
||||
&pseries_msi_domain_info,
|
||||
phb->dev_domain);
|
||||
if (!phb->msi_domain) {
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ unsigned int cpm2_get_irq(void)
|
|||
|
||||
if (irq == 0)
|
||||
return(-1);
|
||||
return irq_linear_revmap(cpm2_pic_host, irq);
|
||||
return irq_find_mapping(cpm2_pic_host, irq);
|
||||
}
|
||||
|
||||
static int cpm2_pic_host_map(struct irq_domain *h, unsigned int virq,
|
||||
|
|
@ -259,7 +259,8 @@ void cpm2_pic_init(struct device_node *node)
|
|||
out_be32(&cpm2_intctl->ic_scprrl, 0x05309770);
|
||||
|
||||
/* create a legacy host */
|
||||
cpm2_pic_host = irq_domain_add_linear(node, 64, &cpm2_pic_host_ops, NULL);
|
||||
cpm2_pic_host = irq_domain_create_linear(of_fwnode_handle(node), 64,
|
||||
&cpm2_pic_host_ops, NULL);
|
||||
if (cpm2_pic_host == NULL) {
|
||||
printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ unsigned int ehv_pic_get_irq(void)
|
|||
* this will also setup revmap[] in the slow path for the first
|
||||
* time, next calls will always use fast path by indexing revmap
|
||||
*/
|
||||
return irq_linear_revmap(global_ehv_pic->irqhost, irq);
|
||||
return irq_find_mapping(global_ehv_pic->irqhost, irq);
|
||||
}
|
||||
|
||||
static int ehv_pic_host_match(struct irq_domain *h, struct device_node *node,
|
||||
|
|
@ -269,8 +269,9 @@ void __init ehv_pic_init(void)
|
|||
return;
|
||||
}
|
||||
|
||||
ehv_pic->irqhost = irq_domain_add_linear(np, NR_EHV_PIC_INTS,
|
||||
&ehv_pic_host_ops, ehv_pic);
|
||||
ehv_pic->irqhost = irq_domain_create_linear(of_fwnode_handle(np),
|
||||
NR_EHV_PIC_INTS,
|
||||
&ehv_pic_host_ops, ehv_pic);
|
||||
if (!ehv_pic->irqhost) {
|
||||
of_node_put(np);
|
||||
kfree(ehv_pic);
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ static int fsl_of_msi_probe(struct platform_device *dev)
|
|||
}
|
||||
platform_set_drvdata(dev, msi);
|
||||
|
||||
msi->irqhost = irq_domain_add_linear(dev->dev.of_node,
|
||||
msi->irqhost = irq_domain_create_linear(of_fwnode_handle(dev->dev.of_node),
|
||||
NR_MSI_IRQS_MAX, &fsl_msi_host_ops, msi);
|
||||
|
||||
if (msi->irqhost == NULL) {
|
||||
|
|
|
|||
|
|
@ -214,8 +214,9 @@ void __init gef_pic_init(struct device_node *np)
|
|||
}
|
||||
|
||||
/* Setup an irq_domain structure */
|
||||
gef_pic_irq_host = irq_domain_add_linear(np, GEF_PIC_NUM_IRQS,
|
||||
&gef_pic_host_ops, NULL);
|
||||
gef_pic_irq_host = irq_domain_create_linear(of_fwnode_handle(np),
|
||||
GEF_PIC_NUM_IRQS,
|
||||
&gef_pic_host_ops, NULL);
|
||||
if (gef_pic_irq_host == NULL)
|
||||
return;
|
||||
|
||||
|
|
@ -244,7 +245,7 @@ unsigned int gef_pic_get_irq(void)
|
|||
if (active & (0x1 << hwirq))
|
||||
break;
|
||||
}
|
||||
virq = irq_linear_revmap(gef_pic_irq_host,
|
||||
virq = irq_find_mapping(gef_pic_irq_host,
|
||||
(irq_hw_number_t)hwirq);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -260,8 +260,8 @@ void i8259_init(struct device_node *node, unsigned long intack_addr)
|
|||
raw_spin_unlock_irqrestore(&i8259_lock, flags);
|
||||
|
||||
/* create a legacy host */
|
||||
i8259_host = irq_domain_add_legacy(node, NR_IRQS_LEGACY, 0, 0,
|
||||
&i8259_host_ops, NULL);
|
||||
i8259_host = irq_domain_create_legacy(of_fwnode_handle(node), NR_IRQS_LEGACY, 0, 0,
|
||||
&i8259_host_ops, NULL);
|
||||
if (i8259_host == NULL) {
|
||||
printk(KERN_ERR "i8259: failed to allocate irq host !\n");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -711,8 +711,9 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
|
|||
if (ipic == NULL)
|
||||
return NULL;
|
||||
|
||||
ipic->irqhost = irq_domain_add_linear(node, NR_IPIC_INTS,
|
||||
&ipic_host_ops, ipic);
|
||||
ipic->irqhost = irq_domain_create_linear(of_fwnode_handle(node),
|
||||
NR_IPIC_INTS,
|
||||
&ipic_host_ops, ipic);
|
||||
if (ipic->irqhost == NULL) {
|
||||
kfree(ipic);
|
||||
return NULL;
|
||||
|
|
@ -800,7 +801,7 @@ unsigned int ipic_get_irq(void)
|
|||
if (irq == 0) /* 0 --> no irq is pending */
|
||||
return 0;
|
||||
|
||||
return irq_linear_revmap(primary_ipic->irqhost, irq);
|
||||
return irq_find_mapping(primary_ipic->irqhost, irq);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SUSPEND
|
||||
|
|
|
|||
|
|
@ -1484,9 +1484,9 @@ struct mpic * __init mpic_alloc(struct device_node *node,
|
|||
mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1);
|
||||
mpic->isu_mask = (1 << mpic->isu_shift) - 1;
|
||||
|
||||
mpic->irqhost = irq_domain_add_linear(mpic->node,
|
||||
intvec_top,
|
||||
&mpic_host_ops, mpic);
|
||||
mpic->irqhost = irq_domain_create_linear(of_fwnode_handle(mpic->node),
|
||||
intvec_top,
|
||||
&mpic_host_ops, mpic);
|
||||
|
||||
/*
|
||||
* FIXME: The code leaks the MPIC object and mappings here; this
|
||||
|
|
@ -1786,7 +1786,7 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, int reg)
|
|||
return 0;
|
||||
}
|
||||
|
||||
return irq_linear_revmap(mpic->irqhost, src);
|
||||
return irq_find_mapping(mpic->irqhost, src);
|
||||
}
|
||||
|
||||
unsigned int mpic_get_one_irq(struct mpic *mpic)
|
||||
|
|
@ -1824,7 +1824,7 @@ unsigned int mpic_get_coreint_irq(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
return irq_linear_revmap(mpic->irqhost, src);
|
||||
return irq_find_mapping(mpic->irqhost, src);
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -404,8 +404,8 @@ void __init tsi108_pci_int_init(struct device_node *node)
|
|||
{
|
||||
DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");
|
||||
|
||||
pci_irq_host = irq_domain_add_legacy(node, NR_IRQS_LEGACY, 0, 0,
|
||||
&pci_irq_domain_ops, NULL);
|
||||
pci_irq_host = irq_domain_create_legacy(of_fwnode_handle(node), NR_IRQS_LEGACY, 0, 0,
|
||||
&pci_irq_domain_ops, NULL);
|
||||
if (pci_irq_host == NULL) {
|
||||
printk(KERN_ERR "pci_irq_host: failed to allocate irq domain!\n");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1464,7 +1464,7 @@ static const struct irq_domain_ops xive_irq_domain_ops = {
|
|||
|
||||
static void __init xive_init_host(struct device_node *np)
|
||||
{
|
||||
xive_irq_domain = irq_domain_add_tree(np, &xive_irq_domain_ops, NULL);
|
||||
xive_irq_domain = irq_domain_create_tree(of_fwnode_handle(np), &xive_irq_domain_ops, NULL);
|
||||
if (WARN_ON(xive_irq_domain == NULL))
|
||||
return;
|
||||
irq_set_default_domain(xive_irq_domain);
|
||||
|
|
|
|||
|
|
@ -47,8 +47,9 @@ static void __init se7343_domain_init(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
se7343_irq_domain = irq_domain_add_linear(NULL, SE7343_FPGA_IRQ_NR,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
se7343_irq_domain = irq_domain_create_linear(NULL, SE7343_FPGA_IRQ_NR,
|
||||
&irq_domain_simple_ops,
|
||||
NULL);
|
||||
if (unlikely(!se7343_irq_domain)) {
|
||||
printk("Failed to get IRQ domain\n");
|
||||
return;
|
||||
|
|
@ -70,7 +71,7 @@ static void __init se7343_gc_init(void)
|
|||
struct irq_chip_type *ct;
|
||||
unsigned int irq_base;
|
||||
|
||||
irq_base = irq_linear_revmap(se7343_irq_domain, 0);
|
||||
irq_base = irq_find_mapping(se7343_irq_domain, 0);
|
||||
|
||||
gc = irq_alloc_generic_chip(DRV_NAME, 1, irq_base, se7343_irq_regs,
|
||||
handle_level_irq);
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ static void __init se7722_domain_init(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
se7722_irq_domain = irq_domain_add_linear(NULL, SE7722_FPGA_IRQ_NR,
|
||||
se7722_irq_domain = irq_domain_create_linear(NULL, SE7722_FPGA_IRQ_NR,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
if (unlikely(!se7722_irq_domain)) {
|
||||
printk("Failed to get IRQ domain\n");
|
||||
|
|
@ -69,7 +69,7 @@ static void __init se7722_gc_init(void)
|
|||
struct irq_chip_type *ct;
|
||||
unsigned int irq_base;
|
||||
|
||||
irq_base = irq_linear_revmap(se7722_irq_domain, 0);
|
||||
irq_base = irq_find_mapping(se7722_irq_domain, 0);
|
||||
|
||||
gc = irq_alloc_generic_chip(DRV_NAME, 1, irq_base, se7722_irq_regs,
|
||||
handle_level_irq);
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ int __init x3proto_gpio_setup(void)
|
|||
if (unlikely(ret))
|
||||
goto err_gpio;
|
||||
|
||||
x3proto_irq_domain = irq_domain_add_linear(NULL, NR_BASEBOARD_GPIOS,
|
||||
x3proto_irq_domain = irq_domain_create_linear(NULL, NR_BASEBOARD_GPIOS,
|
||||
&x3proto_gpio_irq_ops, NULL);
|
||||
if (unlikely(!x3proto_irq_domain))
|
||||
goto err_irq;
|
||||
|
|
|
|||
|
|
@ -2225,7 +2225,7 @@ static int mp_irqdomain_create(int ioapic)
|
|||
|
||||
/* Handle device tree enumerated APICs proper */
|
||||
if (cfg->dev) {
|
||||
fn = of_node_to_fwnode(cfg->dev);
|
||||
fn = of_fwnode_handle(cfg->dev);
|
||||
} else {
|
||||
fn = irq_domain_alloc_named_id_fwnode("IO-APIC", mpc_ioapic_id(ioapic));
|
||||
if (!fn)
|
||||
|
|
|
|||
|
|
@ -737,9 +737,9 @@ static int moxtet_irq_setup(struct moxtet *moxtet)
|
|||
{
|
||||
int i, ret;
|
||||
|
||||
moxtet->irq.domain = irq_domain_add_simple(moxtet->dev->of_node,
|
||||
MOXTET_NIRQS, 0,
|
||||
&moxtet_irq_domain, moxtet);
|
||||
moxtet->irq.domain = irq_domain_create_simple(of_fwnode_handle(moxtet->dev->of_node),
|
||||
MOXTET_NIRQS, 0,
|
||||
&moxtet_irq_domain, moxtet);
|
||||
if (moxtet->irq.domain == NULL) {
|
||||
dev_err(moxtet->dev, "Could not add IRQ domain\n");
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -2131,8 +2131,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev)
|
|||
edac->irq_chip.name = pdev->dev.of_node->name;
|
||||
edac->irq_chip.irq_mask = a10_eccmgr_irq_mask;
|
||||
edac->irq_chip.irq_unmask = a10_eccmgr_irq_unmask;
|
||||
edac->domain = irq_domain_add_linear(pdev->dev.of_node, 64,
|
||||
&a10_eccmgr_ic_ops, edac);
|
||||
edac->domain = irq_domain_create_linear(of_fwnode_handle(pdev->dev.of_node),
|
||||
64, &a10_eccmgr_ic_ops, edac);
|
||||
if (!edac->domain) {
|
||||
dev_err(&pdev->dev, "Error adding IRQ domain\n");
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -437,7 +437,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
|
|||
int err;
|
||||
|
||||
priv->irq_domain =
|
||||
irq_domain_add_linear(np, priv->num_gpios,
|
||||
irq_domain_create_linear(of_fwnode_handle(np), priv->num_gpios,
|
||||
&brcmstb_gpio_irq_domain_ops,
|
||||
priv);
|
||||
if (!priv->irq_domain) {
|
||||
|
|
|
|||
|
|
@ -479,9 +479,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
|
|||
return irq;
|
||||
}
|
||||
|
||||
irq_domain = irq_domain_add_legacy(dev->of_node, ngpio, irq, 0,
|
||||
&davinci_gpio_irq_ops,
|
||||
chips);
|
||||
irq_domain = irq_domain_create_legacy(of_fwnode_handle(dev->of_node), ngpio, irq, 0,
|
||||
&davinci_gpio_irq_ops, chips);
|
||||
if (!irq_domain) {
|
||||
dev_err(dev, "Couldn't register an IRQ domain\n");
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -323,8 +323,9 @@ static int em_gio_probe(struct platform_device *pdev)
|
|||
irq_chip->irq_release_resources = em_gio_irq_relres;
|
||||
irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
|
||||
|
||||
p->irq_domain = irq_domain_add_simple(dev->of_node, ngpios, 0,
|
||||
&em_gio_irq_domain_ops, p);
|
||||
p->irq_domain = irq_domain_create_simple(of_fwnode_handle(dev->of_node),
|
||||
ngpios, 0,
|
||||
&em_gio_irq_domain_ops, p);
|
||||
if (!p->irq_domain) {
|
||||
dev_err(dev, "cannot initialize irq domain\n");
|
||||
return -ENXIO;
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@ static int grgpio_probe(struct platform_device *ofdev)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
priv->domain = irq_domain_add_linear(np, gc->ngpio,
|
||||
priv->domain = irq_domain_create_linear(of_fwnode_handle(np), gc->ngpio,
|
||||
&grgpio_irq_domain_ops,
|
||||
priv);
|
||||
if (!priv->domain) {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ static void idt_gpio_dispatch(struct irq_desc *desc)
|
|||
pending = readl(ctrl->pic + IDT_PIC_IRQ_PEND);
|
||||
pending &= ~ctrl->mask_cache;
|
||||
for_each_set_bit(bit, &pending, gc->ngpio) {
|
||||
virq = irq_linear_revmap(gc->irq.domain, bit);
|
||||
virq = irq_find_mapping(gc->irq.domain, bit);
|
||||
if (virq)
|
||||
generic_handle_irq(virq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -240,11 +240,9 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpio_chip *gc)
|
|||
|
||||
raw_spin_lock_init(&ic->lock);
|
||||
|
||||
ic->domain = irq_domain_add_hierarchy(parent_domain, 0,
|
||||
NR_LPC18XX_GPIO_PIN_IC_IRQS,
|
||||
dev->of_node,
|
||||
&lpc18xx_gpio_pin_ic_domain_ops,
|
||||
ic);
|
||||
ic->domain = irq_domain_create_hierarchy(parent_domain, 0, NR_LPC18XX_GPIO_PIN_IC_IRQS,
|
||||
of_fwnode_handle(dev->of_node),
|
||||
&lpc18xx_gpio_pin_ic_domain_ops, ic);
|
||||
if (!ic->domain) {
|
||||
pr_err("unable to add irq domain\n");
|
||||
ret = -ENODEV;
|
||||
|
|
|
|||
|
|
@ -1237,7 +1237,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
|
||||
mvchip->domain =
|
||||
irq_domain_add_linear(np, ngpios, &irq_generic_chip_ops, NULL);
|
||||
irq_domain_create_linear(of_fwnode_handle(np), ngpios, &irq_generic_chip_ops, NULL);
|
||||
if (!mvchip->domain) {
|
||||
dev_err(&pdev->dev, "couldn't allocate irq domain %s (DT).\n",
|
||||
mvchip->chip.label);
|
||||
|
|
|
|||
|
|
@ -502,7 +502,7 @@ static int mxc_gpio_probe(struct platform_device *pdev)
|
|||
goto out_bgio;
|
||||
}
|
||||
|
||||
port->domain = irq_domain_add_legacy(np, 32, irq_base, 0,
|
||||
port->domain = irq_domain_create_legacy(of_fwnode_handle(np), 32, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
if (!port->domain) {
|
||||
err = -ENODEV;
|
||||
|
|
|
|||
|
|
@ -303,8 +303,8 @@ static int mxs_gpio_probe(struct platform_device *pdev)
|
|||
goto out_iounmap;
|
||||
}
|
||||
|
||||
port->domain = irq_domain_add_legacy(np, 32, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
port->domain = irq_domain_create_legacy(of_fwnode_handle(np), 32, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
if (!port->domain) {
|
||||
err = -ENODEV;
|
||||
goto out_iounmap;
|
||||
|
|
|
|||
|
|
@ -636,9 +636,9 @@ static int pxa_gpio_probe(struct platform_device *pdev)
|
|||
if (!pxa_last_gpio)
|
||||
return -EINVAL;
|
||||
|
||||
pchip->irqdomain = irq_domain_add_legacy(pdev->dev.of_node,
|
||||
pxa_last_gpio + 1, irq_base,
|
||||
0, &pxa_irq_domain_ops, pchip);
|
||||
pchip->irqdomain = irq_domain_create_legacy(of_fwnode_handle(pdev->dev.of_node),
|
||||
pxa_last_gpio + 1, irq_base, 0,
|
||||
&pxa_irq_domain_ops, pchip);
|
||||
if (!pchip->irqdomain)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -521,7 +521,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)
|
|||
struct irq_chip_generic *gc;
|
||||
int ret;
|
||||
|
||||
bank->domain = irq_domain_add_linear(bank->of_node, 32,
|
||||
bank->domain = irq_domain_create_linear(of_fwnode_handle(bank->of_node), 32,
|
||||
&irq_generic_chip_ops, NULL);
|
||||
if (!bank->domain) {
|
||||
dev_warn(bank->dev, "could not init irq domain for bank %s\n",
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ void __init sa1100_init_gpio(void)
|
|||
|
||||
gpiochip_add_data(&sa1100_gpio_chip.chip, NULL);
|
||||
|
||||
sa1100_gpio_irqdomain = irq_domain_add_simple(NULL,
|
||||
sa1100_gpio_irqdomain = irq_domain_create_simple(NULL,
|
||||
28, IRQ_GPIO0,
|
||||
&sa1100_gpio_irqdomain_ops, sgc);
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
|
|||
IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST,
|
||||
IRQ_LEVEL | IRQ_NOPROBE);
|
||||
|
||||
sd->id = irq_domain_add_legacy(pdev->dev.of_node, SDV_NUM_PUB_GPIOS,
|
||||
sd->id = irq_domain_create_legacy(of_fwnode_handle(pdev->dev.of_node), SDV_NUM_PUB_GPIOS,
|
||||
sd->irq_base, 0, &irq_domain_sdv_ops, sd);
|
||||
if (!sd->id)
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
|
|||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
tb10x_gpio->domain = irq_domain_add_linear(np,
|
||||
tb10x_gpio->domain = irq_domain_create_linear(of_fwnode_handle(np),
|
||||
tb10x_gpio->gc.ngpio,
|
||||
&irq_generic_chip_ops, NULL);
|
||||
if (!tb10x_gpio->domain) {
|
||||
|
|
|
|||
|
|
@ -502,7 +502,6 @@ static void gpio_twl4030_power_off_action(void *data)
|
|||
static int gpio_twl4030_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct twl4030_gpio_platform_data *pdata;
|
||||
struct device_node *node = pdev->dev.of_node;
|
||||
struct gpio_twl4030_priv *priv;
|
||||
int ret, irq_base;
|
||||
|
||||
|
|
@ -524,8 +523,8 @@ static int gpio_twl4030_probe(struct platform_device *pdev)
|
|||
return irq_base;
|
||||
}
|
||||
|
||||
irq_domain_add_legacy(node, TWL4030_GPIO_MAX, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
irq_domain_create_legacy(of_fwnode_handle(pdev->dev.of_node), TWL4030_GPIO_MAX, irq_base, 0,
|
||||
&irq_domain_simple_ops, NULL);
|
||||
|
||||
ret = twl4030_sih_setup(&pdev->dev, TWL4030_MODULE_GPIO, irq_base);
|
||||
if (ret < 0)
|
||||
|
|
|
|||
|
|
@ -725,8 +725,8 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_ops = {
|
|||
*/
|
||||
int amdgpu_irq_add_domain(struct amdgpu_device *adev)
|
||||
{
|
||||
adev->irq.domain = irq_domain_add_linear(NULL, AMDGPU_MAX_IRQ_SRC_ID,
|
||||
&amdgpu_hw_irqdomain_ops, adev);
|
||||
adev->irq.domain = irq_domain_create_linear(NULL, AMDGPU_MAX_IRQ_SRC_ID,
|
||||
&amdgpu_hw_irqdomain_ops, adev);
|
||||
if (!adev->irq.domain) {
|
||||
DRM_ERROR("GPU irq add domain failed\n");
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss)
|
|||
|
||||
dev = msm_mdss->dev;
|
||||
|
||||
domain = irq_domain_add_linear(dev->of_node, 32,
|
||||
domain = irq_domain_create_linear(of_fwnode_handle(dev->of_node), 32,
|
||||
&msm_mdss_irqdomain_ops, msm_mdss);
|
||||
if (!domain) {
|
||||
dev_err(dev, "failed to add irq_domain\n");
|
||||
|
|
|
|||
|
|
@ -1008,7 +1008,7 @@ int ipu_map_irq(struct ipu_soc *ipu, int irq)
|
|||
{
|
||||
int virq;
|
||||
|
||||
virq = irq_linear_revmap(ipu->domain, irq);
|
||||
virq = irq_find_mapping(ipu->domain, irq);
|
||||
if (!virq)
|
||||
virq = irq_create_mapping(ipu->domain, irq);
|
||||
|
||||
|
|
@ -1169,8 +1169,8 @@ static int ipu_irq_init(struct ipu_soc *ipu)
|
|||
};
|
||||
int ret, i;
|
||||
|
||||
ipu->domain = irq_domain_add_linear(ipu->dev->of_node, IPU_NUM_IRQS,
|
||||
&irq_generic_chip_ops, ipu);
|
||||
ipu->domain = irq_domain_create_linear(of_fwnode_handle(ipu->dev->of_node), IPU_NUM_IRQS,
|
||||
&irq_generic_chip_ops, ipu);
|
||||
if (!ipu->domain) {
|
||||
dev_err(ipu->dev, "failed to add irq domain\n");
|
||||
return -ENODEV;
|
||||
|
|
@ -1219,7 +1219,7 @@ static void ipu_irq_exit(struct ipu_soc *ipu)
|
|||
/* TODO: remove irq_domain_generic_chips */
|
||||
|
||||
for (i = 0; i < IPU_NUM_IRQS; i++) {
|
||||
irq = irq_linear_revmap(ipu->domain, i);
|
||||
irq = irq_find_mapping(ipu->domain, i);
|
||||
if (irq)
|
||||
irq_dispose_mapping(irq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
|
||||
/* Alloc and register client IRQ */
|
||||
adap->irq_domain = irq_domain_add_linear(NULL, 1, &irq_domain_simple_ops, NULL);
|
||||
adap->irq_domain = irq_domain_create_linear(NULL, 1, &irq_domain_simple_ops, NULL);
|
||||
if (!adap->irq_domain)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -442,9 +442,9 @@ static int pca954x_irq_setup(struct i2c_mux_core *muxc)
|
|||
|
||||
raw_spin_lock_init(&data->lock);
|
||||
|
||||
data->irq = irq_domain_add_linear(client->dev.of_node,
|
||||
data->chip->nchans,
|
||||
&irq_domain_simple_ops, data);
|
||||
data->irq = irq_domain_create_linear(of_fwnode_handle(client->dev.of_node),
|
||||
data->chip->nchans,
|
||||
&irq_domain_simple_ops, data);
|
||||
if (!data->irq)
|
||||
return -ENODEV;
|
||||
|
||||
|
|
|
|||
|
|
@ -421,9 +421,10 @@ static int stm32_adc_irq_probe(struct platform_device *pdev,
|
|||
return priv->irq[i];
|
||||
}
|
||||
|
||||
priv->domain = irq_domain_add_simple(np, STM32_ADC_MAX_ADCS, 0,
|
||||
&stm32_adc_domain_ops,
|
||||
priv);
|
||||
priv->domain = irq_domain_create_simple(of_fwnode_handle(np),
|
||||
STM32_ADC_MAX_ADCS, 0,
|
||||
&stm32_adc_domain_ops,
|
||||
priv);
|
||||
if (!priv->domain) {
|
||||
dev_err(&pdev->dev, "Failed to add irq domain\n");
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,
|
|||
if (!combiner_data)
|
||||
return;
|
||||
|
||||
combiner_irq_domain = irq_domain_add_linear(np, nr_irq,
|
||||
combiner_irq_domain = irq_domain_create_linear(of_fwnode_handle(np), nr_irq,
|
||||
&combiner_irq_domain_ops, combiner_data);
|
||||
if (WARN_ON(!combiner_irq_domain)) {
|
||||
pr_warn("%s: irq domain init failed\n", __func__);
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ static int al_fic_register(struct device_node *node,
|
|||
struct irq_chip_generic *gc;
|
||||
int ret;
|
||||
|
||||
fic->domain = irq_domain_add_linear(node,
|
||||
fic->domain = irq_domain_create_linear(of_fwnode_handle(node),
|
||||
NR_FIC_IRQS,
|
||||
&irq_generic_chip_ops,
|
||||
fic);
|
||||
|
|
|
|||
|
|
@ -205,15 +205,14 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
middle_domain = irq_domain_add_hierarchy(gic_domain, 0, 0, NULL,
|
||||
&alpine_msix_middle_domain_ops,
|
||||
priv);
|
||||
middle_domain = irq_domain_create_hierarchy(gic_domain, 0, 0, NULL,
|
||||
&alpine_msix_middle_domain_ops, priv);
|
||||
if (!middle_domain) {
|
||||
pr_err("Failed to create the MSIX middle domain\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node),
|
||||
msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node),
|
||||
&alpine_msix_domain_info,
|
||||
middle_domain);
|
||||
if (!msi_domain) {
|
||||
|
|
|
|||
|
|
@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p
|
|||
|
||||
irqc->info.die_stride = off - start_off;
|
||||
|
||||
irqc->hw_domain = irq_domain_create_tree(of_node_to_fwnode(node),
|
||||
irqc->hw_domain = irq_domain_create_tree(of_fwnode_handle(node),
|
||||
&aic_irq_domain_ops, irqc);
|
||||
if (WARN_ON(!irqc->hw_domain))
|
||||
goto err_unmap;
|
||||
|
|
@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p
|
|||
|
||||
if (is_kernel_in_hyp_mode()) {
|
||||
struct irq_fwspec mi = {
|
||||
.fwnode = of_node_to_fwnode(node),
|
||||
.fwnode = of_fwnode_handle(node),
|
||||
.param_count = 3,
|
||||
.param = {
|
||||
[0] = AIC_FIQ, /* This is a lie */
|
||||
|
|
|
|||
|
|
@ -348,12 +348,12 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,
|
|||
mpic->msi_doorbell_mask = PCI_MSI_FULL_DOORBELL_MASK;
|
||||
}
|
||||
|
||||
mpic->msi_inner_domain = irq_domain_add_linear(NULL, mpic->msi_doorbell_size,
|
||||
mpic->msi_inner_domain = irq_domain_create_linear(NULL, mpic->msi_doorbell_size,
|
||||
&mpic_msi_domain_ops, mpic);
|
||||
if (!mpic->msi_inner_domain)
|
||||
return -ENOMEM;
|
||||
|
||||
mpic->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), &mpic_msi_domain_info,
|
||||
mpic->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), &mpic_msi_domain_info,
|
||||
mpic->msi_inner_domain);
|
||||
if (!mpic->msi_domain) {
|
||||
irq_domain_remove(mpic->msi_inner_domain);
|
||||
|
|
@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node)
|
|||
{
|
||||
int base_ipi;
|
||||
|
||||
mpic->ipi_domain = irq_domain_create_linear(of_node_to_fwnode(node), IPI_DOORBELL_NR,
|
||||
mpic->ipi_domain = irq_domain_create_linear(of_fwnode_handle(node), IPI_DOORBELL_NR,
|
||||
&mpic_ipi_domain_ops, mpic);
|
||||
if (WARN_ON(!mpic->ipi_domain))
|
||||
return -ENOMEM;
|
||||
|
|
@ -546,7 +546,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)
|
|||
{
|
||||
/* Re-enable per-CPU interrupts that were enabled before suspend */
|
||||
for (irq_hw_number_t i = 0; i < MPIC_PER_CPU_IRQS_NR; i++) {
|
||||
unsigned int virq = irq_linear_revmap(mpic->domain, i);
|
||||
unsigned int virq = irq_find_mapping(mpic->domain, i);
|
||||
struct irq_data *d;
|
||||
|
||||
if (!virq || !irq_percpu_is_enabled(virq))
|
||||
|
|
@ -740,7 +740,7 @@ static void mpic_resume(void)
|
|||
|
||||
/* Re-enable interrupts */
|
||||
for (irq_hw_number_t i = 0; i < mpic->domain->hwirq_max; i++) {
|
||||
unsigned int virq = irq_linear_revmap(mpic->domain, i);
|
||||
unsigned int virq = irq_find_mapping(mpic->domain, i);
|
||||
struct irq_data *d;
|
||||
|
||||
if (!virq)
|
||||
|
|
@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par
|
|||
if (!mpic_is_ipi_available(mpic))
|
||||
nr_irqs = MPIC_PER_CPU_IRQS_NR;
|
||||
|
||||
mpic->domain = irq_domain_add_linear(node, nr_irqs, &mpic_irq_ops, mpic);
|
||||
mpic->domain = irq_domain_create_linear(of_fwnode_handle(node), nr_irqs, &mpic_irq_ops, mpic);
|
||||
if (!mpic->domain) {
|
||||
pr_err("%pOF: Unable to add IRQ domain\n", node);
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node,
|
|||
goto err_iounmap;
|
||||
}
|
||||
|
||||
i2c_ic->irq_domain = irq_domain_add_linear(node, ASPEED_I2C_IC_NUM_BUS,
|
||||
i2c_ic->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), ASPEED_I2C_IC_NUM_BUS,
|
||||
&aspeed_i2c_ic_irq_domain_ops,
|
||||
NULL);
|
||||
if (!i2c_ic->irq_domain) {
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,
|
|||
writel(0xffffffff, intc_ic->base + INTC_INT_STATUS_REG);
|
||||
writel(0x0, intc_ic->base + INTC_INT_ENABLE_REG);
|
||||
|
||||
intc_ic->irq_domain = irq_domain_add_linear(node, INTC_IRQS_PER_WORD,
|
||||
intc_ic->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), INTC_IRQS_PER_WORD,
|
||||
&aspeed_intc_ic_irq_domain_ops, intc_ic);
|
||||
if (!intc_ic->irq_domain) {
|
||||
ret = -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic,
|
|||
goto err;
|
||||
}
|
||||
|
||||
scu_ic->irq_domain = irq_domain_add_linear(node, scu_ic->num_irqs,
|
||||
scu_ic->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), scu_ic->num_irqs,
|
||||
&aspeed_scu_ic_domain_ops,
|
||||
scu_ic);
|
||||
if (!scu_ic->irq_domain) {
|
||||
|
|
|
|||
|
|
@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,
|
|||
set_handle_irq(avic_handle_irq);
|
||||
|
||||
/* Register our domain */
|
||||
vic->dom = irq_domain_add_simple(node, NUM_IRQS, 0,
|
||||
&avic_dom_ops, vic);
|
||||
vic->dom = irq_domain_create_simple(of_fwnode_handle(node), NUM_IRQS, 0,
|
||||
&avic_dom_ops, vic);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
domain = irq_domain_add_linear(node, ATH79_MISC_IRQ_COUNT,
|
||||
domain = irq_domain_create_linear(of_fwnode_handle(node), ATH79_MISC_IRQ_COUNT,
|
||||
&misc_irq_domain_ops, base);
|
||||
if (!domain) {
|
||||
pr_err("Failed to add MISC irqdomain\n");
|
||||
|
|
@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,
|
|||
else
|
||||
ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;
|
||||
|
||||
domain = irq_domain_add_legacy(NULL, ATH79_MISC_IRQ_COUNT,
|
||||
domain = irq_domain_create_legacy(NULL, ATH79_MISC_IRQ_COUNT,
|
||||
irq_base, 0, &misc_irq_domain_ops, regs);
|
||||
if (!domain)
|
||||
panic("Failed to create MISC irqdomain");
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
|
|||
goto err_iounmap;
|
||||
}
|
||||
|
||||
domain = irq_domain_add_linear(node, nchips * 32, ops, aic);
|
||||
domain = irq_domain_create_linear(of_fwnode_handle(node), nchips * 32, ops, aic);
|
||||
if (!domain) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free_aic;
|
||||
|
|
|
|||
|
|
@ -174,8 +174,8 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np)
|
|||
{
|
||||
struct irq_domain *middle;
|
||||
|
||||
middle = irq_domain_add_hierarchy(mip->parent, 0, mip->num_msis, np,
|
||||
&mip_middle_domain_ops, mip);
|
||||
middle = irq_domain_create_hierarchy(mip->parent, 0, mip->num_msis, of_fwnode_handle(np),
|
||||
&mip_middle_domain_ops, mip);
|
||||
if (!middle)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *node,
|
|||
if (!base)
|
||||
panic("%pOF: unable to map IC registers\n", node);
|
||||
|
||||
intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0),
|
||||
intc.domain = irq_domain_create_linear(of_fwnode_handle(node), MAKE_HWIRQ(NR_BANKS, 0),
|
||||
&armctrl_ops, NULL);
|
||||
if (!intc.domain)
|
||||
panic("%pOF: unable to create IRQ domain\n", node);
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,
|
|||
|
||||
bcm2835_init_local_timer_frequency();
|
||||
|
||||
intc.domain = irq_domain_add_linear(node, LAST_IRQ + 1,
|
||||
intc.domain = irq_domain_create_linear(of_fwnode_handle(node), LAST_IRQ + 1,
|
||||
&bcm2836_arm_irqchip_intc_ops,
|
||||
NULL);
|
||||
if (!intc.domain)
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,
|
|||
|
||||
raw_spin_lock_init(&intc->lock);
|
||||
|
||||
intc->domain = irq_domain_add_linear(dn, IRQS_PER_WORD * intc->n_words,
|
||||
intc->domain = irq_domain_create_linear(of_fwnode_handle(dn), IRQS_PER_WORD * intc->n_words,
|
||||
&bcm6345_l1_domain_ops,
|
||||
intc);
|
||||
if (!intc->domain) {
|
||||
|
|
|
|||
|
|
@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node *dn,
|
|||
}
|
||||
}
|
||||
|
||||
intc->domain = irq_domain_add_linear(dn, IRQS_PER_WORD * intc->n_words,
|
||||
intc->domain = irq_domain_create_linear(of_fwnode_handle(dn), IRQS_PER_WORD * intc->n_words,
|
||||
&bcm7038_l1_domain_ops,
|
||||
intc);
|
||||
if (!intc->domain) {
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,
|
|||
goto out_free_l1_data;
|
||||
}
|
||||
|
||||
data->domain = irq_domain_add_linear(dn, IRQS_PER_WORD * data->n_words,
|
||||
data->domain = irq_domain_create_linear(of_fwnode_handle(dn), IRQS_PER_WORD * data->n_words,
|
||||
&irq_generic_chip_ops, NULL);
|
||||
if (!data->domain) {
|
||||
ret = -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np,
|
|||
goto out_unmap;
|
||||
}
|
||||
|
||||
data->domain = irq_domain_add_linear(np, 32,
|
||||
data->domain = irq_domain_create_linear(of_fwnode_handle(np), 32,
|
||||
&irq_generic_chip_ops, NULL);
|
||||
if (!data->domain) {
|
||||
ret = -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -184,8 +184,8 @@ static int __init _clps711x_intc_init(struct device_node *np,
|
|||
clps711x_intc->ops.map = clps711x_intc_irq_map;
|
||||
clps711x_intc->ops.xlate = irq_domain_xlate_onecell;
|
||||
clps711x_intc->domain =
|
||||
irq_domain_add_legacy(np, ARRAY_SIZE(clps711x_irqs),
|
||||
0, 0, &clps711x_intc->ops, NULL);
|
||||
irq_domain_create_legacy(of_fwnode_handle(np), ARRAY_SIZE(clps711x_irqs), 0, 0,
|
||||
&clps711x_intc->ops, NULL);
|
||||
if (!clps711x_intc->domain) {
|
||||
err = -ENOMEM;
|
||||
goto out_irqfree;
|
||||
|
|
|
|||
|
|
@ -351,10 +351,8 @@ static int __init irqcrossbar_init(struct device_node *node,
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
domain = irq_domain_add_hierarchy(parent_domain, 0,
|
||||
cb->max_crossbar_sources,
|
||||
node, &crossbar_domain_ops,
|
||||
NULL);
|
||||
domain = irq_domain_create_hierarchy(parent_domain, 0, cb->max_crossbar_sources,
|
||||
of_fwnode_handle(node), &crossbar_domain_ops, NULL);
|
||||
if (!domain) {
|
||||
pr_err("%pOF: failed to allocated domain\n", node);
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
root_domain = irq_domain_add_linear(node, nr_irq,
|
||||
root_domain = irq_domain_create_linear(of_fwnode_handle(node), nr_irq,
|
||||
&irq_generic_chip_ops, NULL);
|
||||
if (!root_domain) {
|
||||
pr_err("C-SKY Intc irq_domain_add failed.\n");
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)
|
|||
writel_relaxed(BIT(0), INTCG_base + INTCG_ICTLR);
|
||||
}
|
||||
|
||||
root_domain = irq_domain_add_linear(node, nr_irq, &csky_irqdomain_ops,
|
||||
root_domain = irq_domain_create_linear(of_fwnode_handle(node), nr_irq, &csky_irqdomain_ops,
|
||||
NULL);
|
||||
if (!root_domain)
|
||||
return -ENXIO;
|
||||
|
|
|
|||
|
|
@ -204,8 +204,10 @@ static int __init davinci_cp_intc_do_init(struct resource *res, unsigned int num
|
|||
return irq_base;
|
||||
}
|
||||
|
||||
davinci_cp_intc_irq_domain = irq_domain_add_legacy(node, num_irqs, irq_base, 0,
|
||||
&davinci_cp_intc_irq_domain_ops, NULL);
|
||||
davinci_cp_intc_irq_domain = irq_domain_create_legacy(of_fwnode_handle(node), num_irqs,
|
||||
irq_base, 0,
|
||||
&davinci_cp_intc_irq_domain_ops,
|
||||
NULL);
|
||||
|
||||
if (!davinci_cp_intc_irq_domain) {
|
||||
pr_err("%s: unable to create an interrupt domain\n", __func__);
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *node,
|
|||
regmap_write(ucregs, UC_IRQ_CONTROL, 1);
|
||||
|
||||
digicolor_irq_domain =
|
||||
irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL);
|
||||
irq_domain_create_linear(of_fwnode_handle(node), 64, &irq_generic_chip_ops, NULL);
|
||||
if (!digicolor_irq_domain) {
|
||||
pr_err("%pOF: unable to create IRQ domain\n", node);
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue