Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c17d9a71 authored by Kristina Martšenko's avatar Kristina Martšenko Committed by Greg Kroah-Hartman
Browse files

staging: nokia_h4p: move firmware macros to firmware part 



As the TODO file suggests, move firmware file macros from the header
file to the file that deals with firmware. In the process also move
MODULE_FIRMWARE() instances to the same file. Remove the relevant item
from the TODO file.

Signed-off-by: default avatarKristina Martšenko <kristina.martsenko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41250ea7

drivers/staging/nokia_h4p/TODO

+0 −8
Original line number Diff line number Diff line
@@ -13,14 +13,6 @@ TODO: 
can we please get the naming straight. File names do not start with

hci_ anymore. We moved away from it since that term is too generic.



> +#define FW_NAME_TI1271_LE    "ti1273_le.bin"

> +#define FW_NAME_TI1271               "ti1273.bin"

> +#define FW_NAME_BCM2048              "bcmfw.bin"

> +#define FW_NAME_CSR          "bc4fw.bin"



We do these have to be global in a header file. This should be

confined to the specific firmware part.



> +struct hci_h4p_info {



Can we please get rid of the hci_ prefix for everything. Copying from

drivers/staging/nokia_h4p/hci_h4p.h

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ 
#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/hci.h>



#define FW_NAME_TI1271_PRELE	"ti1273_prele.bin"

#define FW_NAME_TI1271_LE	"ti1273_le.bin"

#define FW_NAME_TI1271		"ti1273.bin"

#define FW_NAME_BCM2048		"bcmfw.bin"

#define FW_NAME_CSR		"bc4fw.bin"



#define UART_SYSC_OMAP_RESET	0x03

#define UART_SYSS_RESETDONE	0x01

#define UART_OMAP_SCR_EMPTY_THR	0x08

drivers/staging/nokia_h4p/nokia_core.c

+0 −5
Original line number Diff line number Diff line
@@ -1204,8 +1204,3 @@ MODULE_ALIAS("platform:hci_h4p"); 
MODULE_DESCRIPTION("Bluetooth h4 driver with nokia extensions");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Ville Tervo");
 
MODULE_FIRMWARE(FW_NAME_TI1271_PRELE);

MODULE_FIRMWARE(FW_NAME_TI1271_LE);

MODULE_FIRMWARE(FW_NAME_TI1271);

MODULE_FIRMWARE(FW_NAME_BCM2048);

MODULE_FIRMWARE(FW_NAME_CSR);

drivers/staging/nokia_h4p/nokia_fw.c

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 *

 */



#include <linux/module.h>

#include <linux/skbuff.h>

#include <linux/firmware.h>

#include <linux/clk.h>
@@ -29,6 +30,12 @@ 


#include "hci_h4p.h"



#define FW_NAME_TI1271_PRELE	"ti1273_prele.bin"

#define FW_NAME_TI1271_LE	"ti1273_le.bin"

#define FW_NAME_TI1271		"ti1273.bin"

#define FW_NAME_BCM2048		"bcmfw.bin"

#define FW_NAME_CSR		"bc4fw.bin"



static int fw_pos;



/* Firmware handling */
@@ -193,3 +200,9 @@ void hci_h4p_parse_fw_event(struct hci_h4p_info *info, struct sk_buff *skb) 


	return;

}



MODULE_FIRMWARE(FW_NAME_TI1271_PRELE);

MODULE_FIRMWARE(FW_NAME_TI1271_LE);

MODULE_FIRMWARE(FW_NAME_TI1271);

MODULE_FIRMWARE(FW_NAME_BCM2048);

MODULE_FIRMWARE(FW_NAME_CSR);