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

Commit 9d971625 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: sam9g45: switch from atmel_tsadcc to at91_adc 



atmel_tsadcc is not allowing to use the remaining ADC channels while at91_adc
does. Completely switch to at91_adc and remove the tsadcc platform_data for
at91sam9g45 and at91sam9g45 based boards.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 3fb07e86

arch/arm/configs/at91sam9g45_defconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y

# CONFIG_SERIO is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL=y
@@ -146,6 +145,8 @@ CONFIG_DMADEVICES=y 
CONFIG_AT_HDMAC=y

CONFIG_AT_HDMAC=y

CONFIG_DMATEST=m

CONFIG_DMATEST=m

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_AT91_ADC=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_VFAT_FS=y

arch/arm/mach-at91/at91sam9g45_devices.c

+1 −52
Original line number Original line Diff line number Diff line
@@ -1133,58 +1133,7 @@ static void __init at91_add_device_rtc(void) {} 








/* --------------------------------------------------------------------

/* --------------------------------------------------------------------

 *  Touchscreen

 *  ADC and touchscreen

 * -------------------------------------------------------------------- */



#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)

static u64 tsadcc_dmamask = DMA_BIT_MASK(32);

static struct at91_tsadcc_data tsadcc_data;



static struct resource tsadcc_resources[] = {

	[0] = {

		.start	= AT91SAM9G45_BASE_TSC,

		.end	= AT91SAM9G45_BASE_TSC + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= NR_IRQS_LEGACY + AT91SAM9G45_ID_TSC,

		.end	= NR_IRQS_LEGACY + AT91SAM9G45_ID_TSC,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device at91sam9g45_tsadcc_device = {

	.name		= "atmel_tsadcc",

	.id		= -1,

	.dev		= {

				.dma_mask		= &tsadcc_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &tsadcc_data,

	},

	.resource	= tsadcc_resources,

	.num_resources	= ARRAY_SIZE(tsadcc_resources),

};



void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data)

{

	if (!data)

		return;



	at91_set_gpio_input(AT91_PIN_PD20, 0);	/* AD0_XR */

	at91_set_gpio_input(AT91_PIN_PD21, 0);	/* AD1_XL */

	at91_set_gpio_input(AT91_PIN_PD22, 0);	/* AD2_YT */

	at91_set_gpio_input(AT91_PIN_PD23, 0);	/* AD3_TB */



	tsadcc_data = *data;

	platform_device_register(&at91sam9g45_tsadcc_device);

}

#else

void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}

#endif





/* --------------------------------------------------------------------

 *  ADC

 * -------------------------------------------------------------------- */

 * -------------------------------------------------------------------- */





#if IS_ENABLED(CONFIG_AT91_ADC)

#if IS_ENABLED(CONFIG_AT91_ADC)

arch/arm/mach-at91/board-sam9m10g45ek.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -301,16 +301,7 @@ static struct atmel_lcdfb_pdata __initdata ek_lcdc_data; 








/*

/*

 * Touchscreen

 * ADCs and touchscreen

 */

static struct at91_tsadcc_data ek_tsadcc_data = {

	.adc_clock		= 300000,

	.pendet_debounce	= 0x0d,

	.ts_sample_hold_time	= 0x0a,

};



/*

 * ADCs

 */

 */

static struct at91_adc_data ek_adc_data = {

static struct at91_adc_data ek_adc_data = {

	.channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),

	.channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),
@@ -487,9 +478,7 @@ static void __init ek_board_init(void) 
	at91_add_device_isi(&isi_data, true);

	at91_add_device_isi(&isi_data, true);

	/* LCD Controller */

	/* LCD Controller */

	at91_add_device_lcdc(&ek_lcdc_data);

	at91_add_device_lcdc(&ek_lcdc_data);

	/* Touch Screen */

	/* ADC and touchscreen */

	at91_add_device_tsadcc(&ek_tsadcc_data);

	/* ADC */

	at91_add_device_adc(&ek_adc_data);

	at91_add_device_adc(&ek_adc_data);

	/* Push Buttons */

	/* Push Buttons */

	ek_add_device_buttons();

	ek_add_device_buttons();