summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-19 23:58:01 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-19 23:58:01 +0200
commitc2543a21df335484fa86bd652b5564d0ca90d5f6 (patch)
tree99dd2883487480688fbfcfb00a07d8cd21b85060 /arch/arm/include/asm
parent69f14dc2fd64307f012381dd333a06001dec75dc (diff)
parentbf3b98a1886ef18d7e2e4f83fec17f6c8cc51eaf (diff)
downloadtalos-obmc-uboot-c2543a21df335484fa86bd652b5564d0ca90d5f6.tar.gz
talos-obmc-uboot-c2543a21df335484fa86bd652b5564d0ca90d5f6.zip
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-am33xx/sys_proto.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h
index fedc674031..307ac28245 100644
--- a/arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -32,6 +32,7 @@ extern struct ctrl_stat *cstat;
u32 get_device_type(void);
void save_omap_boot_params(void);
void setup_clocks_for_console(void);
+void mpu_pll_config_val(int mpull_m);
void ddr_pll_config(unsigned int ddrpll_M);
void sdelay(unsigned long);
@@ -41,4 +42,7 @@ void gpmc_init(void);
void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
u32 size);
void omap_nand_switch_ecc(uint32_t, uint32_t);
+
+void rtc32k_enable(void);
+void uart_soft_reset(void);
#endif
OpenPOWER on IntegriCloud