diff options
| author |   Andy Gross <andy.gross@linaro.org> | 2018-09-30 12:44:18 -0500 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2018-09-30 12:44:18 -0500 |
| commit | bbd4b28bb8f65fc7347202f32ac82901201ac02f (patch) | |
| tree | c962261e4e443b776653771b5e34405c5d6073c7 /include | |
| parent | Linux 4.19-rc1 (diff) | |
| parent | soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples (diff) | |
Merge tag 'qcom-geni-immutable-for-mark-brown' into drivers-for-4.20-final
Immutable branch for QCOM Geni patches
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qcom-geni-se.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h index 5d6144977828..3bcd67fd5548 100644 --- a/include/linux/qcom-geni-se.h +++ b/include/linux/qcom-geni-se.h @@ -225,19 +225,14 @@ struct geni_se { #define HW_VER_MINOR_SHFT 16 #define HW_VER_STEP_MASK GENMASK(15, 0) +#define GENI_SE_VERSION_MAJOR(ver) ((ver & HW_VER_MAJOR_MASK) >> HW_VER_MAJOR_SHFT) +#define GENI_SE_VERSION_MINOR(ver) ((ver & HW_VER_MINOR_MASK) >> HW_VER_MINOR_SHFT) +#define GENI_SE_VERSION_STEP(ver) (ver & HW_VER_STEP_MASK) + #if IS_ENABLED(CONFIG_QCOM_GENI_SE) u32 geni_se_get_qup_hw_version(struct geni_se *se); -#define geni_se_get_wrapper_version(se, major, minor, step) do { \ - u32 ver; \ -\ - ver = geni_se_get_qup_hw_version(se); \ - major = (ver & HW_VER_MAJOR_MASK) >> HW_VER_MAJOR_SHFT; \ - minor = (ver & HW_VER_MINOR_MASK) >> HW_VER_MINOR_SHFT; \ - step = version & HW_VER_STEP_MASK; \ -} while (0) - /** * geni_se_read_proto() - Read the protocol configured for a serial engine * @se: Pointer to the concerned serial engine. |