Commit 55c71581 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91...

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: default avatarArnd 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
parents 49dd0dcf cfa1950e
...@@ -834,6 +834,7 @@ ...@@ -834,6 +834,7 @@
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xfff80000 0x600>; reg = <0xfff80000 0x600>;
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&mci0_clk>; clocks = <&mci0_clk>;
...@@ -845,6 +846,7 @@ ...@@ -845,6 +846,7 @@
compatible = "atmel,hsmci"; compatible = "atmel,hsmci";
reg = <0xfff84000 0x600>; reg = <0xfff84000 0x600>;
interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&mci1_clk>; clocks = <&mci1_clk>;
......
...@@ -962,6 +962,7 @@ static int __init at91_clock_reset(void) ...@@ -962,6 +962,7 @@ static int __init at91_clock_reset(void)
} }
at91_pmc_write(AT91_PMC_SCDR, scdr); at91_pmc_write(AT91_PMC_SCDR, scdr);
at91_pmc_write(AT91_PMC_PCDR, pcdr);
if (cpu_is_sama5d3()) if (cpu_is_sama5d3())
at91_pmc_write(AT91_PMC_PCDR1, pcdr1); at91_pmc_write(AT91_PMC_PCDR1, pcdr1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment