--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -5112,6 +5112,27 @@ static const struct rf_channel rf_vals_3
+@@ -5170,6 +5170,27 @@ static const struct rf_channel rf_vals_3
{173, 0x61, 0, 9},
};
static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
{
struct hw_mode_spec *spec = &rt2x00dev->spec;
-@@ -5190,7 +5211,6 @@ static int rt2800_probe_hw_mode(struct r
+@@ -5248,7 +5269,6 @@ static int rt2800_probe_hw_mode(struct r
rt2x00_rf(rt2x00dev, RF3022) ||
rt2x00_rf(rt2x00dev, RF3290) ||
rt2x00_rf(rt2x00dev, RF3320) ||
rt2x00_rf(rt2x00dev, RF5360) ||
rt2x00_rf(rt2x00dev, RF5370) ||
rt2x00_rf(rt2x00dev, RF5372) ||
-@@ -5198,6 +5218,12 @@ static int rt2800_probe_hw_mode(struct r
+@@ -5256,6 +5276,12 @@ static int rt2800_probe_hw_mode(struct r
rt2x00_rf(rt2x00dev, RF5392)) {
spec->num_channels = 14;
spec->channels = rf_vals_3x;
} else if (rt2x00_rf(rt2x00dev, RF3052)) {
spec->supported_bands |= SUPPORT_BAND_5GHZ;
spec->num_channels = ARRAY_SIZE(rf_vals_3x);
-@@ -5291,6 +5317,19 @@ static int rt2800_probe_hw_mode(struct r
+@@ -5349,6 +5375,19 @@ static int rt2800_probe_hw_mode(struct r
return 0;
}
int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
{
int retval;
-@@ -5316,6 +5355,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+@@ -5374,6 +5413,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
/*