diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
| commit | 5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch) | |
| tree | b262a7c002b05b7bc800a106d6ca6777dabe15bf /arch/arm/boot/dts/at91sam9g20ek_common.dtsi | |
| parent | 1808f8cc6cb2842c53147eccfd5e88044d0d22a6 (diff) | |
| parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
| download | linux-rt-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.gz | |
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.4
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g20ek_common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 57548a2c5a1e..e9cc99b6353a 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -19,15 +19,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <18432000>; - }; - slow_xtal { clock-frequency = <32768>; }; @@ -206,14 +197,14 @@ label = "Button 3"; gpios = <&pioA 30 GPIO_ACTIVE_LOW>; linux,code = <0x103>; - gpio-key,wakeup; + wakeup-source; }; btn4 { label = "Button 4"; gpios = <&pioA 31 GPIO_ACTIVE_LOW>; linux,code = <0x104>; - gpio-key,wakeup; + wakeup-source; }; }; |