diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-10 16:40:26 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-10 16:40:26 +0300 |
| commit | e826d22e16c3230621a937e22f43c403d6e494a7 (patch) | |
| tree | 61bc8d95f5c3c7bdf93fac9ca57cd9d5b87a69b8 /arch/arm/boot/dts/at91-kizboxmini.dts | |
| parent | 9a5e5234bafeaa2e9d15881d443c38d3d82d0b38 (diff) | |
| parent | 0bdf5a05647a66dcc6394986e061daeac9b1cf96 (diff) | |
| download | linux-e826d22e16c3230621a937e22f43c403d6e494a7.tar.xz | |
Merge tag 'drm-i915-get-eld' into topic/hdmi-jack
Merge the latest i915 audio component changes for HDMI/DP get_eld ops.
This is actually used in HD-audio side in this branch.
Diffstat (limited to 'arch/arm/boot/dts/at91-kizboxmini.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-kizboxmini.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91-kizboxmini.dts b/arch/arm/boot/dts/at91-kizboxmini.dts index 9f72b4932634..9682d105d4d8 100644 --- a/arch/arm/boot/dts/at91-kizboxmini.dts +++ b/arch/arm/boot/dts/at91-kizboxmini.dts @@ -98,14 +98,14 @@ label = "PB_PROG"; gpios = <&pioC 17 GPIO_ACTIVE_LOW>; linux,code = <0x102>; - gpio-key,wakeup; + wakeup-source; }; reset { label = "PB_RST"; gpios = <&pioC 16 GPIO_ACTIVE_LOW>; linux,code = <0x100>; - gpio-key,wakeup; + wakeup-source; }; }; |