diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-05 18:06:29 +0000 |
commit | ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1 (patch) | |
tree | 3ae1d5d33402f3459a65fe492c97d75c168bb04c /arch/arm/boot/dts/at91sam9m10g45ek.dts | |
parent | 55fc205600ff3b529631cfe03b58645e3844bd92 (diff) | |
parent | d8018361b58bb7b9a2a657104e54c33c2ef1439d (diff) | |
download | linux-next-ee1e4e3f0d50aebdc6dac2a2cd4ae203ed2a75c1.tar.gz |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'arch/arm/boot/dts/at91sam9m10g45ek.dts')
-rw-r--r-- | arch/arm/boot/dts/at91sam9m10g45ek.dts | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 9d16ef8453c5..2400c99134f7 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -24,15 +24,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <12000000>; - }; - slow_xtal { clock-frequency = <32768>; }; @@ -323,14 +314,14 @@ label = "left_click"; gpios = <&pioB 6 GPIO_ACTIVE_LOW>; linux,code = <272>; - gpio-key,wakeup; + wakeup-source; }; right_click { label = "right_click"; gpios = <&pioB 7 GPIO_ACTIVE_LOW>; linux,code = <273>; - gpio-key,wakeup; + wakeup-source; }; left { |