From fd80779b3b55a318a3ef0725d14449fd2b683d81 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 28 Feb 2023 10:05:32 +0100 Subject: ARM: omap: Move mach header files to include/mach/omap Currently arch specific headers can be included with longer possible as there won't be a single mach anymore. Move all omap specific header files to include/mach/omap/ to prepare for multi-arch support. Signed-off-by: Sascha Hauer --- fs/omap4_usbbootfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/omap4_usbbootfs.c b/fs/omap4_usbbootfs.c index 985d968cc5..9b0755d539 100644 --- a/fs/omap4_usbbootfs.c +++ b/fs/omap4_usbbootfs.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #define OMAP4_USBBOOT_FS_MAGIC 0x5562464D #define OMAP4_USBBOOT_FS_CMD_OPEN 0x46530000 -- cgit v1.2.1 From 4e8f4c9b27cd5282e412bdd0facf5cbe3ec6a1ab Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 1 Mar 2023 14:13:48 +0100 Subject: ARM: omap: usbboot: Enable USB communication when needed Instead of activating USB communication unconditionally in an initcall, let the users activate it once they need it. This gets us rid of an initcall that is not protected against running on foreign SoCs. Signed-off-by: Sascha Hauer --- fs/omap4_usbbootfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/omap4_usbbootfs.c b/fs/omap4_usbbootfs.c index 9b0755d539..30392d1192 100644 --- a/fs/omap4_usbbootfs.c +++ b/fs/omap4_usbbootfs.c @@ -143,8 +143,9 @@ static int omap4_usbbootfs_stat(struct device *dev, const char *filename, static int omap4_usbbootfs_probe(struct device *dev) { - return 0; + return omap4_usbboot_open(); } + static void omap4_usbbootfs_remove(struct device *dev) { } -- cgit v1.2.1