mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-02 09:46:44 +07:00
Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6
This commit is contained in:
commit
8b61207895
@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = {
|
||||
|
||||
static int devboard_sdhc2_get_ro(struct device *dev)
|
||||
{
|
||||
return gpio_get_value(SDHC2_WP);
|
||||
return !gpio_get_value(SDHC2_WP);
|
||||
}
|
||||
|
||||
static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq,
|
||||
|
@ -67,7 +67,7 @@ static unsigned int marxbot_pins[] = {
|
||||
|
||||
static int marxbot_sdhc2_get_ro(struct device *dev)
|
||||
{
|
||||
return gpio_get_value(SDHC2_WP);
|
||||
return !gpio_get_value(SDHC2_WP);
|
||||
}
|
||||
|
||||
static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq,
|
||||
|
@ -94,7 +94,7 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = {
|
||||
|
||||
static int moboard_sdhc1_get_ro(struct device *dev)
|
||||
{
|
||||
return gpio_get_value(SDHC1_WP);
|
||||
return !gpio_get_value(SDHC1_WP);
|
||||
}
|
||||
|
||||
static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq,
|
||||
|
@ -24,15 +24,6 @@
|
||||
#include "devices.h"
|
||||
|
||||
static unsigned int pcm037_eet_pins[] = {
|
||||
/* SPI #1 */
|
||||
MX31_PIN_CSPI1_MISO__MISO,
|
||||
MX31_PIN_CSPI1_MOSI__MOSI,
|
||||
MX31_PIN_CSPI1_SCLK__SCLK,
|
||||
MX31_PIN_CSPI1_SPI_RDY__SPI_RDY,
|
||||
MX31_PIN_CSPI1_SS0__SS0,
|
||||
MX31_PIN_CSPI1_SS1__SS1,
|
||||
MX31_PIN_CSPI1_SS2__SS2,
|
||||
|
||||
/* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */
|
||||
IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO),
|
||||
/* GPIO keys */
|
||||
|
Loading…
Reference in New Issue
Block a user