| Message ID | 1578596764-29351-2-git-send-email-jolly.shah@xilinx.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dceeb0f0e61071b1d990459dbd6a53f590cdaf77 |
| Headers | show |
| Series | arch: arm64: xilinx: Make zynqmp_firmware driver optional | expand |
On 09. 01. 20 20:06, Jolly Shah wrote: > From: Tejas Patel <tejas.patel@xilinx.com> > > zynqmp_eemi_ops will be compiled only when CONFIG_ZYNQMP_FIRMWARE is > enabled. So check for CONFIG_ZYNQMP_FIRMWARE instead of checking for > CONFIG_ARCH_ZYNQMP. > > Signed-off-by: Tejas Patel <tejas.patel@xilinx.com> > Signed-off-by: Jolly Shah <jolly.shah@xilinx.com> > --- > include/linux/firmware/xlnx-zynqmp.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h > index e41ad9e..a50a30b 100644 > --- a/include/linux/firmware/xlnx-zynqmp.h > +++ b/include/linux/firmware/xlnx-zynqmp.h > @@ -311,7 +311,7 @@ struct zynqmp_eemi_ops { > int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 arg0, u32 arg1, > u32 arg2, u32 arg3, u32 *ret_payload); > > -#if IS_REACHABLE(CONFIG_ARCH_ZYNQMP) > +#if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE) > const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void); > #else > static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void) > I think that make sense to fix this dependency no matter if 2/2 is applied. That's why adding it to my queue. Thanks, Michal
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h index e41ad9e..a50a30b 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -311,7 +311,7 @@ struct zynqmp_eemi_ops { int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 *ret_payload); -#if IS_REACHABLE(CONFIG_ARCH_ZYNQMP) +#if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE) const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void); #else static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)