diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-06-24 12:07:34 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-06-26 09:23:18 -0400 |
commit | d04e5b694e996e7cbbe3748924a259a647c3456d (patch) | |
tree | 9d8844e2129b2543800aefa29053fb5395d7f61b | |
parent | 7319ee0495b7a0c7aee69beb580cd293d5e21ef4 (diff) |
ARM: at91/PMC: fix at91sam9n12 USB FS init
at91sam9n12 has Full-speed only USB. So we should add
it to the list in at91_pllb_usbfs_clock_init() function.
Moreover, at91sam9n12 has an unusual PMC in the sense that it
has a PLLB but also has a USB clock register.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/clock.c | 25 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_pmc.h | 3 |
2 files changed, 24 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 978de42e041a..661111fd76ac 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c | |||
@@ -489,7 +489,7 @@ static int at91_clk_show(struct seq_file *s, void *unused) | |||
489 | seq_printf(s, "UCKR = %8x\n", uckr); | 489 | seq_printf(s, "UCKR = %8x\n", uckr); |
490 | } | 490 | } |
491 | seq_printf(s, "MCKR = %8x\n", at91_pmc_read(AT91_PMC_MCKR)); | 491 | seq_printf(s, "MCKR = %8x\n", at91_pmc_read(AT91_PMC_MCKR)); |
492 | if (cpu_has_upll()) | 492 | if (cpu_has_upll() || cpu_is_at91sam9n12()) |
493 | seq_printf(s, "USB = %8x\n", at91_pmc_read(AT91_PMC_USB)); | 493 | seq_printf(s, "USB = %8x\n", at91_pmc_read(AT91_PMC_USB)); |
494 | seq_printf(s, "SR = %8x\n", sr); | 494 | seq_printf(s, "SR = %8x\n", sr); |
495 | 495 | ||
@@ -614,6 +614,8 @@ static u32 __init at91_usb_rate(struct clk *pll, u32 freq, u32 reg) | |||
614 | { | 614 | { |
615 | if (pll == &pllb && (reg & AT91_PMC_USB96M)) | 615 | if (pll == &pllb && (reg & AT91_PMC_USB96M)) |
616 | return freq / 2; | 616 | return freq / 2; |
617 | else if (pll == &utmi_clk || cpu_is_at91sam9n12()) | ||
618 | return freq / (1 + ((reg & AT91_PMC_OHCIUSBDIV) >> 8)); | ||
617 | else | 619 | else |
618 | return freq; | 620 | return freq; |
619 | } | 621 | } |
@@ -683,6 +685,8 @@ static struct clk *const standard_pmc_clocks[] __initconst = { | |||
683 | /* PLLB generated USB full speed clock init */ | 685 | /* PLLB generated USB full speed clock init */ |
684 | static void __init at91_pllb_usbfs_clock_init(unsigned long main_clock) | 686 | static void __init at91_pllb_usbfs_clock_init(unsigned long main_clock) |
685 | { | 687 | { |
688 | unsigned int reg; | ||
689 | |||
686 | /* | 690 | /* |
687 | * USB clock init: choose 48 MHz PLLB value, | 691 | * USB clock init: choose 48 MHz PLLB value, |
688 | * disable 48MHz clock during usb peripheral suspend. | 692 | * disable 48MHz clock during usb peripheral suspend. |
@@ -691,22 +695,35 @@ static void __init at91_pllb_usbfs_clock_init(unsigned long main_clock) | |||
691 | */ | 695 | */ |
692 | uhpck.parent = &pllb; | 696 | uhpck.parent = &pllb; |
693 | 697 | ||
694 | at91_pllb_usb_init = at91_pll_calc(main_clock, 48000000 * 2) | AT91_PMC_USB96M; | 698 | reg = at91_pllb_usb_init = at91_pll_calc(main_clock, 48000000 * 2); |
695 | pllb.rate_hz = at91_pll_rate(&pllb, main_clock, at91_pllb_usb_init); | 699 | pllb.rate_hz = at91_pll_rate(&pllb, main_clock, at91_pllb_usb_init); |
696 | if (cpu_is_at91rm9200()) { | 700 | if (cpu_is_at91rm9200()) { |
701 | reg = at91_pllb_usb_init |= AT91_PMC_USB96M; | ||
697 | uhpck.pmc_mask = AT91RM9200_PMC_UHP; | 702 | uhpck.pmc_mask = AT91RM9200_PMC_UHP; |
698 | udpck.pmc_mask = AT91RM9200_PMC_UDP; | 703 | udpck.pmc_mask = AT91RM9200_PMC_UDP; |
699 | at91_pmc_write(AT91_PMC_SCER, AT91RM9200_PMC_MCKUDP); | 704 | at91_pmc_write(AT91_PMC_SCER, AT91RM9200_PMC_MCKUDP); |
700 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || | 705 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || |
701 | cpu_is_at91sam9263() || cpu_is_at91sam9g20() || | 706 | cpu_is_at91sam9263() || cpu_is_at91sam9g20() || |
702 | cpu_is_at91sam9g10()) { | 707 | cpu_is_at91sam9g10()) { |
708 | reg = at91_pllb_usb_init |= AT91_PMC_USB96M; | ||
709 | uhpck.pmc_mask = AT91SAM926x_PMC_UHP; | ||
710 | udpck.pmc_mask = AT91SAM926x_PMC_UDP; | ||
711 | } else if (cpu_is_at91sam9n12()) { | ||
712 | /* Divider for USB clock is in USB clock register for 9n12 */ | ||
713 | reg = AT91_PMC_USBS_PLLB; | ||
714 | |||
715 | /* For PLLB output 96M, set usb divider 2 (USBDIV + 1) */ | ||
716 | reg |= AT91_PMC_OHCIUSBDIV_2; | ||
717 | at91_pmc_write(AT91_PMC_USB, reg); | ||
718 | |||
719 | /* Still setup masks */ | ||
703 | uhpck.pmc_mask = AT91SAM926x_PMC_UHP; | 720 | uhpck.pmc_mask = AT91SAM926x_PMC_UHP; |
704 | udpck.pmc_mask = AT91SAM926x_PMC_UDP; | 721 | udpck.pmc_mask = AT91SAM926x_PMC_UDP; |
705 | } | 722 | } |
706 | at91_pmc_write(AT91_CKGR_PLLBR, 0); | 723 | at91_pmc_write(AT91_CKGR_PLLBR, 0); |
707 | 724 | ||
708 | udpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, at91_pllb_usb_init); | 725 | udpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, reg); |
709 | uhpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, at91_pllb_usb_init); | 726 | uhpck.rate_hz = at91_usb_rate(&pllb, pllb.rate_hz, reg); |
710 | } | 727 | } |
711 | 728 | ||
712 | /* UPLL generated USB full speed clock init */ | 729 | /* UPLL generated USB full speed clock init */ |
diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h index 2bd7f51b0b82..c604cc69acb5 100644 --- a/arch/arm/mach-at91/include/mach/at91_pmc.h +++ b/arch/arm/mach-at91/include/mach/at91_pmc.h | |||
@@ -130,7 +130,10 @@ extern void __iomem *at91_pmc_base; | |||
130 | #define AT91_PMC_USBS (0x1 << 0) /* USB OHCI Input clock selection */ | 130 | #define AT91_PMC_USBS (0x1 << 0) /* USB OHCI Input clock selection */ |
131 | #define AT91_PMC_USBS_PLLA (0 << 0) | 131 | #define AT91_PMC_USBS_PLLA (0 << 0) |
132 | #define AT91_PMC_USBS_UPLL (1 << 0) | 132 | #define AT91_PMC_USBS_UPLL (1 << 0) |
133 | #define AT91_PMC_USBS_PLLB (1 << 0) /* [AT91SAMN12 only] */ | ||
133 | #define AT91_PMC_OHCIUSBDIV (0xF << 8) /* Divider for USB OHCI Clock */ | 134 | #define AT91_PMC_OHCIUSBDIV (0xF << 8) /* Divider for USB OHCI Clock */ |
135 | #define AT91_PMC_OHCIUSBDIV_1 (0x0 << 8) | ||
136 | #define AT91_PMC_OHCIUSBDIV_2 (0x1 << 8) | ||
134 | 137 | ||
135 | #define AT91_PMC_SMD 0x3c /* Soft Modem Clock Register [some SAM9 only] */ | 138 | #define AT91_PMC_SMD 0x3c /* Soft Modem Clock Register [some SAM9 only] */ |
136 | #define AT91_PMC_SMDS (0x1 << 0) /* SMD input clock selection */ | 139 | #define AT91_PMC_SMDS (0x1 << 0) /* SMD input clock selection */ |