d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix values of CS1_EN and CS2_EN flags

Browse Source 
- Unbreak kernel build by fixing naming convention of
    GPIO_FUNC flags

Spotted by: Luiz Otavio O Souza, Andrew Thompson
This commit is contained in:
Oleksandr Tymoshenko 2010-09-29 23:06:41 +00:00
parent 17332126d1
commit 8c01516d7e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/mips/atheros/ar71xx_gpio.c
View File

@ -375,8 +375,8 @@ ar71xx_gpio_attach(device_t dev)
}
sc->dev = dev;
ar71xx_gpio_function_enable(sc, GPIO_SPI_CS1_EN);
ar71xx_gpio_function_enable(sc, GPIO_SPI_CS2_EN);
ar71xx_gpio_function_enable(sc, GPIO_FUNC_SPI_CS1_EN);
ar71xx_gpio_function_enable(sc, GPIO_FUNC_SPI_CS2_EN);
/* Configure all pins as input */
/* disable interrupts for all pins */
GPIO_WRITE(sc, AR71XX_GPIO_INT_MASK, 0);
@ -406,8 +406,8 @@ ar71xx_gpio_detach(device_t dev)
KASSERT(mtx_initialized(&sc->gpio_mtx), ("gpio mutex not initialized"));
ar71xx_gpio_function_disable(sc, GPIO_SPI_CS1_EN);
ar71xx_gpio_function_disable(sc, GPIO_SPI_CS2_EN);
ar71xx_gpio_function_disable(sc, GPIO_FUNC_SPI_CS1_EN);
ar71xx_gpio_function_disable(sc, GPIO_FUNC_SPI_CS2_EN);
bus_generic_detach(dev);
if (sc->gpio_mem_res)

5
sys/mips/atheros/ar71xxreg.h
View File

@ -151,11 +151,10 @@
#define AR71XX_GPIO_FUNCTION 0x28
#define GPIO_FUNC_STEREO_EN (1 << 17)
#define GPIO_FUNC_SLIC_EN (1 << 16)
#define GPIO_FUNC_SPI_CS2_EN (1 << 15)
#define GPIO_FUNC_SPI_CS2_EN (1 << 13)
/* CS2 is shared with GPIO_1 */
#define GPIO_FUNC_SPI_CS1_EN (1 << 14)
#define GPIO_FUNC_SPI_CS1_EN (1 << 12)
/* CS1 is shared with GPIO_0 */
#define GPIO_FUNC_SPI_EN (1 << 13)
#define GPIO_FUNC_UART_EN (1 << 8)
#define GPIO_FUNC_USB_OC_EN (1 << 4)
#define GPIO_FUNC_USB_CLK_EN (0)