| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 22 Apr 2011 11:22:36 +0400
From: Igor Plyatov <plyatov@...il.com>
To: linux@...im.org.za, <nicolas.ferre@...el.com>,
<plagnioj@...osoft.com>, <linux@....linux.org.uk>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>
Cc: Igor Plyatov <plyatov@...il.com>
Subject: [PATCH v2] mach-at91: gsia18s board improvements and bug fixes
From: Igor Plyatov <plyatov@...il.com>
* Active logic levels and default states corrected for GPOs.
* Replace small functions which use platform_register_device() by its direct
calls.
* GPIO_xxxx pin names replaced by AT91_PIN_Pxxx port names as requested by
kernel developers.
* Remove GPIO_CARD_UNMOUNT_1 gpio_keys_button, because it not used.
* debounce_interval added for critical buttons.
* Remove unneeded GPI setup code for buttons (gsia18s_add_device_buttons
function), because this done by gpio_keys driver.
* pcf8574x_0x20_setup() and pcf8574x_0x20_teardown functions small refactoring.
Signed-off-by: Igor Plyatov <plyatov@...il.com>
---
arch/arm/mach-at91/board-gsia18s.c | 126 +++++++++++------------------
arch/arm/mach-at91/include/mach/gsia18s.h | 6 --
2 files changed, 47 insertions(+), 85 deletions(-)
diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
index bc28136..ebd7413 100644
--- a/arch/arm/mach-at91/board-gsia18s.c
+++ b/arch/arm/mach-at91/board-gsia18s.c
@@ -117,14 +117,14 @@ static struct gpio_led gpio_leds[] = {
{
.name = "gpo:trig_net_out",
.gpio = AT91_PIN_PB20,
- .active_low = 0,
+ .active_low = 1,
.default_trigger = "none",
.default_state = LEDS_GPIO_DEFSTATE_OFF,
},
{
.name = "gpo:trig_net_dir",
.gpio = AT91_PIN_PB19,
- .active_low = 0,
+ .active_low = 1,
.default_trigger = "none",
.default_state = LEDS_GPIO_DEFSTATE_OFF,
},
@@ -171,11 +171,6 @@ static struct platform_device leds = {
}
};
-static void __init gsia18s_leds_init(void)
-{
- platform_device_register(&leds);
-}
-
/* PCF8574 0x20 GPIO - U1 on the GS_IA18-CB_V3 board */
static struct gpio_led pcf_gpio_leds1[] = {
{ /* bit 0 */
@@ -188,31 +183,31 @@ static struct gpio_led pcf_gpio_leds1[] = {
{ /* bit 1 */
.name = "gpo:wifi_setup",
.gpio = PCF_GPIO_WIFI_SETUP,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
{ /* bit 2 */
.name = "gpo:wifi_enable",
.gpio = PCF_GPIO_WIFI_ENABLE,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
{ /* bit 3 */
.name = "gpo:wifi_reset",
.gpio = PCF_GPIO_WIFI_RESET,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_ON,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
},
/* bit 4 used as GPI */
{ /* bit 5 */
.name = "gpo:gps_setup",
.gpio = PCF_GPIO_GPS_SETUP,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
{ /* bit 6 */
.name = "gpo:gps_standby",
@@ -248,30 +243,30 @@ static struct gpio_led pcf_gpio_leds2[] = {
{ /* bit 0 */
.name = "gpo:alarm_1",
.gpio = PCF_GPIO_ALARM1,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
{ /* bit 1 */
.name = "gpo:alarm_2",
.gpio = PCF_GPIO_ALARM2,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
{ /* bit 2 */
.name = "gpo:alarm_3",
.gpio = PCF_GPIO_ALARM3,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
{ /* bit 3 */
.name = "gpo:alarm_4",
.gpio = PCF_GPIO_ALARM4,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
/* bits 4, 5, 6 not used */
{ /* bit 7 */
@@ -301,25 +296,25 @@ static struct gpio_led pcf_gpio_leds3[] = {
{ /* bit 0 */
.name = "gpo:modem_power",
.gpio = PCF_GPIO_MODEM_POWER,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ .default_state = LEDS_GPIO_DEFSTATE_ON,
},
/* bits 1 and 2 not used */
{ /* bit 3 */
.name = "gpo:modem_reset",
.gpio = PCF_GPIO_MODEM_RESET,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_ON,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
},
/* bits 4, 5 and 6 not used */
{ /* bit 7 */
.name = "gpo:trx_reset",
.gpio = PCF_GPIO_TRX_RESET,
- .active_low = 1,
+ .active_low = 0,
.default_trigger = "none",
- .default_state = LEDS_GPIO_DEFSTATE_ON,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
}
};
@@ -336,13 +331,6 @@ static struct platform_device pcf_leds3 = {
}
};
-static void __init gsia18s_pcf_leds_init(void)
-{
- platform_device_register(&pcf_leds1);
- platform_device_register(&pcf_leds2);
- platform_device_register(&pcf_leds3);
-}
-
/*
* SPI busses.
*/
@@ -389,7 +377,7 @@ static struct spi_board_info gsia18s_spi_devices[] = {
*/
static struct gpio_keys_button buttons[] = {
{
- .gpio = GPIO_TRIG_NET_IN,
+ .gpio = AT91_PIN_PB21,
.code = BTN_1,
.desc = "TRIG_NET_IN",
.type = EV_KEY,
@@ -397,28 +385,22 @@ static struct gpio_keys_button buttons[] = {
.wakeup = 1,
},
{ /* SW80 on the GS_IA18_S-MN board*/
- .gpio = GPIO_CARD_UNMOUNT_0,
+ .gpio = AT91_PIN_PB13,
.code = BTN_2,
.desc = "Card umount 0",
.type = EV_KEY,
.active_low = 1,
.wakeup = 1,
- },
- { /* SW79 on the GS_IA18_S-MN board*/
- .gpio = GPIO_CARD_UNMOUNT_1,
- .code = BTN_3,
- .desc = "Card umount 1",
- .type = EV_KEY,
- .active_low = 1,
- .wakeup = 1,
+ .debounce_interval = 10,
},
{ /* SW280 on the GS_IA18-CB board*/
- .gpio = GPIO_KEY_POWER,
+ .gpio = AT91_PIN_PA25,
.code = KEY_POWER,
.desc = "Power Off Button",
.type = EV_KEY,
.active_low = 0,
.wakeup = 1,
+ .debounce_interval = 10,
}
};
@@ -436,60 +418,44 @@ static struct platform_device button_device = {
}
};
-static void __init gsia18s_add_device_buttons(void)
-{
- at91_set_gpio_input(GPIO_TRIG_NET_IN, 1);
- at91_set_deglitch(GPIO_TRIG_NET_IN, 1);
- at91_set_gpio_input(GPIO_CARD_UNMOUNT_0, 1);
- at91_set_deglitch(GPIO_CARD_UNMOUNT_0, 1);
- at91_set_gpio_input(GPIO_CARD_UNMOUNT_1, 1);
- at91_set_deglitch(GPIO_CARD_UNMOUNT_1, 1);
- at91_set_gpio_input(GPIO_KEY_POWER, 0);
- at91_set_deglitch(GPIO_KEY_POWER, 1);
-
- platform_device_register(&button_device);
-}
-
/*
* I2C
*/
-static int pcf8574x_0x20_setup(struct i2c_client *client, int gpio,
+static int pcf8574x_0x20_setup(struct i2c_client *client, int gpio_base,
unsigned int ngpio, void *context)
{
int status;
+ int gpio;
- status = gpio_request(gpio + PCF_GPIO_ETH_DETECT, "eth_det");
+ gpio = gpio_base + PCF_GPIO_ETH_DETECT;
+ status = gpio_request(gpio, "eth_det");
if (status < 0) {
- pr_err("error: can't request GPIO%d\n",
- gpio + PCF_GPIO_ETH_DETECT);
+ pr_err("error: can't request GPIO%d\n", gpio);
return status;
}
- status = gpio_direction_input(gpio + PCF_GPIO_ETH_DETECT);
+ status = gpio_direction_input(gpio);
if (status < 0) {
- pr_err("error: can't setup GPIO%d as input\n",
- gpio + PCF_GPIO_ETH_DETECT);
+ pr_err("error: can't setup GPIO%d as input\n", gpio);
return status;
}
- status = gpio_export(gpio + PCF_GPIO_ETH_DETECT, false);
+ status = gpio_export(gpio, false);
if (status < 0) {
- pr_err("error: can't export GPIO%d\n",
- gpio + PCF_GPIO_ETH_DETECT);
+ pr_err("error: can't export GPIO%d\n", gpio);
return status;
}
- status = gpio_sysfs_set_active_low(gpio + PCF_GPIO_ETH_DETECT, 1);
+ status = gpio_sysfs_set_active_low(gpio, 1);
if (status < 0) {
- pr_err("error: gpio_sysfs_set active_low(GPIO%d, 1)\n",
- gpio + PCF_GPIO_ETH_DETECT);
+ pr_err("error: gpio_sysfs_set active_low(GPIO%d, 1)\n", gpio);
return status;
}
return 0;
}
-static int pcf8574x_0x20_teardown(struct i2c_client *client, int gpio,
+static int pcf8574x_0x20_teardown(struct i2c_client *client, int gpio_base,
unsigned ngpio, void *context)
{
- gpio_free(gpio + PCF_GPIO_ETH_DETECT);
+ gpio_free(gpio_base + PCF_GPIO_ETH_DETECT);
return 0;
}
@@ -564,9 +530,11 @@ static void __init gsia18s_board_init(void)
at91_add_device_usbh(&usbh_data);
at91_add_device_udc(&udc_data);
at91_add_device_eth(&macb_data);
- gsia18s_leds_init();
- gsia18s_pcf_leds_init();
- gsia18s_add_device_buttons();
+ platform_device_register(&leds);
+ platform_device_register(&pcf_leds1);
+ platform_device_register(&pcf_leds2);
+ platform_device_register(&pcf_leds3);
+ platform_device_register(&button_device);
at91_add_device_i2c(gsia18s_i2c_devices,
ARRAY_SIZE(gsia18s_i2c_devices));
at91_add_device_cf(&gsia18s_cf1_data);
diff --git a/arch/arm/mach-at91/include/mach/gsia18s.h b/arch/arm/mach-at91/include/mach/gsia18s.h
index 307c194..e54e58d 100644
--- a/arch/arm/mach-at91/include/mach/gsia18s.h
+++ b/arch/arm/mach-at91/include/mach/gsia18s.h
@@ -1,9 +1,3 @@
-/* Buttons */
-#define GPIO_TRIG_NET_IN AT91_PIN_PB21
-#define GPIO_CARD_UNMOUNT_0 AT91_PIN_PB13
-#define GPIO_CARD_UNMOUNT_1 AT91_PIN_PB12
-#define GPIO_KEY_POWER AT91_PIN_PA25
-
/* PCF8574 0x20 GPIO - U1 on the GS_IA18-CB_V3 board */
#define GS_IA18_S_PCF_GPIO_BASE0 NR_BUILTIN_GPIO
#define PCF_GPIO_HDC_POWER (GS_IA18_S_PCF_GPIO_BASE0 + 0)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists