diff options
Diffstat (limited to 'include/drivers')
-rw-r--r-- | include/drivers/marvell/a8k_i2c.h | 6 | ||||
-rw-r--r-- | include/drivers/marvell/addr_map.h | 4 | ||||
-rw-r--r-- | include/drivers/marvell/amb_adec.h | 6 | ||||
-rw-r--r-- | include/drivers/marvell/cache_llc.h | 24 | ||||
-rw-r--r-- | include/drivers/marvell/ccu.h | 16 | ||||
-rw-r--r-- | include/drivers/marvell/gwin.h | 6 | ||||
-rw-r--r-- | include/drivers/marvell/i2c.h | 4 | ||||
-rw-r--r-- | include/drivers/marvell/io_win.h | 6 | ||||
-rw-r--r-- | include/drivers/marvell/iob.h | 9 | ||||
-rw-r--r-- | include/drivers/marvell/mci.h | 6 | ||||
-rw-r--r-- | include/drivers/marvell/mochi/ap_setup.h | 5 | ||||
-rw-r--r-- | include/drivers/marvell/mochi/cp110_setup.h | 13 | ||||
-rw-r--r-- | include/drivers/marvell/thermal.h | 8 |
13 files changed, 72 insertions, 41 deletions
diff --git a/include/drivers/marvell/a8k_i2c.h b/include/drivers/marvell/a8k_i2c.h index 6605902e..8a9abe8d 100644 --- a/include/drivers/marvell/a8k_i2c.h +++ b/include/drivers/marvell/a8k_i2c.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ - + +/* This driver provides I2C support for Marvell A8K and compatible SoCs */ + #ifndef _A8K_I2C_H_ #define _A8K_I2C_H_ diff --git a/include/drivers/marvell/addr_map.h b/include/drivers/marvell/addr_map.h index c5407dfe..6b957a16 100644 --- a/include/drivers/marvell/addr_map.h +++ b/include/drivers/marvell/addr_map.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2017, 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* Address map types for Marvell address translation unit drivers */ + #ifndef _ADDR_MAP_H_ #define _ADDR_MAP_H_ diff --git a/include/drivers/marvell/amb_adec.h b/include/drivers/marvell/amb_adec.h index 3fe87b19..087864a4 100644 --- a/include/drivers/marvell/amb_adec.h +++ b/include/drivers/marvell/amb_adec.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */ + #ifndef _AMB_ADEC_H_ #define _AMB_ADEC_H_ @@ -29,6 +31,6 @@ enum amb_attribute_ids { #define AMB_MAX_WIN_ID 7 -int init_amb_adec(uintptr_t); +int init_amb_adec(uintptr_t base); #endif /* _AMB_ADEC_H_ */ diff --git a/include/drivers/marvell/cache_llc.h b/include/drivers/marvell/cache_llc.h index ea7298ce..9e417939 100644 --- a/include/drivers/marvell/cache_llc.h +++ b/include/drivers/marvell/cache_llc.h @@ -1,15 +1,19 @@ /* - * Copyright (C) 2015 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* LLC driver is the Last Level Cache (L3C) driver + * for Marvell SoCs in AP806, AP807, and AP810 + */ + #ifndef _CACHE_LLC_H_ #define _CACHE_LLC_H_ #define LLC_CTRL(ap) (MVEBU_LLC_BASE(ap) + 0x100) -#define LLC_CACHE_SYNC(ap) (MVEBU_LLC_BASE(ap) + 0x700) +#define LLC_SYNC(ap) (MVEBU_LLC_BASE(ap) + 0x700) #define L2X0_INV_WAY(ap) (MVEBU_LLC_BASE(ap) + 0x77C) #define L2X0_CLEAN_WAY(ap) (MVEBU_LLC_BASE(ap) + 0x7BC) #define L2X0_CLEAN_INV_WAY(ap) (MVEBU_LLC_BASE(ap) + 0x7FC) @@ -24,15 +28,13 @@ #define LLC_WAY_MASK 0xFFFFFFFF #ifndef __ASSEMBLY__ -void llc_cache_sync(int); -void llc_flush_all(int); -void llc_clean_all(int); -void llc_inv_all(int); -void llc_disable(int); -void llc_enable(int, int excl_mode); -int llc_is_exclusive(int); -void llc_save(int); -void llc_resume(int); +void llc_cache_sync(int ap_index); +void llc_flush_all(int ap_index); +void llc_clean_all(int ap_index); +void llc_inv_all(int ap_index); +void llc_disable(int ap_index); +void llc_enable(int ap_index, int excl_mode); +int llc_is_exclusive(int ap_index); void llc_runtime_enable(int ap_index); #endif diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h index 36438881..ff30a76a 100644 --- a/include/drivers/marvell/ccu.h +++ b/include/drivers/marvell/ccu.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */ + #ifndef _CCU_H_ #define _CCU_H_ @@ -13,16 +15,20 @@ #endif /* CCU registers definitions */ -#define CCU_WIN_CR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0x0 + (0x10 * win)) +#define CCU_WIN_CR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0x0 + \ + (0x10 * win)) #define CCU_TARGET_ID_OFFSET (8) #define CCU_TARGET_ID_MASK (0x7F) -#define CCU_WIN_SCR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0x4 + (0x10 * win)) +#define CCU_WIN_SCR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0x4 + \ + (0x10 * win)) #define CCU_WIN_ENA_WRITE_SECURE (0x1) #define CCU_WIN_ENA_READ_SECURE (0x2) -#define CCU_WIN_ALR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0x8 + (0x10 * win)) -#define CCU_WIN_AHR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0xC + (0x10 * win)) +#define CCU_WIN_ALR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0x8 + \ + (0x10 * win)) +#define CCU_WIN_AHR_OFFSET(ap, win) (MVEBU_CCU_BASE(ap) + 0xC + \ + (0x10 * win)) #define CCU_WIN_GCR_OFFSET(ap) (MVEBU_CCU_BASE(ap) + 0xD0) #define CCU_GCR_TARGET_OFFSET (8) diff --git a/include/drivers/marvell/gwin.h b/include/drivers/marvell/gwin.h index f5c113dc..5dc9f244 100644 --- a/include/drivers/marvell/gwin.h +++ b/include/drivers/marvell/gwin.h @@ -1,16 +1,18 @@ /* - * Copyright (C) 2017, 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* GWIN unit device driver for Marvell AP810 SoC */ + #ifndef _GWIN_H_ #define _GWIN_H_ #include <addr_map.h> -int init_gwin(int); +int init_gwin(int ap_index); void gwin_temp_win_insert(int ap_index, struct addr_map_win *win, int size); void gwin_temp_win_remove(int ap_index, struct addr_map_win *win, int size); diff --git a/include/drivers/marvell/i2c.h b/include/drivers/marvell/i2c.h index 7118547e..bd143852 100644 --- a/include/drivers/marvell/i2c.h +++ b/include/drivers/marvell/i2c.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ - + #ifndef _I2C_H_ #define _I2C_H_ diff --git a/include/drivers/marvell/io_win.h b/include/drivers/marvell/io_win.h index 4ec2cc0e..4102a11a 100644 --- a/include/drivers/marvell/io_win.h +++ b/include/drivers/marvell/io_win.h @@ -1,16 +1,18 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */ + #ifndef _IO_WIN_H_ #define _IO_WIN_H_ #include <addr_map.h> -int init_io_win(int); +int init_io_win(int ap_index); void iow_temp_win_insert(int ap_index, struct addr_map_win *win, int size); void iow_temp_win_remove(int ap_index, struct addr_map_win *win, int size); void iow_save_win_all(int ap_id); diff --git a/include/drivers/marvell/iob.h b/include/drivers/marvell/iob.h index adb8d4f3..9848c0ab 100644 --- a/include/drivers/marvell/iob.h +++ b/include/drivers/marvell/iob.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* IOW unit device driver for Marvell CP110 and CP115 SoCs */ + #ifndef _IOB_H_ #define _IOB_H_ @@ -22,7 +24,8 @@ enum target_ids_iob { IOB_MAX_TID }; -int init_iob(uintptr_t); -void iob_cfg_space_update(int ap_idx, int cp_idx, uintptr_t base, uintptr_t new_base); +int init_iob(uintptr_t base); +void iob_cfg_space_update(int ap_idx, int cp_idx, + uintptr_t base, uintptr_t new_base); #endif /* _IOB_H_ */ diff --git a/include/drivers/marvell/mci.h b/include/drivers/marvell/mci.h index 76122357..789b3b96 100644 --- a/include/drivers/marvell/mci.h +++ b/include/drivers/marvell/mci.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ - + +/* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */ + #ifndef _MCI_H_ #define _MCI_H_ diff --git a/include/drivers/marvell/mochi/ap_setup.h b/include/drivers/marvell/mochi/ap_setup.h index 1e6af6b7..41f2bac3 100644 --- a/include/drivers/marvell/mochi/ap_setup.h +++ b/include/drivers/marvell/mochi/ap_setup.h @@ -1,9 +1,12 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ + +/* AP8xx Marvell SoC driver */ + #ifndef __AP_SETUP_H__ #define __AP_SETUP_H__ diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index 032c829d..1c88980a 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -1,14 +1,17 @@ /* - * Copyright (C) 2016 - 2018 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ -#ifndef __PLAT_CP110_H__ -#define __PLAT_CP110_H__ + +/* CP110 Marvell SoC driver */ + +#ifndef __CP110_SETUP_H__ +#define __CP110_SETUP_H__ #include <mmio.h> -#include <plat_def.h> +#include <mvebu_def.h> #define MVEBU_DEVICE_ID_REG (MVEBU_CP_DFX_OFFSET + 0x40) #define MVEBU_DEVICE_ID_OFFSET (0) @@ -47,4 +50,4 @@ static inline uint32_t cp110_rev_id_get(uintptr_t base) void cp110_init(uintptr_t cp110_base, uint32_t stream_id); void cp110_ble_init(uintptr_t cp110_base); -#endif /* __PLAT_CP110_H__ */ +#endif /* __CP110_SETUP_H__ */ diff --git a/include/drivers/marvell/thermal.h b/include/drivers/marvell/thermal.h index b8eb19d0..191f97ba 100644 --- a/include/drivers/marvell/thermal.h +++ b/include/drivers/marvell/thermal.h @@ -1,10 +1,12 @@ /* - * Copyright (C) 2017 Marvell International Ltd. + * Copyright (C) 2018 Marvell International Ltd. * * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ +/* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */ + #ifndef _THERMAL_H #define _THERMAL_H @@ -17,8 +19,8 @@ struct tsen_config { int tsen_ready; void *regs_base; /* thermal functionality */ - int (*ptr_tsen_probe)(struct tsen_config *); - int (*ptr_tsen_read)(struct tsen_config *, int *); + int (*ptr_tsen_probe)(struct tsen_config *cfg); + int (*ptr_tsen_read)(struct tsen_config *cfg, int *temp); }; /* Thermal driver APIs */ |