diff options
| author | Simon Glass <sjg@chromium.org> | 2021-08-07 07:24:03 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-09-25 09:46:15 -0600 |
| commit | 414cc15144f69b66d12aa8881192e34862bc6042 (patch) | |
| tree | 07a154a1f32dca9f051e5809fa70d8a81b4b324f /include | |
| parent | eaad01a3d018a8a5b1003ab2d28e9e23e2b2db3f (diff) | |
| download | u-boot-414cc15144f69b66d12aa8881192e34862bc6042.zip u-boot-414cc15144f69b66d12aa8881192e34862bc6042.tar.gz u-boot-414cc15144f69b66d12aa8881192e34862bc6042.tar.bz2 | |
treewide: Simply conditions with the new OF_REAL
Use this new Kconfig to simplify the compilation conditions where
appropriate.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/clk.h | 4 | ||||
| -rw-r--r-- | include/dm/device.h | 2 | ||||
| -rw-r--r-- | include/power-domain.h | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/include/clk.h b/include/clk.h index f3c88fe..f34401f 100644 --- a/include/clk.h +++ b/include/clk.h @@ -300,9 +300,7 @@ enum clk_defaults_stage { CLK_DEFAULTS_POST_FORCE, }; -#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ - CONFIG_IS_ENABLED(CLK) - +#if CONFIG_IS_ENABLED(OF_REAL) && CONFIG_IS_ENABLED(CLK) /** * clk_set_defaults - Process 'assigned-{clocks/clock-parents/clock-rates}' * properties to configure clocks diff --git a/include/dm/device.h b/include/dm/device.h index ef6241b..68986dd 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -300,7 +300,7 @@ struct udevice_id { ulong data; }; -#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_REAL) #define of_match_ptr(_ptr) (_ptr) #else #define of_match_ptr(_ptr) NULL diff --git a/include/power-domain.h b/include/power-domain.h index 72ff2ff..62ff199 100644 --- a/include/power-domain.h +++ b/include/power-domain.h @@ -162,8 +162,7 @@ static inline int power_domain_off(struct power_domain *power_domain) * * @return 0 if OK, or a negative error code. */ -#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ - CONFIG_IS_ENABLED(POWER_DOMAIN) +#if CONFIG_IS_ENABLED(OF_REAL) && CONFIG_IS_ENABLED(POWER_DOMAIN) int dev_power_domain_on(struct udevice *dev); #else static inline int dev_power_domain_on(struct udevice *dev) @@ -179,8 +178,7 @@ static inline int dev_power_domain_on(struct udevice *dev) * * @return 0 if OK, or a negative error code. */ -#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ - CONFIG_IS_ENABLED(POWER_DOMAIN) +#if CONFIG_IS_ENABLED(OF_REAL) && CONFIG_IS_ENABLED(POWER_DOMAIN) int dev_power_domain_off(struct udevice *dev); #else static inline int dev_power_domain_off(struct udevice *dev) |