diff options
| author | Tom Rini <[email protected]> | 2023-10-17 09:15:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-17 09:15:56 -0400 |
| commit | e65b5d35c9116485366bb08138043d51220551da (patch) | |
| tree | a7ff86d5ab6e831cb05c875ab9c1521c5405fe0f /drivers/serial | |
| parent | c41df16b27bbe37be861072d876f348748684737 (diff) | |
| parent | 4e65545f7a35430710ce95bdddf9d683f7a3f72a (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
- RZ/G2L part 1, except for two serial port patches which I had to drop
as they broke R2Dplus, they will come later via subsequent PR.
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_sh.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index 20cda5dbe27..36263109e6b 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -7,16 +7,16 @@ */ #include <common.h> -#include <errno.h> -#include <clk.h> -#include <dm.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/processor.h> -#include <serial.h> -#include <linux/compiler.h> +#include <clk.h> +#include <dm.h> #include <dm/platform_data/serial_sh.h> +#include <errno.h> +#include <linux/compiler.h> #include <linux/delay.h> +#include <serial.h> #include "serial_sh.h" DECLARE_GLOBAL_DATA_PTR; @@ -58,8 +58,10 @@ static void sh_serial_init_generic(struct uart_port *port) sci_out(port, SCSPTR, 0x0003); #endif +#if IS_ENABLED(CONFIG_RCAR_GEN2) || IS_ENABLED(CONFIG_RCAR_GEN3) || IS_ENABLED(CONFIG_RCAR_GEN4) if (port->type == PORT_HSCIF) sci_out(port, HSSRR, HSSRR_SRE | HSSRR_SRCYC8); +#endif } static void |