carl9170 firmware: enable CONFIG_CARL9170FW_USB_INIT_FIRMWARE by default

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index 74faf79c5e3ba906f336610e6c6c17d9b0e0b712..fde4a5d4a3263f33a9408080f43c29d5324ee245 100644 (file)
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -38,15 +38,13 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
                                        BIT(CARL9170FW_HANDLE_BACK_REQ) |
                                        BIT(CARL9170FW_RX_FILTER) |
                                        BIT(CARL9170FW_HW_COUNTERS) |
-#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
                                        BIT(CARL9170FW_USB_INIT_FIRMWARE) |
-# ifdef CONFIG_CARL9170FW_USB_UP_STREAM
+#ifdef CONFIG_CARL9170FW_USB_UP_STREAM
                                        BIT(CARL9170FW_USB_UP_STREAM) |
-# endif /* CONFIG_CARL9170FW_USB_UP_STREAM */
-# ifdef CONFIG_CARL9170FW_USB_DOWN_STREAM
+#endif /* CONFIG_CARL9170FW_USB_UP_STREAM */
+#ifdef CONFIG_CARL9170FW_USB_DOWN_STREAM
                                        BIT(CARL9170FW_USB_DOWN_STREAM) |
-# endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
-#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
+#endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
                                        BIT(CARL9170FW_COMMAND_PHY) |
                                        BIT(CARL9170FW_PSM) |

diff --git a/carlfw/usb/Kconfig b/carlfw/usb/Kconfig
index c1dad332edff46ab3669acd235d7477103df284b..dc70776d6979764f1afd27cf3932ffcbdeb095e1 100644 (file)
--- a/carlfw/usb/Kconfig
+++ b/carlfw/usb/Kconfig
@@ -9,14 +9,6 @@ config CARL9170FW_USB_STANDARD_CMDS
 
         Say Y, unless you don't care if lsusb -v fails.
 
-config CARL9170FW_USB_INIT_FIRMWARE
-       def_bool y
-       prompt "USB Interface Setup"
-       ---help---
-        Firmware should initialize the USB chip.
-
-        Just say Y.
-
 config CARL9170FW_USB_UP_STREAM
        def_bool y
        prompt "USB Upload Stream"

diff --git a/carlfw/usb/usb.c b/carlfw/usb/usb.c
index 9ff31c4b9e2b895de1ca41d27701eabc0f66fafc..74b8f8c4dcc6baac78b888bf7bfee0fbe79a43ab 100644 (file)
--- a/carlfw/usb/usb.c
+++ b/carlfw/usb/usb.c
@@ -189,7 +189,6 @@ static void usb_reset_eps(void)
 #endif /* CONFIG_CARL9170FW_USB_MODESWITCH */
 
 
-#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
 static void usb_pta_init(void)
 {
        unsigned int usb_dma_ctrl = 0;
@@ -251,13 +250,10 @@ static void usb_pta_init(void)
 
        set(AR9170_USB_REG_DMA_CTL, usb_dma_ctrl);
 }
-#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
 
 void usb_init(void)
 {
-#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
        usb_pta_init();
-#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
 
        fw.usb.config = 1;
        /*