Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccb6f9ae authored by Petr Cvek's avatar Petr Cvek Committed by Robert Jarzmik
Browse files

ARM: pxa: magician: Fix indentation in machine files 



This patch fixes the indentation for the HTC Magician machine definition.

Signed-off-by: default avatarPetr Cvek <petr.cvek@tul.cz>
Acked-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 6f26f6f5

arch/arm/mach-pxa/magician.c

+182 −182
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ static struct platform_device gpio_keys = { 
	.id	= -1,

};





/*

 * EGPIO (Xilinx CPLD)

 *
@@ -338,7 +337,7 @@ static struct pxafb_mach_info samsung_info = { 
	.modes			= samsung_modes,

	.num_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,

	.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 = {

	.constraints = {

		.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),

	.consumer_supplies	= bq24022_consumers,
@@ -668,7 +668,6 @@ static struct pxaohci_platform_data magician_ohci_info = { 
	.power_budget	= 0,

};





/*

 * StrataFlash

 */
@@ -760,6 +759,7 @@ static void __init magician_init(void) 
	cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);

	if (cpld) {

		u8 board_id = __raw_readb(cpld + 0x14);



		iounmap(cpld);

		system_rev = board_id & 0x7;

		lcd_select = board_id & 0x8;
@@ -767,12 +767,12 @@ static void __init magician_init(void) 
		if (lcd_select && (system_rev < 3))

			gpio_request_one(GPIO75_MAGICIAN_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

		pr_err("LCD detection: CPLD mapping failed\n");

}





MACHINE_START(MAGICIAN, "HTC Magician")

	.atag_offset	= 0x100,

	.map_io		= pxa27x_map_io,

arch/arm/mach-pxa/include/mach/magician.h

+27 −27

File changed.

Contains only whitespace changes.