From 66e59df936c1db88d54f5c239e59312f5c16de56 Mon Sep 17 00:00:00 2001 From: Srinivas Ramachandran Date: Thu, 4 Feb 2016 22:58:53 -0800 Subject: [PATCH] arm64: dts: Update wifi firmware/nvram path for T210 platforms Update corresponding nvram and firmware path strings for T210 platforms. Bug 1716265 Change-Id: I24f405f829dd6452ac43526444515c74de4c65b1 Signed-off-by: Srinivas Ramachandran Reviewed-on: http://git-master/r/1008750 Reviewed-by: mobile promotions Tested-by: mobile promotions --- arch/arm64/boot/dts/tegra210-darcy-p2894-0000-a00-00.dts | 6 ++++-- arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi | 3 +++ .../boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts | 2 ++ arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi | 3 +++ arch/arm64/boot/dts/tegra210-platforms/tegra210-comms.dtsi | 2 ++ .../boot/dts/tegra210-platforms/tegra210-hawkeye-comms.dtsi | 2 ++ 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/tegra210-darcy-p2894-0000-a00-00.dts b/arch/arm64/boot/dts/tegra210-darcy-p2894-0000-a00-00.dts index f6bd90f8534..c869fa9a7c4 100644 --- a/arch/arm64/boot/dts/tegra210-darcy-p2894-0000-a00-00.dts +++ b/arch/arm64/boot/dts/tegra210-darcy-p2894-0000-a00-00.dts @@ -52,8 +52,10 @@ status = "okay"; }; - wifi-tuning { - sku = "darcy_a00"; + bcmdhd_wlan { + fw_path = "/system/vendor/firmware/fw_bcmdhd.bin"; + nv_path = "/system/etc/nvram_darcy_a00.txt"; + tuned_nv_path = "/system/etc/nvram_darcy_a00.txt"; }; chosen { diff --git a/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi b/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi index dcd0aa5c961..a31fb46d6e0 100644 --- a/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi +++ b/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi @@ -271,6 +271,9 @@ }; bcmdhd_wlan { + fw_path = "/system/vendor/firmware/fw_bcmdhd.bin"; + nv_path = "/system/etc/nvram_foster_e_4354.txt"; + tuned_nv_path = "/system/etc/nvram_foster_e_antenna_tuned_4354.txt"; country_code_map { CC1 { iso_abbrev = "XV"; diff --git a/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts index ed61acbe39c..0c2eea9d29c 100644 --- a/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts +++ b/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts @@ -903,6 +903,8 @@ }; bcmdhd_wlan { + fw_path = "/system/vendor/firmware/fw_bcmdhd.bin"; + nv_path = "/system/etc/nvram_jetsonE_cv_4354.txt"; country_code_map { CC1 { iso_abbrev = "XV"; diff --git a/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi b/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi index 0930d53c446..a4c4c353207 100644 --- a/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi +++ b/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi @@ -557,6 +557,9 @@ }; bcmdhd_wlan { + fw_path = "/system/vendor/firmware/fw_bcmdhd.bin"; + nv_path = "/system/etc/nvram_loki_e_4354.txt"; + tuned_nv_path = "system/etc/nvram_loki_e_antenna_tuned_4354.txt"; country_code_map { CC1 { iso_abbrev = "XV"; diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-comms.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-comms.dtsi index c41cfa3efff..5faddfd6703 100644 --- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-comms.dtsi +++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-comms.dtsi @@ -35,5 +35,7 @@ /* wifi MAC address */ mac-address-chosen-dtb-node = "nvidia,wifi-mac"; mac-address-file = "/mnt/factory/wifi/wifi_mac.txt"; + fw_path = "/system/vendor/firmware/bcm4354/fw_bcmdhd.bin"; + nv_path = "/system/etc/nvram_4354.txt"; }; }; diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-comms.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-comms.dtsi index ef2234da370..b6ea7b59622 100644 --- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-comms.dtsi +++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-hawkeye-comms.dtsi @@ -16,6 +16,8 @@ /* wifi MAC address */ mac-address-chosen-dtb-node = "nvidia,wifi-mac"; mac-address-file = "/mnt/factory/wifi/wifi_mac.txt"; + fw_path = "/system/vendor/firmware/fw_bcmdhd.bin"; + nv_path = "/system/etc/nvram_hawkeye_4354.txt"; country_code_map { CC1 { iso_abbrev = "XV"; -- 2.39.2