diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-02-28 08:46:30 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-02-28 08:46:30 -0800 |
| commit | 1bd49882d78a9b976fe7380ec1bdeb454d68a358 (patch) | |
| tree | c4a296bce07fe871c89d84ae66ac4bb53af29346 /arch/arm/boot/dts/am335x-bone-common.dtsi | |
| parent | 0341735226dcfa9d3727ff001e030f879ab91ca2 (diff) | |
| parent | 48385896e9c53e1061f103e1271a6be9a7ea00c4 (diff) | |
| download | linux-0-day-1bd49882d78a9b976fe7380ec1bdeb454d68a358.tar.gz linux-0-day-1bd49882d78a9b976fe7380ec1bdeb454d68a358.tar.xz | |
Merge branch 'gpio-key-wakeup-fix' into omap-for-v4.11/fixes
Diffstat (limited to 'arch/arm/boot/dts/am335x-bone-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am335x-bone-common.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index 3e32dd18fd25f..bf6b26abe35b5 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -207,6 +207,8 @@ &usb0 { status = "okay"; dr_mode = "peripheral"; + interrupts-extended = <&intc 18 &tps 0>; + interrupt-names = "mc", "vbus"; }; &usb1 { |