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

Commit 45bb9e6f authored by Josh Wu's avatar Josh Wu Committed by Nicolas Ferre
Browse files

ARM: at91: add clock selection parameter for at91_add_device_isi() 



Add parameter and change existing call in at91sam9263_devices.c.

Signed-off-by: default avatarJosh Wu <josh.wu@atmel.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent bb273c8f

arch/arm/mach-at91/at91sam9263_devices.c

+10 −3
Original line number Diff line number Diff line
@@ -891,7 +891,8 @@ static struct platform_device at91sam9263_isi_device = { 
	.num_resources	= ARRAY_SIZE(isi_resources),

};



void __init at91_add_device_isi(void)

void __init at91_add_device_isi(struct isi_platform_data *data,

		bool use_pck_as_mck)

{

	at91_set_A_periph(AT91_PIN_PE0, 0);	/* ISI_D0 */

	at91_set_A_periph(AT91_PIN_PE1, 0);	/* ISI_D1 */
@@ -904,14 +905,20 @@ void __init at91_add_device_isi(void) 
	at91_set_A_periph(AT91_PIN_PE8, 0);	/* ISI_PCK */

	at91_set_A_periph(AT91_PIN_PE9, 0);	/* ISI_HSYNC */

	at91_set_A_periph(AT91_PIN_PE10, 0);	/* ISI_VSYNC */

	at91_set_B_periph(AT91_PIN_PE11, 0);	/* ISI_MCK (PCK3) */

	at91_set_B_periph(AT91_PIN_PE12, 0);	/* ISI_PD8 */

	at91_set_B_periph(AT91_PIN_PE13, 0);	/* ISI_PD9 */

	at91_set_B_periph(AT91_PIN_PE14, 0);	/* ISI_PD10 */

	at91_set_B_periph(AT91_PIN_PE15, 0);	/* ISI_PD11 */



	if (use_pck_as_mck) {

		at91_set_B_periph(AT91_PIN_PE11, 0);	/* ISI_MCK (PCK3) */



		/* TODO: register the PCK for ISI_MCK and set its parent */

	}

}

#else

void __init at91_add_device_isi(void) {}

void __init at91_add_device_isi(struct isi_platform_data *data,

		bool use_pck_as_mck) {}

#endif

arch/arm/mach-at91/include/mach/board.h

+3 −1
Original line number Diff line number Diff line
@@ -181,7 +181,9 @@ extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data); 
extern void __init at91_add_device_ac97(struct ac97c_platform_data *data);



 /* ISI */

extern void __init at91_add_device_isi(void);

struct isi_platform_data;

extern void __init at91_add_device_isi(struct isi_platform_data *data,

		bool use_pck_as_mck);



 /* Touchscreen Controller */

struct at91_tsadcc_data {