diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 06:00:02 +0300 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 06:00:02 +0300 |
| commit | 998f468f34f41905051556a9897dbc204b1b75b4 (patch) | |
| tree | 75e402d58ccdcf516daf6a0fa8f54e33cf841787 /arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | |
| parent | d537543b3948bc3bc9dede248fa455493e055457 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | linux-998f468f34f41905051556a9897dbc204b1b75b4.tar.xz | |
Merge tag 'v4.4-rc1' into HEAD
Linux 4.4-rc1
Diffstat (limited to 'arch/arm/boot/dts/sun4i-a10-gemei-g9.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index 570754d8df67..3f0aeb8288cd 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -47,6 +47,7 @@ #include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> / { model = "Gemei G9 Tablet"; @@ -64,7 +65,7 @@ /* * TODO: * 2x cameras via CSI - * bma250 IRQs + * audio * AXP battery management * NAND * OTG @@ -103,12 +104,8 @@ bma250@18 { compatible = "bosch,bma250"; reg = <0x18>; - - /* - * TODO: interrupt pins: - * int1 - PH00 - * int2 - PI10 - */ + interrupt-parent = <&pio>; + interrupts = <7 0 IRQ_TYPE_EDGE_RISING>; /* PH00 / EINT0 */ }; }; |