aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi2
-rw-r--r--arch/arm/mach-at91/clock.c1
2 files changed, 3 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 @@
834 compatible = "atmel,hsmci"; 834 compatible = "atmel,hsmci";
835 reg = <0xfff80000 0x600>; 835 reg = <0xfff80000 0x600>;
836 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>; 836 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
837 pinctrl-names = "default";
837 #address-cells = <1>; 838 #address-cells = <1>;
838 #size-cells = <0>; 839 #size-cells = <0>;
839 clocks = <&mci0_clk>; 840 clocks = <&mci0_clk>;
@@ -845,6 +846,7 @@
845 compatible = "atmel,hsmci"; 846 compatible = "atmel,hsmci";
846 reg = <0xfff84000 0x600>; 847 reg = <0xfff84000 0x600>;
847 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>; 848 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
849 pinctrl-names = "default";
848 #address-cells = <1>; 850 #address-cells = <1>;
849 #size-cells = <0>; 851 #size-cells = <0>;
850 clocks = <&mci1_clk>; 852 clocks = <&mci1_clk>;
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 034529d801b2..d66f102c352a 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -962,6 +962,7 @@ static int __init at91_clock_reset(void)
962 } 962 }
963 963
964 at91_pmc_write(AT91_PMC_SCDR, scdr); 964 at91_pmc_write(AT91_PMC_SCDR, scdr);
965 at91_pmc_write(AT91_PMC_PCDR, pcdr);
965 if (cpu_is_sama5d3()) 966 if (cpu_is_sama5d3())
966 at91_pmc_write(AT91_PMC_PCDR1, pcdr1); 967 at91_pmc_write(AT91_PMC_PCDR1, pcdr1);
967 968