ENGR00121963-1 MX53: Add ARM2 CPU board support

1. Add basic support for MX53 ARM2 CPU board.
2. Bit 11-8 in system_rev is used to indicate board version. If
Bit 11-8 is 1, it's ARM2 CPU board. Otherwise, it's EVK board. To
run kernel image on ARM2 CPU board, the user can add command option
"system_rev=0x53110" in launch command line.

Signed-off-by: Lily Zhang <r58066@freescale.com>
This commit is contained in:
Lily Zhang
2010-03-25 13:03:00 +08:00
committed by Matt Sealey
parent bffe867f7a
commit 30b28b6e40
3 changed files with 203 additions and 126 deletions

View File

@@ -351,12 +351,12 @@ static int sdhc_write_protect(struct device *dev)
{
unsigned short rc = 0;
if (to_platform_device(dev)->id == 0)
rc = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA14));
else if (to_platform_device(dev)->id == 1)
rc = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_GPIO_2));
else
rc = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA12));
if (!board_is_mx53_arm2()) {
if (to_platform_device(dev)->id == 0)
rc = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA14));
else
rc = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA12));
}
return rc;
}
@@ -364,14 +364,18 @@ static int sdhc_write_protect(struct device *dev)
static unsigned int sdhc_get_card_det_status(struct device *dev)
{
int ret;
if (to_platform_device(dev)->id == 0) {
ret = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA13));
} else if (to_platform_device(dev)->id == 1) {
ret = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_GPIO_4));
} else{ /* config the det pin for SDHC3 */
ret = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11));
}
if (board_is_mx53_arm2()) {
if (to_platform_device(dev)->id == 0)
ret = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_GPIO_1));
else
ret = 1;
} else {
if (to_platform_device(dev)->id == 0) {
ret = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA13));
} else{ /* config the det pin for SDHC3 */
ret = gpio_get_value(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11));
}
}
return ret;
}
@@ -429,22 +433,26 @@ static int mxc_sgtl5000_init(void)
struct clk *ssi_ext1;
int rate;
ssi_ext1 = clk_get(NULL, "ssi_ext1_clk");
if (IS_ERR(ssi_ext1))
return -1;
if (board_is_mx53_arm2()) {
sgtl5000_data.sysclk = 12000000;
} else {
ssi_ext1 = clk_get(NULL, "ssi_ext1_clk");
if (IS_ERR(ssi_ext1))
return -1;
rate = clk_round_rate(ssi_ext1, 12000000);
if (rate < 8000000 || rate > 27000000) {
printk(KERN_ERR "Error: SGTL5000 mclk freq %d out of range!\n",
rate);
clk_put(ssi_ext1);
return -1;
rate = clk_round_rate(ssi_ext1, 12000000);
if (rate < 8000000 || rate > 27000000) {
printk(KERN_ERR "Error: SGTL5000 mclk freq %d out of range!\n",
rate);
clk_put(ssi_ext1);
return -1;
}
clk_set_rate(ssi_ext1, rate);
clk_enable(ssi_ext1);
sgtl5000_data.sysclk = rate;
}
clk_set_rate(ssi_ext1, rate);
clk_enable(ssi_ext1);
sgtl5000_data.sysclk = rate;
return 0;
}
@@ -515,10 +523,19 @@ static void __init mxc_board_init(void)
mxc_ipu_data.di_clk[1] = clk_get(NULL, "ipu_di1_clk");
/* SD card detect irqs */
mxcsdhc3_device.resource[2].start = IOMUX_TO_IRQ(MX53_PIN_EIM_DA11);
mxcsdhc3_device.resource[2].end = IOMUX_TO_IRQ(MX53_PIN_EIM_DA11);
mxcsdhc1_device.resource[2].start = IOMUX_TO_IRQ(MX53_PIN_EIM_DA13);
mxcsdhc1_device.resource[2].end = IOMUX_TO_IRQ(MX53_PIN_EIM_DA13);
if (board_is_mx53_arm2()) {
mxcsdhc1_device.resource[2].start = IOMUX_TO_IRQ(MX53_PIN_GPIO_1);
mxcsdhc1_device.resource[2].end = IOMUX_TO_IRQ(MX53_PIN_GPIO_1);
mmc3_data.card_inserted_state = 1;
mmc3_data.status = NULL;
mmc3_data.wp_status = NULL;
mmc1_data.wp_status = NULL;
} else {
mxcsdhc3_device.resource[2].start = IOMUX_TO_IRQ(MX53_PIN_EIM_DA11);
mxcsdhc3_device.resource[2].end = IOMUX_TO_IRQ(MX53_PIN_EIM_DA11);
mxcsdhc1_device.resource[2].start = IOMUX_TO_IRQ(MX53_PIN_EIM_DA13);
mxcsdhc1_device.resource[2].end = IOMUX_TO_IRQ(MX53_PIN_EIM_DA13);
}
mxc_cpu_common_init();
mxc_register_gpios();
@@ -546,8 +563,10 @@ static void __init mxc_board_init(void)
mxc_register_device(&mxc_dvfs_per_device, &dvfs_per_data);
*/
mxc_register_device(&mxc_iim_device, NULL);
mxc_register_device(&mxc_pwm2_device, NULL);
mxc_register_device(&mxc_pwm_backlight_device, &mxc_pwm_backlight_data);
if (!board_is_mx53_arm2()) {
mxc_register_device(&mxc_pwm2_device, NULL);
mxc_register_device(&mxc_pwm_backlight_device, &mxc_pwm_backlight_data);
}
/* mxc_register_device(&mxc_keypad_device, &keypad_plat_data); */
mxc_register_device(&mxcsdhc1_device, &mmc1_data);
@@ -572,7 +591,6 @@ static void __init mxc_board_init(void)
/*
pm_power_off = mxc_power_off;
*/
mxc_register_device(&mxc_sgtl5000_device, &sgtl5000_data);
mx5_usb_dr_init();
mx5_usbh1_init();

