diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
| commit | e97f9d817e600cd6f43d1d0da76f5787e33a5c56 (patch) | |
| tree | 99603834683039fec18a31770f8a05879d432e6d /arch/arm/include/asm/omap_common.h | |
| parent | c0cae2e24552d57f3e2f841ec235453413cd7389 (diff) | |
| parent | b1cde7e21f950e05d18c102976c3b7d232b65e13 (diff) | |
| download | talos-obmc-uboot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.tar.gz talos-obmc-uboot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/omap_common.h')
| -rw-r--r-- | arch/arm/include/asm/omap_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index a78f99079b..04925bca1c 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -567,7 +567,6 @@ u32 omap_ddr_clk(void); u32 get_sys_clk_index(void); void enable_basic_clocks(void); void enable_basic_uboot_clocks(void); -void enable_non_essential_clocks(void); void scale_vcores(struct vcores_data const *); u32 get_offset_code(u32 volt_offset, struct pmic_data *pmic); void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic); @@ -643,6 +642,7 @@ static inline u8 is_dra7xx(void) /* DRA7XX */ #define DRA752_ES1_0 0x07520100 +#define DRA752_ES1_1 0x07520110 /* * SRAM scratch space entries |
