Commit adde5882 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville

rt2x00: fix whitespace damage in the rt2800 specific code

The rt2800 specific code contains a lots of whitespace damage caused by
the commit 'rt2x00: Add support for RT5390 chip'.

This patch fixes those whitespace errors.
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ba9a6214
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
#define RF3320 0x000b #define RF3320 0x000b
#define RF3322 0x000c #define RF3322 0x000c
#define RF3853 0x000d #define RF3853 0x000d
#define RF5390 0x5390 #define RF5390 0x5390
/* /*
* Chipset revisions. * Chipset revisions.
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
#define REV_RT3071E 0x0211 #define REV_RT3071E 0x0211
#define REV_RT3090E 0x0211 #define REV_RT3090E 0x0211
#define REV_RT3390E 0x0211 #define REV_RT3390E 0x0211
#define REV_RT5390F 0x0502 #define REV_RT5390F 0x0502
/* /*
* Signal information. * Signal information.
...@@ -126,9 +126,9 @@ ...@@ -126,9 +126,9 @@
/* /*
* AUX_CTRL: Aux/PCI-E related configuration * AUX_CTRL: Aux/PCI-E related configuration
*/ */
#define AUX_CTRL 0x10c #define AUX_CTRL 0x10c
#define AUX_CTRL_WAKE_PCIE_EN FIELD32(0x00000002) #define AUX_CTRL_WAKE_PCIE_EN FIELD32(0x00000002)
#define AUX_CTRL_FORCE_PCIE_CLK FIELD32(0x00000400) #define AUX_CTRL_FORCE_PCIE_CLK FIELD32(0x00000400)
/* /*
* OPT_14: Unknown register used by rt3xxx devices. * OPT_14: Unknown register used by rt3xxx devices.
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
*/ */
#define RF_CSR_CFG 0x0500 #define RF_CSR_CFG 0x0500
#define RF_CSR_CFG_DATA FIELD32(0x000000ff) #define RF_CSR_CFG_DATA FIELD32(0x000000ff)
#define RF_CSR_CFG_REGNUM FIELD32(0x00003f00) #define RF_CSR_CFG_REGNUM FIELD32(0x00003f00)
#define RF_CSR_CFG_WRITE FIELD32(0x00010000) #define RF_CSR_CFG_WRITE FIELD32(0x00010000)
#define RF_CSR_CFG_BUSY FIELD32(0x00020000) #define RF_CSR_CFG_BUSY FIELD32(0x00020000)
...@@ -1746,13 +1746,13 @@ struct mac_iveiv_entry { ...@@ -1746,13 +1746,13 @@ struct mac_iveiv_entry {
*/ */
#define BBP4_TX_BF FIELD8(0x01) #define BBP4_TX_BF FIELD8(0x01)
#define BBP4_BANDWIDTH FIELD8(0x18) #define BBP4_BANDWIDTH FIELD8(0x18)
#define BBP4_MAC_IF_CTRL FIELD8(0x40) #define BBP4_MAC_IF_CTRL FIELD8(0x40)
/* /*
* BBP 109 * BBP 109
*/ */
#define BBP109_TX0_POWER FIELD8(0x0f) #define BBP109_TX0_POWER FIELD8(0x0f)
#define BBP109_TX1_POWER FIELD8(0xf0) #define BBP109_TX1_POWER FIELD8(0xf0)
/* /*
* BBP 138: Unknown * BBP 138: Unknown
...@@ -1765,7 +1765,7 @@ struct mac_iveiv_entry { ...@@ -1765,7 +1765,7 @@ struct mac_iveiv_entry {
/* /*
* BBP 152: Rx Ant * BBP 152: Rx Ant
*/ */
#define BBP152_RX_DEFAULT_ANT FIELD8(0x80) #define BBP152_RX_DEFAULT_ANT FIELD8(0x80)
/* /*
* RFCSR registers * RFCSR registers
...@@ -1776,7 +1776,7 @@ struct mac_iveiv_entry { ...@@ -1776,7 +1776,7 @@ struct mac_iveiv_entry {
* RFCSR 1: * RFCSR 1:
*/ */
#define RFCSR1_RF_BLOCK_EN FIELD8(0x01) #define RFCSR1_RF_BLOCK_EN FIELD8(0x01)
#define RFCSR1_PLL_PD FIELD8(0x02) #define RFCSR1_PLL_PD FIELD8(0x02)
#define RFCSR1_RX0_PD FIELD8(0x04) #define RFCSR1_RX0_PD FIELD8(0x04)
#define RFCSR1_TX0_PD FIELD8(0x08) #define RFCSR1_TX0_PD FIELD8(0x08)
#define RFCSR1_RX1_PD FIELD8(0x10) #define RFCSR1_RX1_PD FIELD8(0x10)
...@@ -1785,7 +1785,7 @@ struct mac_iveiv_entry { ...@@ -1785,7 +1785,7 @@ struct mac_iveiv_entry {
/* /*
* RFCSR 2: * RFCSR 2:
*/ */
#define RFCSR2_RESCAL_EN FIELD8(0x80) #define RFCSR2_RESCAL_EN FIELD8(0x80)
/* /*
* RFCSR 6: * RFCSR 6:
...@@ -1801,7 +1801,7 @@ struct mac_iveiv_entry { ...@@ -1801,7 +1801,7 @@ struct mac_iveiv_entry {
/* /*
* RFCSR 11: * RFCSR 11:
*/ */
#define RFCSR11_R FIELD8(0x03) #define RFCSR11_R FIELD8(0x03)
/* /*
* RFCSR 12: * RFCSR 12:
...@@ -1857,9 +1857,9 @@ struct mac_iveiv_entry { ...@@ -1857,9 +1857,9 @@ struct mac_iveiv_entry {
/* /*
* RFCSR 30: * RFCSR 30:
*/ */
#define RFCSR30_TX_H20M FIELD8(0x02) #define RFCSR30_TX_H20M FIELD8(0x02)
#define RFCSR30_RX_H20M FIELD8(0x04) #define RFCSR30_RX_H20M FIELD8(0x04)
#define RFCSR30_RX_VCM FIELD8(0x18) #define RFCSR30_RX_VCM FIELD8(0x18)
#define RFCSR30_RF_CALIBRATION FIELD8(0x80) #define RFCSR30_RF_CALIBRATION FIELD8(0x80)
/* /*
...@@ -1871,17 +1871,17 @@ struct mac_iveiv_entry { ...@@ -1871,17 +1871,17 @@ struct mac_iveiv_entry {
/* /*
* RFCSR 38: * RFCSR 38:
*/ */
#define RFCSR38_RX_LO1_EN FIELD8(0x20) #define RFCSR38_RX_LO1_EN FIELD8(0x20)
/* /*
* RFCSR 39: * RFCSR 39:
*/ */
#define RFCSR39_RX_LO2_EN FIELD8(0x80) #define RFCSR39_RX_LO2_EN FIELD8(0x80)
/* /*
* RFCSR 49: * RFCSR 49:
*/ */
#define RFCSR49_TX FIELD8(0x3f) #define RFCSR49_TX FIELD8(0x3f)
/* /*
* RF registers * RF registers
...@@ -1918,7 +1918,7 @@ struct mac_iveiv_entry { ...@@ -1918,7 +1918,7 @@ struct mac_iveiv_entry {
/* /*
* Chip ID * Chip ID
*/ */
#define EEPROM_CHIP_ID 0x0000 #define EEPROM_CHIP_ID 0x0000
/* /*
* EEPROM Version * EEPROM Version
......
This diff is collapsed.
...@@ -493,12 +493,12 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev) ...@@ -493,12 +493,12 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev)
rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f); rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00); rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
if (rt2x00_rt(rt2x00dev, RT5390)) { if (rt2x00_rt(rt2x00dev, RT5390)) {
rt2800_register_read(rt2x00dev, AUX_CTRL, &reg); rt2800_register_read(rt2x00dev, AUX_CTRL, &reg);
rt2x00_set_field32(&reg, AUX_CTRL_FORCE_PCIE_CLK, 1); rt2x00_set_field32(&reg, AUX_CTRL_FORCE_PCIE_CLK, 1);
rt2x00_set_field32(&reg, AUX_CTRL_WAKE_PCIE_EN, 1); rt2x00_set_field32(&reg, AUX_CTRL_WAKE_PCIE_EN, 1);
rt2800_register_write(rt2x00dev, AUX_CTRL, reg); rt2800_register_write(rt2x00dev, AUX_CTRL, reg);
} }
rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003); rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
...@@ -1135,7 +1135,7 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = { ...@@ -1135,7 +1135,7 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
{ PCI_DEVICE(0x1814, 0x3593), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1814, 0x3593), PCI_DEVICE_DATA(&rt2800pci_ops) },
#endif #endif
#ifdef CONFIG_RT2800PCI_RT53XX #ifdef CONFIG_RT2800PCI_RT53XX
{ PCI_DEVICE(0x1814, 0x5390), PCI_DEVICE_DATA(&rt2800pci_ops) }, { PCI_DEVICE(0x1814, 0x5390), PCI_DEVICE_DATA(&rt2800pci_ops) },
#endif #endif
{ 0, } { 0, }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment