Message ID | 20191101124210.14510-29-linux@rasmusvillemoes.dk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | QUICC Engine support on ARM | expand |
Le 01/11/2019 à 13:42, Rasmus Villemoes a écrit : > This driver uses #defines from soc/fsl/cpm.h, so instead of relying on > some other header pulling that in, do that explicitly. This is > preparation for allowing this driver to build on ARM. > UCC are only on QE. CPM has SCCs. instead. So this driver shouldn't need cpm.h Christophe > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > drivers/tty/serial/ucc_uart.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c > index a0555ae2b1ef..7e802616cba8 100644 > --- a/drivers/tty/serial/ucc_uart.c > +++ b/drivers/tty/serial/ucc_uart.c > @@ -32,6 +32,7 @@ > #include <soc/fsl/qe/ucc_slow.h> > > #include <linux/firmware.h> > +#include <soc/fsl/cpm.h> > #include <asm/reg.h> > > /* >
On 01/11/2019 17.19, Christophe Leroy wrote: > Le 01/11/2019 à 13:42, Rasmus Villemoes a écrit : >> This driver uses #defines from soc/fsl/cpm.h, so instead of relying on >> some other header pulling that in, do that explicitly. This is >> preparation for allowing this driver to build on ARM. >> > > UCC are only on QE. > CPM has SCCs. instead. > So this driver shouldn't need cpm.h But it does. At the very least for the BD_SC_* defines, possibly others things. It's possible one could split off the common part to a separate header, but that sort of cleanup/refactoring is beyond what I'd be comfortable including in this series. Rasmus
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index a0555ae2b1ef..7e802616cba8 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -32,6 +32,7 @@ #include <soc/fsl/qe/ucc_slow.h> #include <linux/firmware.h> +#include <soc/fsl/cpm.h> #include <asm/reg.h> /*
This driver uses #defines from soc/fsl/cpm.h, so instead of relying on some other header pulling that in, do that explicitly. This is preparation for allowing this driver to build on ARM. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/tty/serial/ucc_uart.c | 1 + 1 file changed, 1 insertion(+)