mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
2d798a3f20
Fix regression introduced by commit d2323cf773 ("onewire: w1-gpio: add
ext_pullup_enable pin in platform data") which added a gpio entry to the
platform data, but did not add the required initialisers to the board
files using it. Consequently, the driver would request gpio 0 at probe,
which could break other uses of the corresponding pin.
On AT91 requesting gpio 0 changes the pin muxing for PIOA0, which, for
instance, breaks SPI0 on at91sam9g20.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
272 lines
6.4 KiB
C
272 lines
6.4 KiB
C
/*
|
|
* Copyright (C) 2005 SAN People
|
|
* Copyright (C) 2008 Atmel
|
|
* Copyright (C) 2010 Lee McLoughlin - lee@lmmrtech.com
|
|
* Copyright (C) 2010 Sergio Tanzilli - tanzilli@acmesystems.it
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/at73c213.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/gpio_keys.h>
|
|
#include <linux/input.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/w1-gpio.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/irq.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
|
|
#include <mach/at91sam9_smc.h>
|
|
|
|
#include "at91_aic.h"
|
|
#include "board.h"
|
|
#include "sam9_smc.h"
|
|
#include "generic.h"
|
|
|
|
/*
|
|
* The FOX Board G20 hardware comes as the "Netus G20" board with
|
|
* just the cpu, ram, dataflash and two header connectors.
|
|
* This is plugged into the FOX Board which provides the ethernet,
|
|
* usb, rtc, leds, switch, ...
|
|
*
|
|
* For more info visit: http://www.acmesystems.it/foxg20
|
|
*/
|
|
|
|
|
|
static void __init foxg20_init_early(void)
|
|
{
|
|
/* Initialize processor: 18.432 MHz crystal */
|
|
at91_initialize(18432000);
|
|
}
|
|
|
|
/*
|
|
* USB Host port
|
|
*/
|
|
static struct at91_usbh_data __initdata foxg20_usbh_data = {
|
|
.ports = 2,
|
|
.vbus_pin = {-EINVAL, -EINVAL},
|
|
.overcurrent_pin= {-EINVAL, -EINVAL},
|
|
};
|
|
|
|
/*
|
|
* USB Device port
|
|
*/
|
|
static struct at91_udc_data __initdata foxg20_udc_data = {
|
|
.vbus_pin = AT91_PIN_PC6,
|
|
.pullup_pin = -EINVAL, /* pull-up driven by UDC */
|
|
};
|
|
|
|
|
|
/*
|
|
* SPI devices.
|
|
*/
|
|
static struct spi_board_info foxg20_spi_devices[] = {
|
|
#if !IS_ENABLED(CONFIG_MMC_ATMELMCI)
|
|
{
|
|
.modalias = "mtd_dataflash",
|
|
.chip_select = 1,
|
|
.max_speed_hz = 15 * 1000 * 1000,
|
|
.bus_num = 0,
|
|
},
|
|
#endif
|
|
};
|
|
|
|
|
|
/*
|
|
* MACB Ethernet device
|
|
*/
|
|
static struct macb_platform_data __initdata foxg20_macb_data = {
|
|
.phy_irq_pin = AT91_PIN_PA7,
|
|
.is_rmii = 1,
|
|
};
|
|
|
|
/*
|
|
* MCI (SD/MMC)
|
|
* det_pin, wp_pin and vcc_pin are not connected
|
|
*/
|
|
static struct mci_platform_data __initdata foxg20_mci0_data = {
|
|
.slot[1] = {
|
|
.bus_width = 4,
|
|
.detect_pin = -EINVAL,
|
|
.wp_pin = -EINVAL,
|
|
},
|
|
};
|
|
|
|
|
|
/*
|
|
* LEDs
|
|
*/
|
|
static struct gpio_led foxg20_leds[] = {
|
|
{ /* user led, red */
|
|
.name = "user_led",
|
|
.gpio = AT91_PIN_PC7,
|
|
.active_low = 0,
|
|
.default_trigger = "heartbeat",
|
|
},
|
|
};
|
|
|
|
|
|
/*
|
|
* GPIO Buttons
|
|
*/
|
|
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
|
|
static struct gpio_keys_button foxg20_buttons[] = {
|
|
{
|
|
.gpio = AT91_PIN_PC4,
|
|
.code = BTN_1,
|
|
.desc = "Button 1",
|
|
.active_low = 1,
|
|
.wakeup = 1,
|
|
},
|
|
};
|
|
|
|
static struct gpio_keys_platform_data foxg20_button_data = {
|
|
.buttons = foxg20_buttons,
|
|
.nbuttons = ARRAY_SIZE(foxg20_buttons),
|
|
};
|
|
|
|
static struct platform_device foxg20_button_device = {
|
|
.name = "gpio-keys",
|
|
.id = -1,
|
|
.num_resources = 0,
|
|
.dev = {
|
|
.platform_data = &foxg20_button_data,
|
|
}
|
|
};
|
|
|
|
static void __init foxg20_add_device_buttons(void)
|
|
{
|
|
at91_set_gpio_input(AT91_PIN_PC4, 1); /* btn1 */
|
|
at91_set_deglitch(AT91_PIN_PC4, 1);
|
|
|
|
platform_device_register(&foxg20_button_device);
|
|
}
|
|
#else
|
|
static void __init foxg20_add_device_buttons(void) {}
|
|
#endif
|
|
|
|
|
|
#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
|
|
static struct w1_gpio_platform_data w1_gpio_pdata = {
|
|
/* If you choose to use a pin other than PB16 it needs to be 3.3V */
|
|
.pin = AT91_PIN_PB16,
|
|
.is_open_drain = 1,
|
|
.ext_pullup_enable_pin = -EINVAL,
|
|
};
|
|
|
|
static struct platform_device w1_device = {
|
|
.name = "w1-gpio",
|
|
.id = -1,
|
|
.dev.platform_data = &w1_gpio_pdata,
|
|
};
|
|
|
|
static void __init at91_add_device_w1(void)
|
|
{
|
|
at91_set_GPIO_periph(w1_gpio_pdata.pin, 1);
|
|
at91_set_multi_drive(w1_gpio_pdata.pin, 1);
|
|
platform_device_register(&w1_device);
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
static struct i2c_board_info __initdata foxg20_i2c_devices[] = {
|
|
{
|
|
I2C_BOARD_INFO("24c512", 0x50),
|
|
},
|
|
};
|
|
|
|
|
|
static void __init foxg20_board_init(void)
|
|
{
|
|
/* Serial */
|
|
/* DBGU on ttyS0. (Rx & Tx only) */
|
|
at91_register_uart(0, 0, 0);
|
|
|
|
/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
|
|
at91_register_uart(AT91SAM9260_ID_US0, 1,
|
|
ATMEL_UART_CTS
|
|
| ATMEL_UART_RTS
|
|
| ATMEL_UART_DTR
|
|
| ATMEL_UART_DSR
|
|
| ATMEL_UART_DCD
|
|
| ATMEL_UART_RI);
|
|
|
|
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
|
|
at91_register_uart(AT91SAM9260_ID_US1, 2,
|
|
ATMEL_UART_CTS
|
|
| ATMEL_UART_RTS);
|
|
|
|
/* USART2 on ttyS3. (Rx & Tx only) */
|
|
at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
|
|
|
|
/* USART3 on ttyS4. (Rx, Tx, RTS, CTS) */
|
|
at91_register_uart(AT91SAM9260_ID_US3, 4,
|
|
ATMEL_UART_CTS
|
|
| ATMEL_UART_RTS);
|
|
|
|
/* USART4 on ttyS5. (Rx & Tx only) */
|
|
at91_register_uart(AT91SAM9260_ID_US4, 5, 0);
|
|
|
|
/* USART5 on ttyS6. (Rx & Tx only) */
|
|
at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
|
|
|
|
/* Set the internal pull-up resistor on DRXD */
|
|
at91_set_A_periph(AT91_PIN_PB14, 1);
|
|
at91_add_device_serial();
|
|
/* USB Host */
|
|
at91_add_device_usbh(&foxg20_usbh_data);
|
|
/* USB Device */
|
|
at91_add_device_udc(&foxg20_udc_data);
|
|
/* SPI */
|
|
at91_add_device_spi(foxg20_spi_devices, ARRAY_SIZE(foxg20_spi_devices));
|
|
/* Ethernet */
|
|
at91_add_device_eth(&foxg20_macb_data);
|
|
/* MMC */
|
|
at91_add_device_mci(0, &foxg20_mci0_data);
|
|
/* I2C */
|
|
at91_add_device_i2c(foxg20_i2c_devices, ARRAY_SIZE(foxg20_i2c_devices));
|
|
/* LEDs */
|
|
at91_gpio_leds(foxg20_leds, ARRAY_SIZE(foxg20_leds));
|
|
/* Push Buttons */
|
|
foxg20_add_device_buttons();
|
|
#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
|
|
at91_add_device_w1();
|
|
#endif
|
|
}
|
|
|
|
MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
|
|
/* Maintainer: Sergio Tanzilli */
|
|
.init_time = at91sam926x_pit_init,
|
|
.map_io = at91_map_io,
|
|
.handle_irq = at91_aic_handle_irq,
|
|
.init_early = foxg20_init_early,
|
|
.init_irq = at91_init_irq_default,
|
|
.init_machine = foxg20_board_init,
|
|
MACHINE_END
|