History

Merge tag 'zynqmp-soc-for-v5.2' of https://github.com/Xilinx/linux-xlnx into arm/drivers

arm64: zynqmp: SoC changes for v5.2 - Add support for ZynqMP fpga manager - Defer some probes which depends on firmware driver to be ready - Debugfs fix * tag 'zynqmp-soc-for-v5.2' of https://github.com/Xilinx/linux-xlnx: fpga manager: Adding FPGA Manager support for Xilinx zynqmp dt-bindings: fpga: Add bindings for ZynqMP fpga driver firmware: xilinx: Add fpga API's drivers: Defer probe if firmware is not ready firmware: xilinx: fix debugfs write handler

Olof Johansson committed 7 years ago

Commit b94d3ff2 parents 0065198 c09f74714 files · +302 −39Browse files

Showing the changes to include/linux (1 of 14 files). Show all

Unified · Split

include/linux/firmware/xlnx-zynqmp.h+13−1
@@ -48,6 +48,14 @@ · 47 unmodified lines
4848 #define ZYNQMP_PM_CAPABILITY_WAKEUP 0x4U
4949 #define ZYNQMP_PM_CAPABILITY_POWER 0x8U
5050
51+/*
52+ * Firmware FPGA Manager flags
53+ * XILINX_ZYNQMP_PM_FPGA_FULL: FPGA full reconfiguration
54+ * XILINX_ZYNQMP_PM_FPGA_PARTIAL: FPGA partial reconfiguration
55+ */
56+#define XILINX_ZYNQMP_PM_FPGA_FULL 0x0U
57+#define XILINX_ZYNQMP_PM_FPGA_PARTIAL BIT(0)
58+
5159 enum pm_api_id {
5260 PM_GET_API_VERSION = 1,
5361 PM_REQUEST_NODE = 13,
@@ -56,6 +64,8 @@ enum pm_api_id { · 2 unmodified lines
5664 PM_RESET_ASSERT = 17,
5765 PM_RESET_GET_STATUS,
5866 PM_PM_INIT_FINALIZE = 21,
67+ PM_FPGA_LOAD,
68+ PM_FPGA_GET_STATUS,
5969 PM_GET_CHIPID = 24,
6070 PM_IOCTL = 34,
6171 PM_QUERY_DATA,
@@ -258,6 +268,8 @@ struct zynqmp_pm_query_data { · 196 unmodified lines
258268 struct zynqmp_eemi_ops {
259269 int (*get_api_version)(u32 *version);
260270 int (*get_chipid)(u32 *idcode, u32 *version);
271+ int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
272+ int (*fpga_get_status)(u32 *value);
261273 int (*query_data)(struct zynqmp_pm_query_data qdata, u32 *out);
262274 int (*clock_enable)(u32 clock_id);
263275 int (*clock_disable)(u32 clock_id);
@@ -293,7 +305,7 @@ const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void); · 29 unmodified lines
293305 #else
294306 static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
295307 {
296− return NULL;
308+ return ERR_PTR(-ENODEV);
297309 }
298310 #endif
299311

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t