arm64: dts: Remove wifi firmware country code mapping for Jetson

JetsonE/CV platform does not use location based country selection.
Remove the country code mapping for Jetson platform and keep only
the worldwide safe region code for Jetson.

Bug 1743521

Change-Id: If6c75e45e1435d4fdd96e441acdbc64dce97107d
Signed-off-by: Srinivas Ramachandran <srinivasra@nvidia.com>
Reviewed-on: http://git-master/r/1031840
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

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 06a39fe3d1f35084c120fb70fc3ac6f386c382ff..159c14bbe1beee071ffff0f83c0217a0c12405c0 100644 (file)
--- 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
@@ -907,134 +907,9 @@
                nv_path = "/system/etc/nvram_jetsonE_cv_4354.txt";
                country_code_map {
                        CC1 {
-                               iso_abbrev = "XV";
-                               custom_locale = "XV";
-                               custom_locale_rev = <997>;
-                       };
-                       CC2 {
-                               iso_abbrev = "US";
-                               custom_locale = "Q2";
-                               custom_locale_rev = <998>;
-                       };
-                       CC3 {
-                               iso_abbrev = "CA";
-                               custom_locale = "Q2";
-                               custom_locale_rev = <998>;
-                       };
-                       CC4 {
-                               iso_abbrev = "AT";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC5 {
-                               iso_abbrev = "BE";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC6 {
-                               iso_abbrev = "BG";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC7 {
-                               iso_abbrev = "HR";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC8 {
-                               iso_abbrev = "CZ";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC9 {
-                               iso_abbrev = "DK";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC10 {
-                               iso_abbrev = "FR";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC11 {
-                               iso_abbrev = "DE";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC12 {
-                               iso_abbrev = "GR";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC13 {
-                               iso_abbrev = "HU";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC14 {
-                               iso_abbrev = "IT";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC15 {
-                               iso_abbrev = "NL";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC16 {
-                               iso_abbrev = "NO";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC17 {
-                               iso_abbrev = "PL";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC18 {
-                               iso_abbrev = "PT";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC19 {
-                               iso_abbrev = "RO";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC20 {
-                               iso_abbrev = "SK";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC21 {
-                               iso_abbrev = "ES";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC22 {
-                               iso_abbrev = "SE";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC23 {
-                               iso_abbrev = "CH";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC24 {
-                               iso_abbrev = "GB";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC25 {
-                               iso_abbrev = "EU";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC26 {
-                               iso_abbrev = "E0";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
+                               iso_abbrev = "XR";
+                               custom_locale = "XR";
+                               custom_locale_rev = <122>;
                        };
                };
        };

diff --git a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
index 0929f0461e676335d7e41351374c76a232d7c7c0..5e3783905c89fe4f93b45fbcf8fbc2146e93b9b7 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
@@ -870,134 +870,9 @@
                nv_path = "/system/etc/nvram_jetsonE_cv_4354.txt";
                country_code_map {
                        CC1 {
-                               iso_abbrev = "XV";
-                               custom_locale = "XV";
-                               custom_locale_rev = <997>;
-                       };
-                       CC2 {
-                               iso_abbrev = "US";
-                               custom_locale = "Q2";
-                               custom_locale_rev = <998>;
-                       };
-                       CC3 {
-                               iso_abbrev = "CA";
-                               custom_locale = "Q2";
-                               custom_locale_rev = <998>;
-                       };
-                       CC4 {
-                               iso_abbrev = "AT";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC5 {
-                               iso_abbrev = "BE";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC6 {
-                               iso_abbrev = "BG";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC7 {
-                               iso_abbrev = "HR";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC8 {
-                               iso_abbrev = "CZ";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC9 {
-                               iso_abbrev = "DK";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC10 {
-                               iso_abbrev = "FR";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC11 {
-                               iso_abbrev = "DE";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC12 {
-                               iso_abbrev = "GR";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC13 {
-                               iso_abbrev = "HU";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC14 {
-                               iso_abbrev = "IT";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC15 {
-                               iso_abbrev = "NL";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC16 {
-                               iso_abbrev = "NO";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC17 {
-                               iso_abbrev = "PL";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC18 {
-                               iso_abbrev = "PT";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC19 {
-                               iso_abbrev = "RO";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC20 {
-                               iso_abbrev = "SK";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC21 {
-                               iso_abbrev = "ES";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC22 {
-                               iso_abbrev = "SE";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC23 {
-                               iso_abbrev = "CH";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC24 {
-                               iso_abbrev = "GB";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC25 {
-                               iso_abbrev = "EU";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
-                       };
-                       CC26 {
-                               iso_abbrev = "E0";
-                               custom_locale = "E0";
-                               custom_locale_rev = <994>;
+                               iso_abbrev = "XR";
+                               custom_locale = "XR";
+                               custom_locale_rev = <122>;
                        };
                };
        };