Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191711
b: refs/heads/master
c: 4b478ee
h: refs/heads/master
i:
  191709: 5efc230
  191707: 833e85e
  191703: f9e6841
  191695: 9fde3a4
  191679: 8ae52fa
v: v3
  • Loading branch information
Paul Mundt committed May 11, 2010
1 parent 5c4ee69 commit fe32039
Show file tree
Hide file tree
Showing 30 changed files with 1,541 additions and 2,159 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ef4ed97d6bd91aa41907181e80a7feaf2721719a
refs/heads/master: 4b478ee2a1251d99813a90afeb0f809b3a8b04fb
10 changes: 3 additions & 7 deletions trunk/arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ config CPU_SHX2
config CPU_SHX3
bool
select DMA_COHERENT
select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_NUMA

config ARCH_SHMOBILE
bool
Expand Down Expand Up @@ -452,18 +454,12 @@ config CPU_SUBTYPE_SH7786
select CPU_SH4A
select CPU_SHX3
select CPU_HAS_PTEAEX
select ARCH_SPARSEMEM_ENABLE
select SYS_SUPPORTS_NUMA
select SYS_SUPPORTS_SMP
select GENERIC_CLOCKEVENTS_BROADCAST if SMP

config CPU_SUBTYPE_SHX3
bool "Support SH-X3 processor"
select CPU_SH4A
select CPU_SHX3
select ARCH_SPARSEMEM_ENABLE
select SYS_SUPPORTS_NUMA
select SYS_SUPPORTS_SMP
select GENERIC_CLOCKEVENTS_BROADCAST if SMP

# SH4AL-DSP Processor Support
Expand Down Expand Up @@ -633,7 +629,7 @@ config KEXEC

config CRASH_DUMP
bool "kernel crash dumps (EXPERIMENTAL)"
depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
depends on SUPERH32 && EXPERIMENTAL
help
Generate crash dump after being started by kexec.
This should be normally only set in special crash dump kernels
Expand Down
26 changes: 11 additions & 15 deletions trunk/arch/sh/boards/mach-ecovec24/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,8 @@ static struct clk_ops fsimck_clk_ops = {
};

