diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-23 08:30:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-23 08:30:48 -0400 |
| commit | f534d93cbf34f1d1762b04eb5680e84bef5e1fe1 (patch) | |
| tree | 09a0231852e9df884a8da30db093ac1932978814 /include/mux.h | |
| parent | 4906d698d3960b70cf8000299da35412efd4f51d (diff) | |
| parent | 988002dcd931e7236422e4d158c397d964ba1360 (diff) | |
Merge branch '2021-07-23-assorted-fixes'
- Assorted FIT, optee, pcf8575, mux, vexpress64 and distro bootcmd fixes.
- Allow pinmux status to take pin names
Diffstat (limited to 'include/mux.h')
| -rw-r--r-- | include/mux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mux.h b/include/mux.h index 23844f480ac..9f809912742 100644 --- a/include/mux.h +++ b/include/mux.h @@ -51,7 +51,7 @@ unsigned int mux_control_states(struct mux_control *mux); */ int __must_check mux_control_select(struct mux_control *mux, unsigned int state); -#define mux_control_try_select(mux) mux_control_select(mux) +#define mux_control_try_select(mux, state) mux_control_select(mux, state) /** * mux_control_deselect() - Deselect the previously selected multiplexer state. @@ -128,7 +128,7 @@ int __must_check mux_control_select(struct mux_control *mux, return -ENOSYS; } -#define mux_control_try_select(mux) mux_control_select(mux) +#define mux_control_try_select(mux, state) mux_control_select(mux, state) int mux_control_deselect(struct mux_control *mux) { |