Merge branch 'omap-for-v5.10/omap1' into omap-for-v5.10/soc

This commit is contained in:
Tony Lindgren 2020-09-03 11:50:37 +03:00
commit 501e69b028

View File

@ -88,7 +88,7 @@
* OMAP730/850 has a slightly different config for the pin mux.
* - config regs are the OMAP7XX_IO_CONF_x regs (see omap7xx.h) regs and
* not the FUNC_MUX_CTRL_x regs from hardware.h
* - for pull-up/down, only has one enable bit which is is in the same register
* - for pull-up/down, only has one enable bit which is in the same register
* as mux config
*/
#define MUX_CFG_7XX(desc, mux_reg, mode_offset, mode, \