diff options
author | Jerome Brunet <jbrunet@baylibre.com> | 2017-10-19 08:01:42 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@baylibre.com> | 2017-10-29 11:43:29 -0400 |
commit | 9dbb56ea0917a036dc966663a09baf3d5a471f54 (patch) | |
tree | ac9fb0ab51bc3cbd1baa9d5b7a58f9a5db26e447 | |
parent | f2c2122a6cbccbe558ac54c9c5773f1df86ac3b6 (diff) |
ARM64: dts: meson-gx: add gpio interrupt controller
Add gpio interrupt controller to Amlogic GX family SoCs
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 9 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 |
3 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index b7723436a04b..ab7ce1644cdc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi | |||
@@ -218,6 +218,15 @@ | |||
218 | #size-cells = <2>; | 218 | #size-cells = <2>; |
219 | ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>; | 219 | ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>; |
220 | 220 | ||
221 | gpio_intc: interrupt-controller@9880 { | ||
222 | compatible = "amlogic,meson-gpio-intc"; | ||
223 | reg = <0x0 0x9880 0x0 0x10>; | ||
224 | interrupt-controller; | ||
225 | #interrupt-cells = <2>; | ||
226 | amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>; | ||
227 | status = "disabled"; | ||
228 | }; | ||
229 | |||
221 | reset: reset-controller@4404 { | 230 | reset: reset-controller@4404 { |
222 | compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset"; | 231 | compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset"; |
223 | reg = <0x0 0x04404 0x0 0x20>; | 232 | reg = <0x0 0x04404 0x0 0x20>; |
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 3d41db9c9d22..ead895a4e9a5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | |||
@@ -323,6 +323,12 @@ | |||
323 | clock-names = "stmmaceth", "clkin0", "clkin1"; | 323 | clock-names = "stmmaceth", "clkin0", "clkin1"; |
324 | }; | 324 | }; |
325 | 325 | ||
326 | &gpio_intc { | ||
327 | compatible = "amlogic,meson-gpio-intc", | ||
328 | "amlogic,meson-gxbb-gpio-intc"; | ||
329 | status = "okay"; | ||
330 | }; | ||
331 | |||
326 | &hdmi_tx { | 332 | &hdmi_tx { |
327 | compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; | 333 | compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; |
328 | resets = <&reset RESET_HDMITX_CAPB3>, | 334 | resets = <&reset RESET_HDMITX_CAPB3>, |
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index d3a51031a711..0aa71a35ce64 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | |||
@@ -225,6 +225,12 @@ | |||
225 | compatible = "amlogic,meson-gxl-aoclkc", "amlogic,meson-gx-aoclkc"; | 225 | compatible = "amlogic,meson-gxl-aoclkc", "amlogic,meson-gx-aoclkc"; |
226 | }; | 226 | }; |
227 | 227 | ||
228 | &gpio_intc { | ||
229 | compatible = "amlogic,meson-gpio-intc", | ||
230 | "amlogic,meson-gxl-gpio-intc"; | ||
231 | status = "okay"; | ||
232 | }; | ||
233 | |||
228 | &hdmi_tx { | 234 | &hdmi_tx { |
229 | compatible = "amlogic,meson-gxl-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; | 235 | compatible = "amlogic,meson-gxl-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; |
230 | resets = <&reset RESET_HDMITX_CAPB3>, | 236 | resets = <&reset RESET_HDMITX_CAPB3>, |