Merge branch 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/boards
* 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: Add initial support for Bluegiga APX4 Development Kit ARM: mxs: read correct values when setting up MAC ARM: mx28evk: Simplify GPIO requests ARM: mx28: Remove duplicate OCOTP error message ARM: mxs: detect SoC by checking CHIPID register
This commit is contained in:
Olof Johansson
Коммит
d052e161c4
|
|
@ -83,6 +83,18 @@ config MODULE_M28
|
|||
select MXS_HAVE_PLATFORM_MXSFB
|
||||
select MXS_OCOTP
|
||||
|
||||
config MODULE_APX4
|
||||
bool
|
||||
select SOC_IMX28
|
||||
select LEDS_GPIO_REGISTER
|
||||
select MXS_HAVE_AMBA_DUART
|
||||
select MXS_HAVE_PLATFORM_AUART
|
||||
select MXS_HAVE_PLATFORM_FEC
|
||||
select MXS_HAVE_PLATFORM_MXS_I2C
|
||||
select MXS_HAVE_PLATFORM_MXS_MMC
|
||||
select MXS_HAVE_PLATFORM_MXS_SAIF
|
||||
select MXS_OCOTP
|
||||
|
||||
config MACH_TX28
|
||||
bool "Ka-Ro TX28 module"
|
||||
select MODULE_TX28
|
||||
|
|
@ -91,4 +103,8 @@ config MACH_M28EVK
|
|||
bool "Support DENX M28EVK Platform"
|
||||
select MODULE_M28
|
||||
|
||||
config MACH_APX4DEVKIT
|
||||
bool "Support Bluegiga APX4 Development Kit"
|
||||
select MODULE_APX4
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
|
|||
obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o
|
||||
obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
|
||||
obj-$(CONFIG_MACH_M28EVK) += mach-m28evk.o
|
||||
obj-$(CONFIG_MACH_APX4DEVKIT) += mach-apx4devkit.o
|
||||
obj-$(CONFIG_MODULE_TX28) += module-tx28.o
|
||||
obj-$(CONFIG_MACH_TX28) += mach-tx28.o
|
||||
|
||||
|
|
|
|||
|
|
@ -18,4 +18,5 @@
|
|||
#define HW_DIGCTL_CTRL 0x0
|
||||
#define BP_DIGCTL_CTRL_SAIF_CLKMUX 10
|
||||
#define BM_DIGCTL_CTRL_SAIF_CLKMUX (0x3 << 10)
|
||||
#define HW_DIGCTL_CHIPID 0x310
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,21 +23,9 @@
|
|||
#include <linux/io.h>
|
||||
#endif
|
||||
#include <asm/mach-types.h>
|
||||
#include <mach/digctl.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
/*
|
||||
* MXS CPU types
|
||||
*/
|
||||
#define cpu_is_mx23() ( \
|
||||
machine_is_mx23evk() || \
|
||||
machine_is_stmp378x() || \
|
||||
0)
|
||||
#define cpu_is_mx28() ( \
|
||||
machine_is_mx28evk() || \
|
||||
machine_is_m28evk() || \
|
||||
machine_is_tx28() || \
|
||||
0)
|
||||
|
||||
/*
|
||||
* IO addresses common to MXS-based
|
||||
*/
|
||||
|
|
@ -109,6 +97,21 @@ static inline void __mxs_togl(u32 mask, void __iomem *reg)
|
|||
{
|
||||
__raw_writel(mask, reg + MXS_TOG_ADDR);
|
||||
}
|
||||
|
||||
/*
|
||||
* MXS CPU types
|
||||
*/
|
||||
#define MXS_CHIPID (MXS_IO_ADDRESS(MXS_DIGCTL_BASE_ADDR) + HW_DIGCTL_CHIPID)
|
||||
|
||||
static inline int cpu_is_mx23(void)
|
||||
{
|
||||
return ((__raw_readl(MXS_CHIPID) >> 16) == 0x3780);
|
||||
}
|
||||
|
||||
static inline int cpu_is_mx28(void)
|
||||
{
|
||||
return ((__raw_readl(MXS_CHIPID) >> 16) == 0x2800);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __MACH_MXS_H__ */
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@
|
|||
#ifndef __MACH_MXS_UNCOMPRESS_H__
|
||||
#define __MACH_MXS_UNCOMPRESS_H__
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
unsigned long mxs_duart_base;
|
||||
|
||||
#define MXS_DUART(x) (*(volatile unsigned long *)(mxs_duart_base + (x)))
|
||||
|
|
@ -55,16 +53,17 @@ static inline void flush(void)
|
|||
|
||||
#define MX23_DUART_BASE_ADDR 0x80070000
|
||||
#define MX28_DUART_BASE_ADDR 0x80074000
|
||||
#define MXS_DIGCTL_CHIPID 0x8001c310
|
||||
|
||||
static inline void __arch_decomp_setup(unsigned long arch_id)
|
||||
{
|
||||
switch (arch_id) {
|
||||
case MACH_TYPE_MX23EVK:
|
||||
u16 chipid = (*(volatile unsigned long *) MXS_DIGCTL_CHIPID) >> 16;
|
||||
|
||||
switch (chipid) {
|
||||
case 0x3780:
|
||||
mxs_duart_base = MX23_DUART_BASE_ADDR;
|
||||
break;
|
||||
case MACH_TYPE_MX28EVK:
|
||||
case MACH_TYPE_M28EVK:
|
||||
case MACH_TYPE_TX28:
|
||||
case 0x2800:
|
||||
mxs_duart_base = MX28_DUART_BASE_ADDR;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,260 @@
|
|||
/*
|
||||
* Copyright (C) 2011-2012
|
||||
* Lauri Hintsala, Bluegiga, <lauri.hintsala@bluegiga.com>
|
||||
* Veli-Pekka Peltola, Bluegiga, <veli-pekka.peltola@bluegiga.com>
|
||||
*
|
||||
* based on: mach-mx28evk.c
|
||||
* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/regulator/fixed.h>
|
||||
#include <linux/micrel_phy.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/digctl.h>
|
||||
#include <mach/iomux-mx28.h>
|
||||
|
||||
#include "devices-mx28.h"
|
||||
|
||||
#define APX4DEVKIT_GPIO_USERLED MXS_GPIO_NR(3, 28)
|
||||
|
||||
static const iomux_cfg_t apx4devkit_pads[] __initconst = {
|
||||
/* duart */
|
||||
MX28_PAD_PWM0__DUART_RX | MXS_PAD_CTRL,
|
||||
MX28_PAD_PWM1__DUART_TX | MXS_PAD_CTRL,
|
||||
|
||||
/* auart0 */
|
||||
MX28_PAD_AUART0_RX__AUART0_RX | MXS_PAD_CTRL,
|
||||
MX28_PAD_AUART0_TX__AUART0_TX | MXS_PAD_CTRL,
|
||||
MX28_PAD_AUART0_CTS__AUART0_CTS | MXS_PAD_CTRL,
|
||||
MX28_PAD_AUART0_RTS__AUART0_RTS | MXS_PAD_CTRL,
|
||||
|
||||
/* auart1 */
|
||||
MX28_PAD_AUART1_RX__AUART1_RX | MXS_PAD_CTRL,
|
||||
MX28_PAD_AUART1_TX__AUART1_TX | MXS_PAD_CTRL,
|
||||
|
||||
/* auart2 */
|
||||
MX28_PAD_SSP2_SCK__AUART2_RX | MXS_PAD_CTRL,
|
||||
MX28_PAD_SSP2_MOSI__AUART2_TX | MXS_PAD_CTRL,
|
||||
|
||||
/* auart3 */
|
||||
MX28_PAD_SSP2_MISO__AUART3_RX | MXS_PAD_CTRL,
|
||||
MX28_PAD_SSP2_SS0__AUART3_TX | MXS_PAD_CTRL,
|
||||
|
||||
#define MXS_PAD_FEC (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP)
|
||||
/* fec0 */
|
||||
MX28_PAD_ENET0_MDC__ENET0_MDC | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_MDIO__ENET0_MDIO | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_RX_EN__ENET0_RX_EN | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_RXD0__ENET0_RXD0 | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_RXD1__ENET0_RXD1 | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_TX_EN__ENET0_TX_EN | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_TXD0__ENET0_TXD0 | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET0_TXD1__ENET0_TXD1 | MXS_PAD_FEC,
|
||||
MX28_PAD_ENET_CLK__CLKCTRL_ENET | MXS_PAD_FEC,
|
||||
|
||||
/* i2c */
|
||||
MX28_PAD_I2C0_SCL__I2C0_SCL,
|
||||
MX28_PAD_I2C0_SDA__I2C0_SDA,
|
||||
|
||||
/* mmc0 */
|
||||
MX28_PAD_SSP0_DATA0__SSP0_D0 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA1__SSP0_D1 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA2__SSP0_D2 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA3__SSP0_D3 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA4__SSP0_D4 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA5__SSP0_D5 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA6__SSP0_D6 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DATA7__SSP0_D7 |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_CMD__SSP0_CMD |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT |
|
||||
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
|
||||
MX28_PAD_SSP0_SCK__SSP0_SCK |
|
||||
(MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
|
||||
|
||||
/* led */
|
||||
MX28_PAD_PWM3__GPIO_3_28 | MXS_PAD_CTRL,
|
||||
|
||||
/* saif0 & saif1 */
|
||||
MX28_PAD_SAIF0_MCLK__SAIF0_MCLK |
|
||||
(MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK |
|
||||
(MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK |
|
||||
(MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 |
|
||||
(MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
MX28_PAD_SAIF1_SDATA0__SAIF1_SDATA0 |
|
||||
(MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
|
||||
};
|
||||
|
||||
/* led */
|
||||
static const struct gpio_led apx4devkit_leds[] __initconst = {
|
||||
{
|
||||
.name = "user-led",
|
||||
.default_trigger = "heartbeat",
|
||||
.gpio = APX4DEVKIT_GPIO_USERLED,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct gpio_led_platform_data apx4devkit_led_data __initconst = {
|
||||
.leds = apx4devkit_leds,
|
||||
.num_leds = ARRAY_SIZE(apx4devkit_leds),
|
||||
};
|
||||
|
||||
static const struct fec_platform_data mx28_fec_pdata __initconst = {
|
||||
.phy = PHY_INTERFACE_MODE_RMII,
|
||||
};
|
||||
|
||||
static const struct mxs_mmc_platform_data apx4devkit_mmc_pdata __initconst = {
|
||||
.wp_gpio = -EINVAL,
|
||||
.flags = SLOTF_4_BIT_CAPABLE,
|
||||
};
|
||||
|
||||
static const struct i2c_board_info apx4devkit_i2c_boardinfo[] __initconst = {
|
||||
{ I2C_BOARD_INFO("sgtl5000", 0x0a) }, /* ASoC */
|
||||
{ I2C_BOARD_INFO("pcf8563", 0x51) }, /* RTC */
|
||||
};
|
||||
|
||||
#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || \
|
||||
defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
|
||||
static struct regulator_consumer_supply apx4devkit_audio_consumer_supplies[] = {
|
||||
REGULATOR_SUPPLY("VDDA", "0-000a"),
|
||||
REGULATOR_SUPPLY("VDDIO", "0-000a"),
|
||||
};
|
||||
|
||||
static struct regulator_init_data apx4devkit_vdd_reg_init_data = {
|
||||
.constraints = {
|
||||
.name = "3V3",
|
||||
.always_on = 1,
|
||||
},
|
||||
.consumer_supplies = apx4devkit_audio_consumer_supplies,
|
||||
.num_consumer_supplies = ARRAY_SIZE(apx4devkit_audio_consumer_supplies),
|
||||
};
|
||||
|
||||
static struct fixed_voltage_config apx4devkit_vdd_pdata = {
|
||||
.supply_name = "board-3V3",
|
||||
.microvolts = 3300000,
|
||||
.gpio = -EINVAL,
|
||||
.enabled_at_boot = 1,
|
||||
.init_data = &apx4devkit_vdd_reg_init_data,
|
||||
};
|
||||
|
||||
static struct platform_device apx4devkit_voltage_regulator = {
|
||||
.name = "reg-fixed-voltage",
|
||||
.id = -1,
|
||||
.num_resources = 0,
|
||||
.dev = {
|
||||
.platform_data = &apx4devkit_vdd_pdata,
|
||||
},
|
||||
};
|
||||
|
||||
static void __init apx4devkit_add_regulators(void)
|
||||
{
|
||||
platform_device_register(&apx4devkit_voltage_regulator);
|
||||
}
|
||||
#else
|
||||
static void __init apx4devkit_add_regulators(void) {}
|
||||
#endif
|
||||
|
||||
static const struct mxs_saif_platform_data
|
||||
apx4devkit_mxs_saif_pdata[] __initconst = {
|
||||
/* working on EXTMSTR0 mode (saif0 master, saif1 slave) */
|
||||
{
|
||||
.master_mode = 1,
|
||||
.master_id = 0,
|
||||
}, {
|
||||
.master_mode = 0,
|
||||
.master_id = 0,
|
||||
},
|
||||
};
|
||||
|
||||
static int apx4devkit_phy_fixup(struct phy_device *phy)
|
||||
{
|
||||
phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __init apx4devkit_init(void)
|
||||
{
|
||||
mxs_iomux_setup_multiple_pads(apx4devkit_pads,
|
||||
ARRAY_SIZE(apx4devkit_pads));
|
||||
|
||||
mx28_add_duart();
|
||||
mx28_add_auart0();
|
||||
mx28_add_auart1();
|
||||
mx28_add_auart2();
|
||||
mx28_add_auart3();
|
||||
|
||||
/*
|
||||
* Register fixup for the Micrel KS8031 PHY clock
|
||||
* (shares same ID with KS8051)
|
||||
*/
|
||||
phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK,
|
||||
apx4devkit_phy_fixup);
|
||||
|
||||
mx28_add_fec(0, &mx28_fec_pdata);
|
||||
|
||||
mx28_add_mxs_mmc(0, &apx4devkit_mmc_pdata);
|
||||
|
||||
gpio_led_register_device(0, &apx4devkit_led_data);
|
||||
|
||||
mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
|
||||
mx28_add_saif(0, &apx4devkit_mxs_saif_pdata[0]);
|
||||
mx28_add_saif(1, &apx4devkit_mxs_saif_pdata[1]);
|
||||
|
||||
apx4devkit_add_regulators();
|
||||
|
||||
mx28_add_mxs_i2c(0);
|
||||
i2c_register_board_info(0, apx4devkit_i2c_boardinfo,
|
||||
ARRAY_SIZE(apx4devkit_i2c_boardinfo));
|
||||
|
||||
mxs_add_platform_device("mxs-sgtl5000", 0, NULL, 0, NULL, 0);
|
||||
}
|
||||
|
||||
static void __init apx4devkit_timer_init(void)
|
||||
{
|
||||
mx28_clocks_init();
|
||||
}
|
||||
|
||||
static struct sys_timer apx4devkit_timer = {
|
||||
.init = apx4devkit_timer_init,
|
||||
};
|
||||
|
||||
MACHINE_START(APX4DEVKIT, "Bluegiga APX4 Development Kit")
|
||||
.map_io = mx28_map_io,
|
||||
.init_irq = mx28_init_irq,
|
||||
.timer = &apx4devkit_timer,
|
||||
.init_machine = apx4devkit_init,
|
||||
.restart = mxs_restart,
|
||||
MACHINE_END
|
||||
|
|
@ -247,18 +247,15 @@ static int __init m28evk_fec_get_mac(void)
|
|||
u32 val;
|
||||
const u32 *ocotp = mxs_get_ocotp();
|
||||
|
||||
if (!ocotp) {
|
||||
pr_err("%s: timeout when reading fec mac from OCOTP\n",
|
||||
__func__);
|
||||
if (!ocotp)
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
/*
|
||||
* OCOTP only stores the last 4 octets for each mac address,
|
||||
* so hard-code DENX OUI (C0:E5:4E) here.
|
||||
*/
|
||||
for (i = 0; i < 2; i++) {
|
||||
val = ocotp[i * 4];
|
||||
val = ocotp[i];
|
||||
mx28_fec_pdata[i].mac[0] = 0xC0;
|
||||
mx28_fec_pdata[i].mac[1] = 0xE5;
|
||||
mx28_fec_pdata[i].mac[2] = 0x4E;
|
||||
|
|
|
|||
|
|
@ -223,7 +223,6 @@ static const struct gpio_led_platform_data mx28evk_led_data __initconst = {
|
|||
/* fec */
|
||||
static void __init mx28evk_fec_reset(void)
|
||||
{
|
||||
int ret;
|
||||
struct clk *clk;
|
||||
|
||||
/* Enable fec phy clock */
|
||||
|
|
@ -231,32 +230,7 @@ static void __init mx28evk_fec_reset(void)
|
|||
if (!IS_ERR(clk))
|
||||
clk_prepare_enable(clk);
|
||||
|
||||
/* Power up fec phy */
|
||||
ret = gpio_request(MX28EVK_FEC_PHY_POWER, "fec-phy-power");
|
||||
if (ret) {
|
||||
pr_err("Failed to request gpio fec-phy-%s: %d\n", "power", ret);
|
||||
return;
|
||||
}
|
||||
|
||||
ret = gpio_direction_output(MX28EVK_FEC_PHY_POWER, 0);
|
||||
if (ret) {
|
||||
pr_err("Failed to drive gpio fec-phy-%s: %d\n", "power", ret);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Reset fec phy */
|
||||
ret = gpio_request(MX28EVK_FEC_PHY_RESET, "fec-phy-reset");
|
||||
if (ret) {
|
||||
pr_err("Failed to request gpio fec-phy-%s: %d\n", "reset", ret);
|
||||
return;
|
||||
}
|
||||
|
||||
gpio_direction_output(MX28EVK_FEC_PHY_RESET, 0);
|
||||
if (ret) {
|
||||
pr_err("Failed to drive gpio fec-phy-%s: %d\n", "reset", ret);
|
||||
return;
|
||||
}
|
||||
|
||||
gpio_set_value(MX28EVK_FEC_PHY_RESET, 0);
|
||||
mdelay(1);
|
||||
gpio_set_value(MX28EVK_FEC_PHY_RESET, 1);
|
||||
}
|
||||
|
|
@ -278,14 +252,14 @@ static int __init mx28evk_fec_get_mac(void)
|
|||
const u32 *ocotp = mxs_get_ocotp();
|
||||
|
||||
if (!ocotp)
|
||||
goto error;
|
||||
return -ETIMEDOUT;
|
||||
|
||||
/*
|
||||
* OCOTP only stores the last 4 octets for each mac address,
|
||||
* so hard-code Freescale OUI (00:04:9f) here.
|
||||
*/
|
||||
for (i = 0; i < 2; i++) {
|
||||
val = ocotp[i * 4];
|
||||
val = ocotp[i];
|
||||
mx28_fec_pdata[i].mac[0] = 0x00;
|
||||
mx28_fec_pdata[i].mac[1] = 0x04;
|
||||
mx28_fec_pdata[i].mac[2] = 0x9f;
|
||||
|
|
@ -295,10 +269,6 @@ static int __init mx28evk_fec_get_mac(void)
|
|||
}
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
pr_err("%s: timeout when reading fec mac from OCOTP\n", __func__);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -417,9 +387,14 @@ static void __init mx28evk_add_regulators(void)
|
|||
static void __init mx28evk_add_regulators(void) {}
|
||||
#endif
|
||||
|
||||
static struct gpio mx28evk_lcd_gpios[] = {
|
||||
static const struct gpio mx28evk_gpios[] __initconst = {
|
||||
{ MX28EVK_LCD_ENABLE, GPIOF_OUT_INIT_HIGH, "lcd-enable" },
|
||||
{ MX28EVK_BL_ENABLE, GPIOF_OUT_INIT_HIGH, "bl-enable" },
|
||||
{ MX28EVK_FLEXCAN_SWITCH, GPIOF_DIR_OUT, "flexcan-switch" },
|
||||
{ MX28EVK_MMC0_SLOT_POWER, GPIOF_OUT_INIT_LOW, "mmc0-slot-power" },
|
||||
{ MX28EVK_MMC1_SLOT_POWER, GPIOF_OUT_INIT_LOW, "mmc1-slot-power" },
|
||||
{ MX28EVK_FEC_PHY_POWER, GPIOF_OUT_INIT_LOW, "fec-phy-power" },
|
||||
{ MX28EVK_FEC_PHY_RESET, GPIOF_DIR_OUT, "fec-phy-reset" },
|
||||
};
|
||||
|
||||
static const struct mxs_saif_platform_data
|
||||
|
|
@ -447,25 +422,18 @@ static void __init mx28evk_init(void)
|
|||
if (mx28evk_fec_get_mac())
|
||||
pr_warn("%s: failed on fec mac setup\n", __func__);
|
||||
|
||||
ret = gpio_request_array(mx28evk_gpios, ARRAY_SIZE(mx28evk_gpios));
|
||||
if (ret)
|
||||
pr_err("One or more GPIOs failed to be requested: %d\n", ret);
|
||||
|
||||
mx28evk_fec_reset();
|
||||
mx28_add_fec(0, &mx28_fec_pdata[0]);
|
||||
mx28_add_fec(1, &mx28_fec_pdata[1]);
|
||||
|
||||
ret = gpio_request_one(MX28EVK_FLEXCAN_SWITCH, GPIOF_DIR_OUT,
|
||||
"flexcan-switch");
|
||||
if (ret) {
|
||||
pr_err("failed to request gpio flexcan-switch: %d\n", ret);
|
||||
} else {
|
||||
mx28_add_flexcan(0, &mx28evk_flexcan_pdata[0]);
|
||||
mx28_add_flexcan(1, &mx28evk_flexcan_pdata[1]);
|
||||
}
|
||||
mx28_add_flexcan(0, &mx28evk_flexcan_pdata[0]);
|
||||
mx28_add_flexcan(1, &mx28evk_flexcan_pdata[1]);
|
||||
|
||||
ret = gpio_request_array(mx28evk_lcd_gpios,
|
||||
ARRAY_SIZE(mx28evk_lcd_gpios));
|
||||
if (ret)
|
||||
pr_warn("failed to request gpio pins for lcd: %d\n", ret);
|
||||
else
|
||||
mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
|
||||
mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
|
||||
|
||||
mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
|
||||
mx28_add_saif(0, &mx28evk_mxs_saif_pdata[0]);
|
||||
|
|
@ -480,20 +448,8 @@ static void __init mx28evk_init(void)
|
|||
mxs_add_platform_device("mxs-sgtl5000", 0, NULL, 0,
|
||||
NULL, 0);
|
||||
|
||||
/* power on mmc slot by writing 0 to the gpio */
|
||||
ret = gpio_request_one(MX28EVK_MMC0_SLOT_POWER, GPIOF_OUT_INIT_LOW,
|
||||
"mmc0-slot-power");
|
||||
if (ret)
|
||||
pr_warn("failed to request gpio mmc0-slot-power: %d\n", ret);
|
||||
else
|
||||
mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]);
|
||||
|
||||
ret = gpio_request_one(MX28EVK_MMC1_SLOT_POWER, GPIOF_OUT_INIT_LOW,
|
||||
"mmc1-slot-power");
|
||||
if (ret)
|
||||
pr_warn("failed to request gpio mmc1-slot-power: %d\n", ret);
|
||||
else
|
||||
mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
|
||||
mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]);
|
||||
mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
|
||||
|
||||
mx28_add_rtc_stmp3xxx();
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче