diff options
| author |   Chen-Yu Tsai <wens@csie.org> | 2017-06-06 13:59:30 +0800 |
|---|---|---|
| committer | Chen-Yu Tsai <wens@csie.org> | 2017-08-05 22:06:58 +0800 |
| commit | a180791004fa28b2727a01df114941cbbf2a06d5 (patch) | |
| tree | 173840fe186945c41d99895691be80fda471e3ab /arch | |
| parent | ARM: dts: sun6i: a31: Use new sun6i-a31-r-intc compatible for NMI/R_INTC (diff) | |
| download | linux-dev-a180791004fa28b2727a01df114941cbbf2a06d5.tar.xz linux-dev-a180791004fa28b2727a01df114941cbbf2a06d5.zip | |
ARM: dts: sun8i: a23/a33: Use new sun6i-a31-r-intc compatible for NMI/R_INTC
We introduced a new compatible for the NMI or R_INTC interrupt
controller. This new compatible has the register region aligned
to the boundary listed in the SoC's memory map.
This patch converts the NMI/R_INTC node to using the new compatible,
and fixes up the register region and device node name.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index a8b978d0f35b..ea50dda75adc 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -519,11 +519,11 @@ #clock-cells = <1>; }; - nmi_intc: interrupt-controller@01f00c0c { - compatible = "allwinner,sun6i-a31-sc-nmi"; + nmi_intc: interrupt-controller@1f00c00 { + compatible = "allwinner,sun6i-a31-r-intc"; interrupt-controller; #interrupt-cells = <2>; - reg = <0x01f00c0c 0x38>; + reg = <0x01f00c00 0x400>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; }; |