diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-13 23:37:59 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-13 23:37:59 +0200 |
commit | 4b96cb6777d1dd9e69eabf14d41d3bb4bfc908ba (patch) | |
tree | 9234d73244c7aff7651a2d443b9af56f6f7dce47 /include/asm-sh | |
parent | 17f098bd4adb4bfa184db794f36b0b9c5a8577dc (diff) | |
parent | ed01c4f59ddda1cb898d86c1ac0945c756ab88c2 (diff) | |
download | u-boot-imx-4b96cb6777d1dd9e69eabf14d41d3bb4bfc908ba.zip u-boot-imx-4b96cb6777d1dd9e69eabf14d41d3bb4bfc908ba.tar.gz u-boot-imx-4b96cb6777d1dd9e69eabf14d41d3bb4bfc908ba.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/clk.h | 35 | ||||
-rw-r--r-- | include/asm-sh/macro.h | 2 |
2 files changed, 36 insertions, 1 deletions
diff --git a/include/asm-sh/clk.h b/include/asm-sh/clk.h new file mode 100644 index 0000000..9cac6b0 --- /dev/null +++ b/include/asm-sh/clk.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#ifndef __ASM_SH_CLK_H__ +#define __ASM_SH_CLK_H__ + +static inline unsigned long get_peripheral_clk_rate(void) +{ + return CONFIG_SYS_CLK_FREQ; +} + +static inline unsigned long get_tmu0_clk_rate(void) +{ + return CONFIG_SYS_CLK_FREQ; +} + +#endif /* __ASM_SH_CLK_H__ */ diff --git a/include/asm-sh/macro.h b/include/asm-sh/macro.h index 61f792a..2b273c3 100644 --- a/include/asm-sh/macro.h +++ b/include/asm-sh/macro.h @@ -29,7 +29,7 @@ .macro write16, addr, data mov.l \addr ,r1 - mov.l \data ,r0 + mov.w \data ,r0 mov.w r0, @r1 .endm |