diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-26 03:49:21 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-26 03:49:21 +0400 |
| commit | 55c71581d416b131667cf834491adc54105bb7fc (patch) | |
| tree | c4715fce5bf14c4cc6b85f037243397ec3d6cf1f /arch/arm/boot | |
| parent | 49dd0dcfd76091989a746968b7403e038a1953bf (diff) | |
| parent | cfa1950e6c6b72251e80adc736af3c3d2907ab0e (diff) | |
| download | linux-55c71581d416b131667cf834491adc54105bb7fc.tar.xz | |
Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical
Pull "Fixes non critical for AT91" from Nicolas Ferre:
- mmc pinmux for at91sam9263 was missing
- little fix of the old clock implementation
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index bb23c2d33cf8..5e95a8053445 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi @@ -834,6 +834,7 @@ compatible = "atmel,hsmci"; reg = <0xfff80000 0x600>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>; + pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; clocks = <&mci0_clk>; @@ -845,6 +846,7 @@ compatible = "atmel,hsmci"; reg = <0xfff84000 0x600>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>; + pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; clocks = <&mci1_clk>; |