diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-12 15:30:00 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-12 15:30:00 +0100 |
| commit | d14b8f390e4b856a7448d9a0d3ba8aad13ed24bc (patch) | |
| tree | 073b7196e5c5b65f04c6c53d3c5e336bac5fc27f /arch/arm/boot | |
| parent | 37d122d7d892b5c3eff594d3a9db039cabf24291 (diff) | |
| parent | 5957457a2d96e4c9b2fecd40f29cdb3bb841d75e (diff) | |
Merge tag 'at91-fixes2' into at91-4.1-cleanup
Second fixes batch for AT91 on 4.0:
- little fix for !MMU debug: may also help for randconfig
- fix of 2 errors in LCD clock definitions
- in PM code, not writing the key leads to not execute the action
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sama5d4.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 97d5b9759c07..8240b490825c 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -462,8 +462,8 @@ lcdck: lcdck { #clock-cells = <0>; - reg = <4>; - clocks = <&smd>; + reg = <3>; + clocks = <&mck>; }; smdck: smdck { @@ -771,7 +771,7 @@ reg = <50>; }; - lcd_clk: lcd_clk { + lcdc_clk: lcdc_clk { #clock-cells = <0>; reg = <51>; }; |