diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:36:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:36:29 +0200 |
| commit | f56b064fa3d91afdf06d6a48e18063cfd3f0efe5 (patch) | |
| tree | ed548c9d6ed80204febd112e0c4f121c610481f4 /arch/arm/mach-imx/include | |
| parent | 619fdd01abf5131eb020a16435b7c95c54a3335b (diff) | |
| parent | 2f228f72e0a8367e2c9fb9bb5551a256126a00d7 (diff) | |
| download | barebox-f56b064fa3d91afdf06d6a48e18063cfd3f0efe5.tar.gz barebox-f56b064fa3d91afdf06d6a48e18063cfd3f0efe5.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-imx/include')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx5.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx5.h b/arch/arm/mach-imx/include/mach/imx5.h index 7f5c2eff50..5d1a7d7d40 100644 --- a/arch/arm/mach-imx/include/mach/imx5.h +++ b/arch/arm/mach-imx/include/mach/imx5.h @@ -9,6 +9,7 @@ void imx5_init_lowlevel(void); void imx5_setup_pll(void __iomem *base, int freq, u32 op, u32 mfd, u32 mfn); #define imx5_setup_pll_1000(base) imx5_setup_pll((base), 1000, ((10 << 4) + ((1 - 1) << 0)), (12 - 1), 5) +#define imx5_setup_pll_864(base) imx5_setup_pll((base), 864, (( 8 << 4) + ((1 - 1) << 0)), (180 - 1), 180) #define imx5_setup_pll_800(base) imx5_setup_pll((base), 800, (( 8 << 4) + ((1 - 1) << 0)), (3 - 1), 1) #define imx5_setup_pll_665(base) imx5_setup_pll((base), 665, (( 6 << 4) + ((1 - 1) << 0)), (96 - 1), 89) #define imx5_setup_pll_600(base) imx5_setup_pll((base), 600, (( 6 << 4) + ((1 - 1) << 0)), ( 4 - 1), 1) |