static struct clk fsimckb_clk = {
.name = "fsimckb_clk",
.id = -1,
.ops = &fsimck_clk_ops,
.enable_reg = (void __iomem *)FCLKBCR,
.rate = 0, /* unknown */
Expand Down Expand Up @@ -1136,20 +1138,16 @@ static int __init arch_setup(void)

/* set SPU2 clock to 83.4 MHz */
clk = clk_get(NULL, "spu_clk");
if (clk) {
clk_set_rate(clk, clk_round_rate(clk, 83333333));
clk_put(clk);
}
clk_set_rate(clk, clk_round_rate(clk, 83333333));
clk_put(clk);

/* change parent of FSI B */
clk = clk_get(NULL, "fsib_clk");
if (clk) {
clk_register(&fsimckb_clk);
clk_set_parent(clk, &fsimckb_clk);
clk_set_rate(clk, 11000);
clk_set_rate(&fsimckb_clk, 11000);
clk_put(clk);
}
clk_register(&fsimckb_clk);
clk_set_parent(clk, &fsimckb_clk);
clk_set_rate(clk, 11000);
clk_set_rate(&fsimckb_clk, 11000);
clk_put(clk);

gpio_request(GPIO_PTU0, NULL);
gpio_direction_output(GPIO_PTU0, 0);
Expand All @@ -1161,10 +1159,8 @@ static int __init arch_setup(void)

/* set VPU clock to 166 MHz */
clk = clk_get(NULL, "vpu_clk");
if (clk) {
clk_set_rate(clk, clk_round_rate(clk, 166000000));
clk_put(clk);
}
clk_set_rate(clk, clk_round_rate(clk, 166000000));
clk_put(clk);

/* enable IrDA */
gpio_request(GPIO_FN_IRDA_OUT, NULL);
Expand Down
12 changes: 1 addition & 11 deletions trunk/arch/sh/boards/mach-highlander/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* for more details.
*/
#include <linux/init.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/types.h>
Expand All @@ -27,7 +26,6 @@
#include <net/ax88796.h>
#include <asm/machvec.h>
#include <mach/highlander.h>
#include <asm/clkdev.h>
#include <asm/clock.h>
#include <asm/heartbeat.h>
#include <asm/io.h>
Expand Down Expand Up @@ -328,20 +326,14 @@ static struct clk_ops ivdr_clk_ops = {
};

static struct clk ivdr_clk = {
.name = "ivdr_clk",
.ops = &ivdr_clk_ops,
};

static struct clk *r7780rp_clocks[] = {
&ivdr_clk,
};

#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

static struct clk_lookup lookups[] = {
/* main clocks */
CLKDEV_CON_ID("ivdr_clk", &ivdr_clk),
};

static void r7780rp_power_off(void)
{
if (mach_is_r7780mp() || mach_is_r7785rp())
Expand Down Expand Up @@ -378,8 +370,6 @@ static void __init highlander_setup(char **cmdline_p)
clk_enable(clk);
}

clkdev_add_table(lookups, ARRAY_SIZE(lookups));

__raw_writew(0x0000, PA_OBLED); /* Clear LED. */

if (mach_is_r7780rp())
Expand Down
20 changes: 9 additions & 11 deletions trunk/arch/sh/boards/mach-se/7724/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ static struct clk_ops fsimck_clk_ops = {
};

static struct clk fsimcka_clk = {
.name = "fsimcka_clk",
.id = -1,
.ops = &fsimck_clk_ops,
.enable_reg = (void __iomem *)FCLKACR,
.rate = 0, /* unknown */
Expand Down Expand Up @@ -769,20 +771,16 @@ static int __init devices_setup(void)

/* set SPU2 clock to 83.4 MHz */
clk = clk_get(NULL, "spu_clk");
if (clk) {
clk_set_rate(clk, clk_round_rate(clk, 83333333));
clk_put(clk);
}
clk_set_rate(clk, clk_round_rate(clk, 83333333));
clk_put(clk);

/* change parent of FSI A */
clk = clk_get(NULL, "fsia_clk");
if (clk) {
clk_register(&fsimcka_clk);
clk_set_parent(clk, &fsimcka_clk);
clk_set_rate(clk, 11000);
clk_set_rate(&fsimcka_clk, 11000);
clk_put(clk);
}
clk_register(&fsimcka_clk);
clk_set_parent(clk, &fsimcka_clk);
clk_set_rate(clk, 11000);
clk_set_rate(&fsimcka_clk, 11000);
clk_put(clk);

/* SDHI0 connected to cn7 */
gpio_request(GPIO_FN_SDHI0CD, NULL);
Expand Down
154 changes: 151 additions & 3 deletions trunk/arch/sh/include/asm/clock.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,164 @@
#ifndef __ASM_SH_CLOCK_H
#define __ASM_SH_CLOCK_H

#include <linux/sh_clk.h>
#include <linux/list.h>
#include <linux/seq_file.h>
#include <linux/cpufreq.h>
#include <linux/clk.h>
#include <linux/err.h>

struct clk;

struct clk_ops {
void (*init)(struct clk *clk);
int (*enable)(struct clk *clk);
void (*disable)(struct clk *clk);
unsigned long (*recalc)(struct clk *clk);
int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id);
int (*set_parent)(struct clk *clk, struct clk *parent);
long (*round_rate)(struct clk *clk, unsigned long rate);
};

struct clk {
struct list_head node;
const char *name;
int id;
struct module *owner;

struct clk *parent;
struct clk_ops *ops;

struct list_head children;
struct list_head sibling; /* node for children */

int usecount;

unsigned long rate;
unsigned long flags;

void __iomem *enable_reg;
unsigned int enable_bit;

unsigned long arch_flags;
void *priv;
struct dentry *dentry;
struct cpufreq_frequency_table *freq_table;
};

#define CLK_ENABLE_ON_INIT (1 << 0)

/* Should be defined by processor-specific code */
void __deprecated arch_init_clk_ops(struct clk_ops **, int type);
int __init arch_clk_init(void);

/* arch/sh/kernel/cpu/clock.c */
int clk_init(void);
unsigned long followparent_recalc(struct clk *);
void recalculate_root_clocks(void);
void propagate_rate(struct clk *);
int clk_reparent(struct clk *child, struct clk *parent);
int clk_register(struct clk *);
void clk_unregister(struct clk *);

/* arch/sh/kernel/cpu/clock-cpg.c */
int __init __deprecated cpg_clk_init(void);

/* arch/sh/kernel/cpu/clock.c */
int clk_init(void);
/* the exported API, in addition to clk_set_rate */
/**
* clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
* @clk: clock source
* @rate: desired clock rate in Hz
* @algo_id: algorithm id to be passed down to ops->set_rate
*
* Returns success (0) or negative errno.
*/
int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id);

