|
@@ -315,17 +315,26 @@ static struct clk __init *alchemy_clk_setup_mem(const char *pn, int ct)
|
|
|
|
|
|
/* lrclk: external synchronous static bus clock ***********************/
|
|
/* lrclk: external synchronous static bus clock ***********************/
|
|
|
|
|
|
-static struct clk __init *alchemy_clk_setup_lrclk(const char *pn)
|
|
|
|
|
|
+static struct clk __init *alchemy_clk_setup_lrclk(const char *pn, int t)
|
|
{
|
|
{
|
|
- /* MEM_STCFG0[15:13] = divisor.
|
|
|
|
|
|
+ /* Au1000, Au1500: MEM_STCFG0[11]: If bit is set, lrclk=pclk/5,
|
|
|
|
+ * otherwise lrclk=pclk/4.
|
|
|
|
+ * All other variants: MEM_STCFG0[15:13] = divisor.
|
|
* L/RCLK = periph_clk / (divisor + 1)
|
|
* L/RCLK = periph_clk / (divisor + 1)
|
|
* On Au1000, Au1500, Au1100 it's called LCLK,
|
|
* On Au1000, Au1500, Au1100 it's called LCLK,
|
|
* on later models it's called RCLK, but it's the same thing.
|
|
* on later models it's called RCLK, but it's the same thing.
|
|
*/
|
|
*/
|
|
struct clk *c;
|
|
struct clk *c;
|
|
- unsigned long v = alchemy_rdsmem(AU1000_MEM_STCFG0) >> 13;
|
|
|
|
|
|
+ unsigned long v = alchemy_rdsmem(AU1000_MEM_STCFG0);
|
|
|
|
|
|
- v = (v & 7) + 1;
|
|
|
|
|
|
+ switch (t) {
|
|
|
|
+ case ALCHEMY_CPU_AU1000:
|
|
|
|
+ case ALCHEMY_CPU_AU1500:
|
|
|
|
+ v = 4 + ((v >> 11) & 1);
|
|
|
|
+ break;
|
|
|
|
+ default: /* all other models */
|
|
|
|
+ v = ((v >> 13) & 7) + 1;
|
|
|
|
+ }
|
|
c = clk_register_fixed_factor(NULL, ALCHEMY_LR_CLK,
|
|
c = clk_register_fixed_factor(NULL, ALCHEMY_LR_CLK,
|
|
pn, 0, 1, v);
|
|
pn, 0, 1, v);
|
|
if (!IS_ERR(c))
|
|
if (!IS_ERR(c))
|
|
@@ -1060,7 +1069,7 @@ static int __init alchemy_clk_init(void)
|
|
ERRCK(c)
|
|
ERRCK(c)
|
|
|
|
|
|
/* L/RCLK: external static bus clock for synchronous mode */
|
|
/* L/RCLK: external static bus clock for synchronous mode */
|
|
- c = alchemy_clk_setup_lrclk(ALCHEMY_PERIPH_CLK);
|
|
|
|
|
|
+ c = alchemy_clk_setup_lrclk(ALCHEMY_PERIPH_CLK, ctype);
|
|
ERRCK(c)
|
|
ERRCK(c)
|
|
|
|
|
|
/* Frequency dividers 0-5 */
|
|
/* Frequency dividers 0-5 */
|