ARM: pxa: magician: Fix indentation in machine files
This patch fixes the indentation for the HTC Magician machine definition. Signed-off-by: Petr Cvek <petr.cvek@tul.cz> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
This commit is contained in:
parent
6f26f6f5d1
commit
ccb6f9aec3
|
@ -173,7 +173,6 @@ static struct platform_device gpio_keys = {
|
||||||
.id = -1,
|
.id = -1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* EGPIO (Xilinx CPLD)
|
* EGPIO (Xilinx CPLD)
|
||||||
*
|
*
|
||||||
|
@ -338,7 +337,7 @@ static struct pxafb_mach_info samsung_info = {
|
||||||
.modes = samsung_modes,
|
.modes = samsung_modes,
|
||||||
.num_modes = 1,
|
.num_modes = 1,
|
||||||
.fixed_modes = 1,
|
.fixed_modes = 1,
|
||||||
.lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |\
|
.lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |
|
||||||
LCD_ALTERNATE_MAPPING,
|
LCD_ALTERNATE_MAPPING,
|
||||||
.pxafb_lcd_power = samsung_lcd_power,
|
.pxafb_lcd_power = samsung_lcd_power,
|
||||||
};
|
};
|
||||||
|
@ -591,7 +590,8 @@ static struct regulator_consumer_supply bq24022_consumers[] = {
|
||||||
static struct regulator_init_data bq24022_init_data = {
|
static struct regulator_init_data bq24022_init_data = {
|
||||||
.constraints = {
|
.constraints = {
|
||||||
.max_uA = 500000,
|
.max_uA = 500000,
|
||||||
.valid_ops_mask = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS,
|
.valid_ops_mask = REGULATOR_CHANGE_CURRENT |
|
||||||
|
REGULATOR_CHANGE_STATUS,
|
||||||
},
|
},
|
||||||
.num_consumer_supplies = ARRAY_SIZE(bq24022_consumers),
|
.num_consumer_supplies = ARRAY_SIZE(bq24022_consumers),
|
||||||
.consumer_supplies = bq24022_consumers,
|
.consumer_supplies = bq24022_consumers,
|
||||||
|
@ -668,7 +668,6 @@ static struct pxaohci_platform_data magician_ohci_info = {
|
||||||
.power_budget = 0,
|
.power_budget = 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* StrataFlash
|
* StrataFlash
|
||||||
*/
|
*/
|
||||||
|
@ -760,6 +759,7 @@ static void __init magician_init(void)
|
||||||
cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
|
cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
|
||||||
if (cpld) {
|
if (cpld) {
|
||||||
u8 board_id = __raw_readb(cpld + 0x14);
|
u8 board_id = __raw_readb(cpld + 0x14);
|
||||||
|
|
||||||
iounmap(cpld);
|
iounmap(cpld);
|
||||||
system_rev = board_id & 0x7;
|
system_rev = board_id & 0x7;
|
||||||
lcd_select = board_id & 0x8;
|
lcd_select = board_id & 0x8;
|
||||||
|
@ -767,12 +767,12 @@ static void __init magician_init(void)
|
||||||
if (lcd_select && (system_rev < 3))
|
if (lcd_select && (system_rev < 3))
|
||||||
gpio_request_one(GPIO75_MAGICIAN_SAMSUNG_POWER,
|
gpio_request_one(GPIO75_MAGICIAN_SAMSUNG_POWER,
|
||||||
GPIOF_OUT_INIT_LOW, "SAMSUNG_POWER");
|
GPIOF_OUT_INIT_LOW, "SAMSUNG_POWER");
|
||||||
pxa_set_fb_info(NULL, lcd_select ? &samsung_info : &toppoly_info);
|
pxa_set_fb_info(NULL,
|
||||||
|
lcd_select ? &samsung_info : &toppoly_info);
|
||||||
} else
|
} else
|
||||||
pr_err("LCD detection: CPLD mapping failed\n");
|
pr_err("LCD detection: CPLD mapping failed\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
MACHINE_START(MAGICIAN, "HTC Magician")
|
MACHINE_START(MAGICIAN, "HTC Magician")
|
||||||
.atag_offset = 0x100,
|
.atag_offset = 0x100,
|
||||||
.map_io = pxa27x_map_io,
|
.map_io = pxa27x_map_io,
|
||||||
|
|
Loading…
Reference in New Issue