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

Commit 99bdf51a authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Unify GPIO register field namings 



The various rt2x00 drivers use different methods to name the different
GPIO register fields indicating the GPIO pin value and the fields
indicating the direction.
Start using a unified naming scheme for the GPIO register fields:
	- <csr>_VAL<x> for fields indicating the GPIO pin value.
	- <csr>_DIR<x> for fields indicating the GPIO pin direction.

Signed-off-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 605b5518

drivers/net/wireless/rt2x00/rt2400pci.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	u32 reg;



	rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);

	return rt2x00_get_field32(reg, GPIOCSR_BIT0);

	return rt2x00_get_field32(reg, GPIOCSR_VAL0);

}



#ifdef CONFIG_RT2X00_LIB_LEDS
@@ -1629,7 +1629,7 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 * rfkill switch GPIO pin correctly.

	 */

	rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);

	rt2x00_set_field32(&reg, GPIOCSR_BIT8, 1);

	rt2x00_set_field32(&reg, GPIOCSR_DIR0, 1);

	rt2x00pci_register_write(rt2x00dev, GPIOCSR, reg);



	/*

drivers/net/wireless/rt2x00/rt2400pci.h

+18 −16
Original line number Diff line number Diff line
@@ -660,24 +660,26 @@ 


/*

 * GPIOCSR: GPIO control register.

 *	GPIOCSR_VALx: Actual GPIO pin x value

 *	GPIOCSR_DIRx: GPIO direction: 0 = output; 1 = input

 */

#define GPIOCSR				0x0120

#define GPIOCSR_BIT0			FIELD32(0x00000001)

#define GPIOCSR_BIT1			FIELD32(0x00000002)

#define GPIOCSR_BIT2			FIELD32(0x00000004)

#define GPIOCSR_BIT3			FIELD32(0x00000008)

#define GPIOCSR_BIT4			FIELD32(0x00000010)

#define GPIOCSR_BIT5			FIELD32(0x00000020)

#define GPIOCSR_BIT6			FIELD32(0x00000040)

#define GPIOCSR_BIT7			FIELD32(0x00000080)

#define GPIOCSR_BIT8			FIELD32(0x00000100)

#define GPIOCSR_BIT9			FIELD32(0x00000200)

#define GPIOCSR_BIT10			FIELD32(0x00000400)

#define GPIOCSR_BIT11			FIELD32(0x00000800)

#define GPIOCSR_BIT12			FIELD32(0x00001000)

#define GPIOCSR_BIT13			FIELD32(0x00002000)

#define GPIOCSR_BIT14			FIELD32(0x00004000)

#define GPIOCSR_BIT15			FIELD32(0x00008000)

#define GPIOCSR_VAL0			FIELD32(0x00000001)

#define GPIOCSR_VAL1			FIELD32(0x00000002)

#define GPIOCSR_VAL2			FIELD32(0x00000004)

#define GPIOCSR_VAL3			FIELD32(0x00000008)

#define GPIOCSR_VAL4			FIELD32(0x00000010)

#define GPIOCSR_VAL5			FIELD32(0x00000020)

#define GPIOCSR_VAL6			FIELD32(0x00000040)

#define GPIOCSR_VAL7			FIELD32(0x00000080)

#define GPIOCSR_DIR0			FIELD32(0x00000100)

#define GPIOCSR_DIR1			FIELD32(0x00000200)

#define GPIOCSR_DIR2			FIELD32(0x00000400)

#define GPIOCSR_DIR3			FIELD32(0x00000800)

#define GPIOCSR_DIR4			FIELD32(0x00001000)

#define GPIOCSR_DIR5			FIELD32(0x00002000)

#define GPIOCSR_DIR6			FIELD32(0x00004000)

#define GPIOCSR_DIR7			FIELD32(0x00008000)



/*

 * BBPPCSR: BBP Pin control register.

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	u32 reg;



	rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);

	return rt2x00_get_field32(reg, GPIOCSR_BIT0);

	return rt2x00_get_field32(reg, GPIOCSR_VAL0);

}



#ifdef CONFIG_RT2X00_LIB_LEDS

drivers/net/wireless/rt2x00/rt2500pci.h

+10 −8
Original line number Diff line number Diff line
@@ -789,16 +789,18 @@ 


/*

 * GPIOCSR: GPIO control register.

 *	GPIOCSR_VALx: GPIO value

 *	GPIOCSR_DIRx: GPIO direction: 0 = output; 1 = input

 */

#define GPIOCSR				0x0120

#define GPIOCSR_BIT0			FIELD32(0x00000001)

#define GPIOCSR_BIT1			FIELD32(0x00000002)

#define GPIOCSR_BIT2			FIELD32(0x00000004)

#define GPIOCSR_BIT3			FIELD32(0x00000008)

#define GPIOCSR_BIT4			FIELD32(0x00000010)

#define GPIOCSR_BIT5			FIELD32(0x00000020)

#define GPIOCSR_BIT6			FIELD32(0x00000040)

#define GPIOCSR_BIT7			FIELD32(0x00000080)

#define GPIOCSR_VAL0			FIELD32(0x00000001)

#define GPIOCSR_VAL1			FIELD32(0x00000002)

#define GPIOCSR_VAL2			FIELD32(0x00000004)

#define GPIOCSR_VAL3			FIELD32(0x00000008)

#define GPIOCSR_VAL4			FIELD32(0x00000010)

#define GPIOCSR_VAL5			FIELD32(0x00000020)

#define GPIOCSR_VAL6			FIELD32(0x00000040)

#define GPIOCSR_VAL7			FIELD32(0x00000080)

#define GPIOCSR_DIR0			FIELD32(0x00000100)

#define GPIOCSR_DIR1			FIELD32(0x00000200)

#define GPIOCSR_DIR2			FIELD32(0x00000400)

drivers/net/wireless/rt2x00/rt2500usb.c

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int rt2500usb_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	u16 reg;



	rt2500usb_register_read(rt2x00dev, MAC_CSR19, &reg);

	return rt2x00_get_field16(reg, MAC_CSR19_BIT7);

	return rt2x00_get_field16(reg, MAC_CSR19_VAL7);

}



#ifdef CONFIG_RT2X00_LIB_LEDS
@@ -1786,7 +1786,7 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 * rfkill switch GPIO pin correctly.

	 */

	rt2500usb_register_read(rt2x00dev, MAC_CSR19, &reg);

	rt2x00_set_field16(&reg, MAC_CSR19_BIT8, 0);

	rt2x00_set_field16(&reg, MAC_CSR19_DIR0, 0);

	rt2500usb_register_write(rt2x00dev, MAC_CSR19, reg);



	/*