enum clk_sh_algo_id {
NO_CHANGE = 0,

IUS_N1_N1,
IUS_322,
IUS_522,
IUS_N11,

SB_N1,

SB3_N1,
SB3_32,
SB3_43,
SB3_54,

BP_N1,

IP_N1,
};

struct clk_div_mult_table {
unsigned int *divisors;
unsigned int nr_divisors;
unsigned int *multipliers;
unsigned int nr_multipliers;
};

struct cpufreq_frequency_table;
void clk_rate_table_build(struct clk *clk,
struct cpufreq_frequency_table *freq_table,
int nr_freqs,
struct clk_div_mult_table *src_table,
unsigned long *bitmap);

long clk_rate_table_round(struct clk *clk,
struct cpufreq_frequency_table *freq_table,
unsigned long rate);

int clk_rate_table_find(struct clk *clk,
struct cpufreq_frequency_table *freq_table,
unsigned long rate);

#define SH_CLK_MSTP32(_name, _id, _parent, _enable_reg, \
_enable_bit, _flags) \
{ \
.name = _name, \
.id = _id, \
.parent = _parent, \
.enable_reg = (void __iomem *)_enable_reg, \
.enable_bit = _enable_bit, \
.flags = _flags, \
}

int sh_clk_mstp32_register(struct clk *clks, int nr);

#define SH_CLK_DIV4(_name, _parent, _reg, _shift, _div_bitmap, _flags) \
{ \
.name = _name, \
.parent = _parent, \
.enable_reg = (void __iomem *)_reg, \
.enable_bit = _shift, \
.arch_flags = _div_bitmap, \
.flags = _flags, \
}

struct clk_div4_table {
struct clk_div_mult_table *div_mult_table;
void (*kick)(struct clk *clk);
};

int sh_clk_div4_register(struct clk *clks, int nr,
struct clk_div4_table *table);
int sh_clk_div4_enable_register(struct clk *clks, int nr,
struct clk_div4_table *table);
int sh_clk_div4_reparent_register(struct clk *clks, int nr,
struct clk_div4_table *table);

#define SH_CLK_DIV6(_name, _parent, _reg, _flags) \
{ \
.name = _name, \
.parent = _parent, \
.enable_reg = (void __iomem *)_reg, \
.flags = _flags, \
}

int sh_clk_div6_register(struct clk *clks, int nr);

#endif /* __ASM_SH_CLOCK_H */
12 changes: 7 additions & 5 deletions trunk/arch/sh/include/asm/hwblk.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,13 @@ void hwblk_cnt_inc(struct hwblk_info *info, int hwblk, int cnt);
void hwblk_cnt_dec(struct hwblk_info *info, int hwblk, int cnt);

/* allow clocks to enable and disable hardware blocks */
#define SH_HWBLK_CLK(_hwblk, _parent, _flags) \
[_hwblk] = { \
.parent = _parent, \
.arch_flags = _hwblk, \
.flags = _flags, \
#define SH_HWBLK_CLK(_name, _id, _parent, _hwblk, _flags) \
{ \
.name = _name, \
.id = _id, \
.parent = _parent, \
.arch_flags = _hwblk, \
.flags = _flags, \
}

int sh_hwblk_clk_register(struct clk *clks, int nr);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh/kernel/cpu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/
# Common interfaces.

obj-$(CONFIG_SH_ADC) += adc.o
obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o
obj-$(CONFIG_SH_CLK_CPG) += clock-cpg.o
obj-$(CONFIG_SH_FPU) += fpu.o
obj-$(CONFIG_SH_FPU_EMU) += fpu.o

Expand Down
Loading

0 comments on commit fe32039

Please sign in to comment.