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

Commit 6146ca69 authored by Ray Chen's avatar Ray Chen Committed by Kalle Valo
Browse files

ath6kl: Add AR6004 1.2 support for USB and SDIO 



Add the necessary change for AR6004 1.2 chip support

Signed-off-by: default avatarRay Chen <raychen@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 9e8b16db

drivers/net/wireless/ath/ath6kl/core.h

+8 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@ struct ath6kl_fw_ie { 
#define AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE \

	"ath6k/AR6004/hw1.1/bdata.DB132.bin"



/* AR6004 1.2 definitions */

#define AR6004_HW_1_2_VERSION                 0x300007e8

#define AR6004_HW_1_2_FW_DIR			"ath6k/AR6004/hw1.2"

#define AR6004_HW_1_2_FIRMWARE_FILE           "fw.ram.bin"

#define AR6004_HW_1_2_BOARD_DATA_FILE         "ath6k/AR6004/hw1.2/bdata.bin"

#define AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE \

	"ath6k/AR6004/hw1.2/bdata.bin"



/* Per STA data, used in AP mode */

#define STA_PS_AWAKE		BIT(0)

#define	STA_PS_SLEEP		BIT(1)

drivers/net/wireless/ath/ath6kl/init.c

+18 −0
Original line number Diff line number Diff line
@@ -119,6 +119,24 @@ static const struct ath6kl_hw hw_list[] = { 
		.fw_board		= AR6004_HW_1_1_BOARD_DATA_FILE,

		.fw_default_board	= AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE,

	},

	{

		.id				= AR6004_HW_1_2_VERSION,

		.name				= "ar6004 hw 1.2",

		.dataset_patch_addr		= 0x436ecc,

		.app_load_addr			= 0x1234,

		.board_ext_data_addr		= 0x437000,

		.reserved_ram_size		= 9216,

		.board_addr			= 0x435c00,

		.refclk_hz			= 40000000,

		.uarttx_pin			= 11,



		.fw = {

			.dir		= AR6004_HW_1_2_FW_DIR,

			.fw		= AR6004_HW_1_2_FIRMWARE_FILE,

		},

		.fw_board		= AR6004_HW_1_2_BOARD_DATA_FILE,

		.fw_default_board	= AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE,

	},

};



/*

drivers/net/wireless/ath/ath6kl/sdio.c

+3 −0
Original line number Diff line number Diff line
@@ -1457,3 +1457,6 @@ MODULE_FIRMWARE(AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE); 
MODULE_FIRMWARE(AR6004_HW_1_1_FW_DIR "/" AR6004_HW_1_1_FIRMWARE_FILE);

MODULE_FIRMWARE(AR6004_HW_1_1_BOARD_DATA_FILE);

MODULE_FIRMWARE(AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE);

MODULE_FIRMWARE(AR6004_HW_1_2_FW_DIR "/" AR6004_HW_1_2_FIRMWARE_FILE);

MODULE_FIRMWARE(AR6004_HW_1_2_BOARD_DATA_FILE);

MODULE_FIRMWARE(AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE);

drivers/net/wireless/ath/ath6kl/usb.c

+3 −0
Original line number Diff line number Diff line
@@ -1207,3 +1207,6 @@ MODULE_FIRMWARE(AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE); 
MODULE_FIRMWARE(AR6004_HW_1_1_FIRMWARE_FILE);

MODULE_FIRMWARE(AR6004_HW_1_1_BOARD_DATA_FILE);

MODULE_FIRMWARE(AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE);

MODULE_FIRMWARE(AR6004_HW_1_2_FIRMWARE_FILE);

MODULE_FIRMWARE(AR6004_HW_1_2_BOARD_DATA_FILE);

MODULE_FIRMWARE(AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE);