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

Commit 6f475c01 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 2897/2: PXA2xx IRDA support 



Patch from Nicolas Pitre

This is the PXA2xx common IRDA driver, plus platform support
for Lubbock and Mainstone.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Acked-by: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a999cb04

arch/arm/mach-pxa/generic.c

+18 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/arch/udc.h>

#include <asm/arch/pxafb.h>

#include <asm/arch/mmc.h>

#include <asm/arch/irda.h>

#include <asm/arch/i2c.h>



#include "generic.h"
@@ -301,6 +302,22 @@ static struct platform_device i2s_device = { 
	.num_resources	= ARRAY_SIZE(i2s_resources),

};



static u64 pxaficp_dmamask = ~(u32)0;



static struct platform_device pxaficp_device = {

	.name		= "pxa2xx-ir",

	.id		= -1,

	.dev		= {

		.dma_mask = &pxaficp_dmamask,

		.coherent_dma_mask = 0xffffffff,

	},

};



void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)

{

	pxaficp_device.dev.platform_data = info;

}



static struct platform_device *devices[] __initdata = {

	&pxamci_device,

	&udc_device,
@@ -308,6 +325,7 @@ static struct platform_device *devices[] __initdata = { 
	&ffuart_device,

	&btuart_device,

	&stuart_device,

	&pxaficp_device,

	&i2c_device,

	&i2s_device,

};

arch/arm/mach-pxa/lubbock.c

+20 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/arch/pxa-regs.h>

#include <asm/arch/lubbock.h>

#include <asm/arch/udc.h>

#include <asm/arch/irda.h>

#include <asm/arch/pxafb.h>

#include <asm/arch/mmc.h>
@@ -237,11 +238,30 @@ static struct pxamci_platform_data lubbock_mci_platform_data = { 
	.init 		= lubbock_mci_init,

};



static void lubbock_irda_transceiver_mode(struct device *dev, int mode)

{

	unsigned long flags;



	local_irq_save(flags);

	if (mode & IR_SIRMODE) {

		LUB_MISC_WR &= ~(1 << 4);

	} else if (mode & IR_FIRMODE) {

		LUB_MISC_WR |= 1 << 4;

	}

	local_irq_restore(flags);

}



static struct pxaficp_platform_data lubbock_ficp_platform_data = {

	.transceiver_cap  = IR_SIRMODE | IR_FIRMODE,

	.transceiver_mode = lubbock_irda_transceiver_mode,

};



static void __init lubbock_init(void)

{

	pxa_set_udc_info(&udc_info);

	set_pxa_fb_info(&sharp_lm8v31);

	pxa_set_mci_info(&lubbock_mci_platform_data);

	pxa_set_ficp_info(&lubbock_ficp_platform_data);

	(void) platform_add_devices(devices, ARRAY_SIZE(devices));

}

arch/arm/mach-pxa/mainstone.c

+25 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <asm/arch/audio.h>

#include <asm/arch/pxafb.h>

#include <asm/arch/mmc.h>

#include <asm/arch/irda.h>



#include "generic.h"
@@ -294,6 +295,29 @@ static struct pxamci_platform_data mainstone_mci_platform_data = { 
	.exit		= mainstone_mci_exit,

};



static void mainstone_irda_transceiver_mode(struct device *dev, int mode)

{

	unsigned long flags;



	local_irq_save(flags);

	if (mode & IR_SIRMODE) {

		MST_MSCWR1 &= ~MST_MSCWR1_IRDA_FIR;

	} else if (mode & IR_FIRMODE) {

		MST_MSCWR1 |= MST_MSCWR1_IRDA_FIR;

	}

	if (mode & IR_OFF) {

		MST_MSCWR1 = (MST_MSCWR1 & ~MST_MSCWR1_IRDA_MASK) | MST_MSCWR1_IRDA_OFF;

	} else {

		MST_MSCWR1 = (MST_MSCWR1 & ~MST_MSCWR1_IRDA_MASK) | MST_MSCWR1_IRDA_FULL;

	}

	local_irq_restore(flags);

}



static struct pxaficp_platform_data mainstone_ficp_platform_data = {

	.transceiver_cap  = IR_SIRMODE | IR_FIRMODE | IR_OFF,

	.transceiver_mode = mainstone_irda_transceiver_mode,

};



static void __init mainstone_init(void)

{

	/*
@@ -313,6 +337,7 @@ static void __init mainstone_init(void) 
		set_pxa_fb_info(&toshiba_ltm035a776c);



	pxa_set_mci_info(&mainstone_mci_platform_data);

	pxa_set_ficp_info(&mainstone_ficp_platform_data);

}

drivers/net/irda/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -400,5 +400,15 @@ config VIA_FIR 
	  To compile it as a module, choose M here: the module will be called

	  via-ircc.



config PXA_FICP

	tristate "Intel PXA2xx Internal FICP"

	depends on ARCH_PXA && IRDA

	help

	  Say Y or M here if you want to build support for the PXA2xx

	  built-in IRDA interface which can support both SIR and FIR.

	  This driver relies on platform specific helper routines so

	  available capabilities may vary from one PXA2xx target to

	  another.



endmenu

drivers/net/irda/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_SMC_IRCC_FIR) += smsc-ircc2.o 
obj-$(CONFIG_ALI_FIR)		+= ali-ircc.o

obj-$(CONFIG_VLSI_FIR)		+= vlsi_ir.o

obj-$(CONFIG_VIA_FIR)		+= via-ircc.o

obj-$(CONFIG_PXA_FICP)	        += pxaficp_ir.o

# Old dongle drivers for old SIR drivers

obj-$(CONFIG_ESI_DONGLE_OLD)		+= esi.o

obj-$(CONFIG_TEKRAM_DONGLE_OLD)	+= tekram.o