diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-07 11:17:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-07 11:17:34 +0200 |
| commit | b7a4abb67416aa07cd65446dd39e64525ccfe8e5 (patch) | |
| tree | 8f5b0f9ffb617622944b5e6368473f91e3efeaa4 /arch/arm/boot/dts/dm816x.dtsi | |
| parent | usb: musb: dsps: fix build on i386 when COMPILE_TEST is set (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.tar.xz linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.zip | |
Merge 4.0-rc7 into usb-next
We want the fixes in here, and to help resolve merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/dm816x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dm816x.dtsi | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi index 3c97b5f2addc..f35715bc6992 100644 --- a/arch/arm/boot/dts/dm816x.dtsi +++ b/arch/arm/boot/dts/dm816x.dtsi @@ -150,17 +150,27 @@ }; gpio1: gpio@48032000 { - compatible = "ti,omap3-gpio"; + compatible = "ti,omap4-gpio"; ti,hwmods = "gpio1"; + ti,gpio-always-on; reg = <0x48032000 0x1000>; - interrupts = <97>; + interrupts = <96>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; }; gpio2: gpio@4804c000 { - compatible = "ti,omap3-gpio"; + compatible = "ti,omap4-gpio"; ti,hwmods = "gpio2"; + ti,gpio-always-on; reg = <0x4804c000 0x1000>; - interrupts = <99>; + interrupts = <98>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; }; gpmc: gpmc@50000000 { |