Commit 46d6ccdb authored by Maarten ter Huurne's avatar Maarten ter Huurne Committed by Ralf Baechle

MIPS: JZ4740: Qi LB60: Remove support for AVT2 variant

AVT2 was a prototype board of which about 5 were made, none of which
are in use anymore.
Signed-off-by: default avatarMaarten ter Huurne <maarten@treewalker.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13103/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ae07ea85
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
#include "clock.h" #include "clock.h"
static bool is_avt2;
/* GPIOs */ /* GPIOs */
#define QI_LB60_GPIO_SD_CD JZ_GPIO_PORTD(0) #define QI_LB60_GPIO_SD_CD JZ_GPIO_PORTD(0)
#define QI_LB60_GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2) #define QI_LB60_GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2)
...@@ -367,43 +365,12 @@ static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = { ...@@ -367,43 +365,12 @@ static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = {
.power_active_low = 1, .power_active_low = 1,
}; };
/* OHCI */ /* beeper */
static struct regulator_consumer_supply avt2_usb_regulator_consumer =
REGULATOR_SUPPLY("vbus", "jz4740-ohci");
static struct regulator_init_data avt2_usb_regulator_init_data = {
.num_consumer_supplies = 1,
.consumer_supplies = &avt2_usb_regulator_consumer,
.constraints = {
.name = "USB power",
.min_uV = 5000000,
.max_uV = 5000000,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
},
};
static struct fixed_voltage_config avt2_usb_regulator_data = {
.supply_name = "USB power",
.microvolts = 5000000,
.gpio = JZ_GPIO_PORTB(17),
.init_data = &avt2_usb_regulator_init_data,
};
static struct platform_device avt2_usb_regulator_device = {
.name = "reg-fixed-voltage",
.id = -1,
.dev = {
.platform_data = &avt2_usb_regulator_data,
}
};
static struct pwm_lookup qi_lb60_pwm_lookup[] = { static struct pwm_lookup qi_lb60_pwm_lookup[] = {
PWM_LOOKUP("jz4740-pwm", 4, "pwm-beeper", NULL, 0, PWM_LOOKUP("jz4740-pwm", 4, "pwm-beeper", NULL, 0,
PWM_POLARITY_NORMAL), PWM_POLARITY_NORMAL),
}; };
/* beeper */
static struct platform_device qi_lb60_pwm_beeper = { static struct platform_device qi_lb60_pwm_beeper = {
.name = "pwm-beeper", .name = "pwm-beeper",
.id = -1, .id = -1,
...@@ -487,11 +454,6 @@ static int __init qi_lb60_init_platform_devices(void) ...@@ -487,11 +454,6 @@ static int __init qi_lb60_init_platform_devices(void)
spi_register_board_info(qi_lb60_spi_board_info, spi_register_board_info(qi_lb60_spi_board_info,
ARRAY_SIZE(qi_lb60_spi_board_info)); ARRAY_SIZE(qi_lb60_spi_board_info));
if (is_avt2) {
platform_device_register(&avt2_usb_regulator_device);
platform_device_register(&jz4740_usb_ohci_device);
}
pwm_add_table(qi_lb60_pwm_lookup, ARRAY_SIZE(qi_lb60_pwm_lookup)); pwm_add_table(qi_lb60_pwm_lookup, ARRAY_SIZE(qi_lb60_pwm_lookup));
return platform_add_devices(jz_platform_devices, return platform_add_devices(jz_platform_devices,
...@@ -499,19 +461,9 @@ static int __init qi_lb60_init_platform_devices(void) ...@@ -499,19 +461,9 @@ static int __init qi_lb60_init_platform_devices(void)
} }
static __init int board_avt2(char *str)
{
qi_lb60_mmc_pdata.card_detect_active_low = 1;
is_avt2 = true;
return 1;
}
__setup("avt2", board_avt2);
static int __init qi_lb60_board_setup(void) static int __init qi_lb60_board_setup(void)
{ {
printk(KERN_INFO "Qi Hardware JZ4740 QI %s setup\n", printk(KERN_INFO "Qi Hardware JZ4740 QI LB60 setup\n");
is_avt2 ? "AVT2" : "LB60");
board_gpio_setup(); board_gpio_setup();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment