Fixes non critical for AT91:
- mmc pinmux for at91sam9263 was missing - little fix of the old clock implementation -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJUIvtbAAoJEAf03oE53VmQMP4H/1e3NM8xP6ePHSDzYW/SyqGx IdFJwRff/FlHTzx23jND6z9SJDLTDu7NhUtABEsOIN+uJ28Vg9FLSR5+XqOfpbGt UH9M2Xxla0WClIUzNDcDTyX56vo/TT0M1lnfh7IvP4yR0iWghbvDIWj/4L5Zl52n bU1Ac+Spz4kuSShb6PSLxWfZXY7rlEFZbdOUd0ju2AqgLGbf+GeEWl4JcyPBb0id MrS2YN5yO+0Ts72QPX7mSDS+RCzTm5ncIw6aLfgJzC0vWWvV6AXn6w6nYNUm/o4+ BlHZLHYOPVOLoz+uQE9biKcWeZhMR1orWkcIGXxfzao2cOm5WGa3CkuLd+dol2g= =VQv1 -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
55c71581d4
|
@ -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>;
|
||||
|
|
|
@ -962,6 +962,7 @@ static int __init at91_clock_reset(void)
|
|||
}
|
||||
|
||||
at91_pmc_write(AT91_PMC_SCDR, scdr);
|
||||
at91_pmc_write(AT91_PMC_PCDR, pcdr);
|
||||
if (cpu_is_sama5d3())
|
||||
at91_pmc_write(AT91_PMC_PCDR1, pcdr1);
|
||||
|
||||
|
|
Loading…
Reference in a new issue