diff options
| author | Tom Rini <[email protected]> | 2023-06-21 14:39:38 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-06-21 14:39:38 -0400 |
| commit | 43dc016497ff9fd39139833852b0214f625fa4ca (patch) | |
| tree | 27d68ac47a07e9a8cb54cf93065385d630f2d659 /include | |
| parent | 5f024d10bbae9e52396191b8dadf0e8ddb059c85 (diff) | |
| parent | 230038f8ef0e2e7db8e40957a3b35109d8f7459f (diff) | |
Merge branch '2023-06-20-assorted-update' into next
- Assorted updates and improvements
Diffstat (limited to 'include')
| -rw-r--r-- | include/omap3_spi.h | 4 | ||||
| -rw-r--r-- | include/stdio_dev.h | 7 | ||||
| -rw-r--r-- | include/test/suites.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/include/omap3_spi.h b/include/omap3_spi.h index cae37705830..5381431d438 100644 --- a/include/omap3_spi.h +++ b/include/omap3_spi.h @@ -46,6 +46,8 @@ #define OMAP4_MCSPI_REG_OFFSET 0x100 +#define OMAP4_MCSPI_CHAN_NB 4 + /* OMAP3 McSPI registers */ struct mcspi_channel { unsigned int chconf; /* 0x2C, 0x40, 0x54, 0x68 */ @@ -64,7 +66,7 @@ struct mcspi { unsigned int wakeupenable; /* 0x20 */ unsigned int syst; /* 0x24 */ unsigned int modulctrl; /* 0x28 */ - struct mcspi_channel channel[4]; + struct mcspi_channel channel[OMAP4_MCSPI_CHAN_NB]; /* channel0: 0x2C - 0x3C, bus 0 & 1 & 2 & 3 */ /* channel1: 0x40 - 0x50, bus 0 & 1 */ /* channel2: 0x54 - 0x64, bus 0 & 1 */ diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 3105928970d..77bf8a8970f 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -84,13 +84,6 @@ int stdio_init_tables(void); */ int stdio_add_devices(void); -/** - * stdio_init() - Sets up stdio ready for use - * - * This calls stdio_init_tables() and stdio_add_devices() - */ -int stdio_init(void); - void stdio_print_current_devices(void); /** diff --git a/include/test/suites.h b/include/test/suites.h index 7349ce5aa60..1c7dc65966a 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -28,6 +28,7 @@ int cmd_ut_category(const char *name, const char *prefix, int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); |