View File

@@ -45,12 +45,6 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
{
MX53_PIN_EIM_RW, IOMUX_CONFIG_ALT3,
},
{
MX53_PIN_EIM_A23, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_A24, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_A25, IOMUX_CONFIG_ALT6,
},
@@ -69,21 +63,12 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
{
MX53_PIN_EIM_D20, IOMUX_CONFIG_ALT3,
},
{
MX53_PIN_EIM_D21, IOMUX_CONFIG_ALT3,
},
{
MX53_PIN_EIM_D22, IOMUX_CONFIG_ALT3,
},
{
MX53_PIN_EIM_D23, IOMUX_CONFIG_ALT4,
},
{
MX53_PIN_EIM_D24, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_D25, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_D26, IOMUX_CONFIG_GPIO,
},
@@ -99,21 +84,6 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
{
MX53_PIN_EIM_D31, IOMUX_CONFIG_ALT4,
},
{
MX53_PIN_EIM_DA11, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_DA12, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_DA13, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_DA14, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_EIM_DA15, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_NANDF_CS2, IOMUX_CONFIG_ALT3,
},
@@ -132,18 +102,12 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
{
MX53_PIN_ATA_DA_1, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_ATA_DA_2, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_ATA_DATA4, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_ATA_DATA6, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_ATA_DATA7, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_ATA_DATA12, IOMUX_CONFIG_ALT2,
},
@@ -225,12 +189,6 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
MUX_IN_UART1_IPP_UART_RXD_MUX_SELECT_INPUT,
INPUT_CTL_PATH1,
},
{
MX53_PIN_CSI0_DATA_EN, IOMUX_CONFIG_GPIO,
},
{
MX53_PIN_GPIO_1, IOMUX_CONFIG_ALT4,
},
{
MX53_PIN_GPIO_2, IOMUX_CONFIG_GPIO,
},
@@ -419,11 +377,6 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
(PAD_CTL_HYS_NONE | PAD_CTL_PKE_NONE | PAD_CTL_ODE_OPENDRAIN_NONE |
PAD_CTL_DRV_LOW | PAD_CTL_SRE_SLOW),
},
{ /* gpio backlight */
MX53_PIN_DI0_PIN4, IOMUX_CONFIG_ALT1,
(PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | PAD_CTL_PUE_KEEPER |
PAD_CTL_ODE_OPENDRAIN_NONE | PAD_CTL_DRV_HIGH | PAD_CTL_SRE_SLOW),
},
/* esdhc1 */
{
MX53_PIN_SD1_CMD, IOMUX_CONFIG_ALT0 | IOMUX_CONFIG_SION,
@@ -532,7 +485,52 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
MX53_PIN_FEC_MDC, IOMUX_CONFIG_ALT0,
PAD_CTL_DRV_HIGH,
},
{
};
static struct mxc_iomux_pin_cfg __initdata mx53_evk_iomux_pins[] = {
{ /* USB OTG USB_OC */
MX53_PIN_EIM_A24, IOMUX_CONFIG_GPIO,
},
{ /* USB OTG USB_PWR */
MX53_PIN_EIM_A23, IOMUX_CONFIG_GPIO,
},
{ /* DISPB0_SER_CLK */
MX53_PIN_EIM_D21, IOMUX_CONFIG_ALT3,
},
{ /* DI0_PIN1 */
MX53_PIN_EIM_D22, IOMUX_CONFIG_ALT3,
},
{ /* SDHC1 SD_CD */
MX53_PIN_EIM_DA13, IOMUX_CONFIG_GPIO,
},
{ /* SDHC1 SD_WP */
MX53_PIN_EIM_DA14, IOMUX_CONFIG_GPIO,
},
{ /* SDHC3 SD_CD */
MX53_PIN_EIM_DA11, IOMUX_CONFIG_GPIO,
},
{ /* SDHC3 SD_WP */
MX53_PIN_EIM_DA12, IOMUX_CONFIG_GPIO,
},
{ /* PWM backlight */
MX53_PIN_GPIO_1, IOMUX_CONFIG_ALT4,
},
{ /* USB HOST USB_PWR */
MX53_PIN_ATA_DA_2, IOMUX_CONFIG_GPIO,
},
{ /* USB HOST USB_RST */
MX53_PIN_CSI0_DATA_EN, IOMUX_CONFIG_GPIO,
},
{ /* USB HOST CARD_ON */
MX53_PIN_EIM_DA15, IOMUX_CONFIG_GPIO,
},
{ /* USB HOST CARD_RST */
MX53_PIN_ATA_DATA7, IOMUX_CONFIG_GPIO,
},
{ /* USB HOST WAN_WAKE */
MX53_PIN_EIM_D25, IOMUX_CONFIG_GPIO,
},
{ /* FEC_RST */
MX53_PIN_ATA_DA_0, IOMUX_CONFIG_ALT1,
},
{ /* audio clock out */
@@ -540,6 +538,21 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
},
};
static struct mxc_iomux_pin_cfg __initdata mx53_arm2_iomux_pins[] = {
{ /* USB OTG USB_OC */
MX53_PIN_EIM_D21, IOMUX_CONFIG_GPIO,
},
{ /* USB OTG USB_PWR */
MX53_PIN_EIM_D22, IOMUX_CONFIG_GPIO,
},
{ /* SDHC1 SD_CD */
MX53_PIN_GPIO_1, IOMUX_CONFIG_GPIO,
},
{ /* gpio backlight */
MX53_PIN_DI0_PIN4, IOMUX_CONFIG_GPIO,
},
};
static int __initdata enable_w1 = { 0 };
static int __init w1_setup(char *__unused)
{
@@ -553,30 +566,6 @@ void __init mx53_evk_io_init(void)
{
int i;
/* Host1 Vbus with GPIO high */
mxc_iomux_set_pad(MX53_PIN_ATA_DA_2, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_2), "gpio7_8");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_2), 1);
/* USB HUB RESET - De-assert USB HUB RESET_N */
mxc_iomux_set_pad(MX53_PIN_CSI0_DATA_EN, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), "gpio5_20");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), 0);
msleep(1);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), 0);
msleep(1);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), 1);
/* Enable OTG VBus with GPIO low */
mxc_iomux_set_pad(MX53_PIN_EIM_A23, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_A23), "gpio6_6");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_EIM_A23), 0);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_EIM_A23), 0);
for (i = 0; i < ARRAY_SIZE(mxc_iomux_pins); i++) {
mxc_request_iomux(mxc_iomux_pins[i].pin,
mxc_iomux_pins[i].mux_mode);
@@ -588,29 +577,95 @@ void __init mx53_evk_io_init(void)
mxc_iomux_pins[i].in_mode);
}
if (board_is_mx53_arm2()) {
/* MX53 ARM2 CPU board */
pr_info("MX53 ARM2 board \n");
for (i = 0; i < ARRAY_SIZE(mx53_arm2_iomux_pins); i++) {
mxc_request_iomux(mx53_arm2_iomux_pins[i].pin,
mx53_arm2_iomux_pins[i].mux_mode);
if (mx53_arm2_iomux_pins[i].pad_cfg)
mxc_iomux_set_pad(mx53_arm2_iomux_pins[i].pin,
mx53_arm2_iomux_pins[i].pad_cfg);
if (mx53_arm2_iomux_pins[i].in_select)
mxc_iomux_set_input(mx53_arm2_iomux_pins[i].in_select,
mx53_arm2_iomux_pins[i].in_mode);
}
/* Enable OTG VBus with GPIO low */
mxc_iomux_set_pad(MX53_PIN_EIM_D22, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_D22), "gpio3_22");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_EIM_D22), 0);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_EIM_D22), 0);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_GPIO_1), "gpio1_1");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_GPIO_1)); /* SD1 CD */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_DI0_PIN4), "gpio4_20");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_DI0_PIN4), 0);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_DI0_PIN4), 1);
} else {
/* MX53 EVK board */
pr_info("MX53 EVK board \n");
for (i = 0; i < ARRAY_SIZE(mx53_evk_iomux_pins); i++) {
mxc_request_iomux(mx53_evk_iomux_pins[i].pin,
mx53_evk_iomux_pins[i].mux_mode);
if (mx53_evk_iomux_pins[i].pad_cfg)
mxc_iomux_set_pad(mx53_evk_iomux_pins[i].pin,
mx53_evk_iomux_pins[i].pad_cfg);
if (mx53_evk_iomux_pins[i].in_select)
mxc_iomux_set_input(mx53_evk_iomux_pins[i].in_select,
mx53_evk_iomux_pins[i].in_mode);
}
/* Host1 Vbus with GPIO high */
mxc_iomux_set_pad(MX53_PIN_ATA_DA_2, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_2), "gpio7_8");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_2), 1);
/* USB HUB RESET - De-assert USB HUB RESET_N */
mxc_iomux_set_pad(MX53_PIN_CSI0_DATA_EN, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), "gpio5_20");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), 0);
msleep(1);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), 0);
msleep(1);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_CSI0_DATA_EN), 1);
/* Enable OTG VBus with GPIO low */
mxc_iomux_set_pad(MX53_PIN_EIM_A23, PAD_CTL_DRV_HIGH |
PAD_CTL_PKE_ENABLE | PAD_CTL_SRE_FAST);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_A23), "gpio6_6");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_EIM_A23), 0);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_EIM_A23), 0);
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA13), "gpio3_13");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA13)); /* SD1 CD */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA14), "gpio3_14");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA14)); /* SD1 WP */
/* SD3 CD */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11), "gpio3_11");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11));
/* SD3 WP */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA12), "gpio3_12");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11));
/* reset FEC PHY */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), "gpio7_6");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), 0);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), 0);
msleep(1);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), 1);
}
gpio_request(IOMUX_TO_GPIO(MX53_PIN_GPIO_16), "gpio7_11");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_GPIO_16)); /*PMIC_INT*/
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA13), "gpio3_13");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA13)); /* SD1 CD */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA14), "gpio3_14");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA14)); /* SD1 WP */
/* SD3 CD */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11), "gpio3_11");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11));
/* SD3 WP */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_EIM_DA12), "gpio3_12");
gpio_direction_input(IOMUX_TO_GPIO(MX53_PIN_EIM_DA11));
/* reset FEC PHY */
gpio_request(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), "gpio7_6");
gpio_direction_output(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), 0);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), 0);
msleep(1);
gpio_set_value(IOMUX_TO_GPIO(MX53_PIN_ATA_DA_0), 1);
/* i2c1 SDA */
mxc_request_iomux(MX53_PIN_CSI0_D8,

View File

@@ -83,6 +83,10 @@ extern unsigned int system_rev;
#define board_is_rev(rev) (((system_rev & 0x0F00) == rev) ? 1 : 0)
#endif
#ifdef CONFIG_ARCH_MX5
#define board_is_mx53_arm2() (cpu_is_mx53() && board_is_rev(BOARD_REV_2))
#endif
#include <mach/mxc.h>
/*!