aboutsummaryrefslogtreecommitdiff
path: root/include/drivers
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-06-17 19:44:51 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-06-17 19:44:51 +0000
commit9935047b2086faa3bf3ccf0b95a76510eb5a160b (patch)
tree34aa3a142d5f6a42d6455f0c8b2994bf0293dc29 /include/drivers
parenta53e89bcd1d183417bae13991afb8d44b5106bf9 (diff)
parent32b3b99918ec2b1d3d490a7f7151d4d1af76518f (diff)
downloadtrusted-firmware-a-9935047b2086faa3bf3ccf0b95a76510eb5a160b.tar.gz
Merge changes I80316689,I23cac4fb,If911e7de,I169ff358,I4e040cd5, ... into integration
* changes: ddr: a80x0: add DDR 32-bit ECC mode support ble: ap807: improve PLL configuration sequence ble: ap807: clean-up PLL configuration sequence ddr: a80x0: add DDR 32-bit mode support plat: marvell: mci: perform mci link tuning for all mci interfaces plat: marvell: mci: use more meaningful name for mci link tuning plat: marvell: a8k: remove wrong or unnecessary comments plat: marvell: ap807: enable snoop filter for ap807 plat: marvell: ap807: update configuration space of each CP plat: marvell: ap807: use correct address for MCIx4 register plat: marvell: add support for PLL 2.2GHz mode plat: marvell: armada: make a8k_common.mk and mss_common.mk more generic marvell: armada: add extra level in marvell platform hierarchy
Diffstat (limited to 'include/drivers')
-rw-r--r--include/drivers/marvell/aro.h4
-rw-r--r--include/drivers/marvell/mci.h2
-rw-r--r--include/drivers/marvell/mochi/ap_setup.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/include/drivers/marvell/aro.h b/include/drivers/marvell/aro.h
index c16f625387..4d1094a65a 100644
--- a/include/drivers/marvell/aro.h
+++ b/include/drivers/marvell/aro.h
@@ -21,11 +21,13 @@ enum hws_freq {
DDR_FREQ_SAR
};
+#include <mvebu_def.h>
+
enum cpu_clock_freq_mode {
CPU_2000_DDR_1200_RCLK_1200 = 0x0,
CPU_2000_DDR_1050_RCLK_1050 = 0x1,
CPU_1600_DDR_800_RCLK_800 = 0x4,
- CPU_1800_DDR_1200_RCLK_1200 = 0x6,
+ CPU_2200_DDR_1200_RCLK_1200 = 0x6,
CPU_1800_DDR_1050_RCLK_1050 = 0x7,
CPU_1600_DDR_900_RCLK_900 = 0x0B,
CPU_1600_DDR_1050_RCLK_1050 = 0x0D,
diff --git a/include/drivers/marvell/mci.h b/include/drivers/marvell/mci.h
index 8ef0234594..af5d620661 100644
--- a/include/drivers/marvell/mci.h
+++ b/include/drivers/marvell/mci.h
@@ -10,7 +10,7 @@
#ifndef MCI_H
#define MCI_H
-int mci_initialize(int mci_index);
+int mci_link_tune(int mci_index);
void mci_turn_link_down(void);
void mci_turn_link_on(void);
int mci_get_link_status(void);
diff --git a/include/drivers/marvell/mochi/ap_setup.h b/include/drivers/marvell/mochi/ap_setup.h
index eff4473252..5b0e75f46b 100644
--- a/include/drivers/marvell/mochi/ap_setup.h
+++ b/include/drivers/marvell/mochi/ap_setup.h
@@ -13,5 +13,6 @@
void ap_init(void);
void ap_ble_init(void);
int ap_get_count(void);
+void update_cp110_default_win(int cp_id);
#endif /* AP_SETUP_H */