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

Commit cd671c16 authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

net/irda: convert au1k_ir to platform driver. 



Moderate driver cleanup:
convert to platform driver, get rid of board-specific code.

Driver loads and runs on a DB1100 board.  But since I have no other
IrDA hardware to exchange data with I can't say whether it really sends
and receives.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2877/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4d2216af

arch/mips/include/asm/mach-au1x00/au1000.h

+14 −38
Original line number Diff line number Diff line
@@ -1265,44 +1265,20 @@ enum soc_au1200_ints { 
#define SSI_ENABLE_CD		(1 << 1)

#define SSI_ENABLE_E		(1 << 0)



/* IrDA Controller */

#define IRDA_BASE		0xB0300000

#define IR_RING_PTR_STATUS	(IRDA_BASE + 0x00)

#define IR_RING_BASE_ADDR_H	(IRDA_BASE + 0x04)

#define IR_RING_BASE_ADDR_L	(IRDA_BASE + 0x08)

#define IR_RING_SIZE		(IRDA_BASE + 0x0C)

#define IR_RING_PROMPT		(IRDA_BASE + 0x10)

#define IR_RING_ADDR_CMPR	(IRDA_BASE + 0x14)

#define IR_INT_CLEAR		(IRDA_BASE + 0x18)

#define IR_CONFIG_1		(IRDA_BASE + 0x20)

#  define IR_RX_INVERT_LED	(1 << 0)

#  define IR_TX_INVERT_LED	(1 << 1)

#  define IR_ST 		(1 << 2)

#  define IR_SF 		(1 << 3)

#  define IR_SIR		(1 << 4)

#  define IR_MIR		(1 << 5)

#  define IR_FIR		(1 << 6)

#  define IR_16CRC		(1 << 7)

#  define IR_TD 		(1 << 8)

#  define IR_RX_ALL		(1 << 9)

#  define IR_DMA_ENABLE 	(1 << 10)

#  define IR_RX_ENABLE		(1 << 11)

#  define IR_TX_ENABLE		(1 << 12)

#  define IR_LOOPBACK		(1 << 14)

#  define IR_SIR_MODE		(IR_SIR | IR_DMA_ENABLE | \

				 IR_RX_ALL | IR_RX_ENABLE | IR_SF | IR_16CRC)

#define IR_SIR_FLAGS		(IRDA_BASE + 0x24)

#define IR_ENABLE		(IRDA_BASE + 0x28)

#  define IR_RX_STATUS		(1 << 9)

#  define IR_TX_STATUS		(1 << 10)

#define IR_READ_PHY_CONFIG	(IRDA_BASE + 0x2C)

#define IR_WRITE_PHY_CONFIG	(IRDA_BASE + 0x30)

#define IR_MAX_PKT_LEN		(IRDA_BASE + 0x34)

#define IR_RX_BYTE_CNT		(IRDA_BASE + 0x38)

#define IR_CONFIG_2		(IRDA_BASE + 0x3C)

#  define IR_MODE_INV		(1 << 0)

#  define IR_ONE_PIN		(1 << 1)

#define IR_INTERFACE_CONFIG	(IRDA_BASE + 0x40)



/*

 * The IrDA peripheral has an IRFIRSEL pin, but on the DB/PB boards it's not

 * used to select FIR/SIR mode on the transceiver but as a GPIO.  Instead a

 * CPLD has to be told about the mode.

 */

#define AU1000_IRDA_PHY_MODE_OFF	0

#define AU1000_IRDA_PHY_MODE_SIR	1

#define AU1000_IRDA_PHY_MODE_FIR	2



struct au1k_irda_platform_data {

	void(*set_phy_mode)(int mode);

};





/* GPIO */

#define SYS_PINFUNC		0xB190002C

drivers/net/irda/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -313,8 +313,12 @@ config TOSHIBA_FIR 
	  donauboe.



config AU1000_FIR

	tristate "Alchemy Au1000 SIR/FIR"

	tristate "Alchemy IrDA SIR/FIR"

	depends on IRDA && MIPS_ALCHEMY

	help

	  Say Y/M here to build suppor the the IrDA peripheral on the

	  Alchemy Au1000 and Au1100 SoCs.

	  Say M to build a module; it will be called au1k_ir.ko



config SMC_IRCC_FIR

	tristate "SMSC IrCC (EXPERIMENTAL)"

drivers/net/irda/au1000_ircc.h

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
/*

 *

 * BRIEF MODULE DESCRIPTION

 *	Au1000 IrDA driver.

 *

 * Copyright 2001 MontaVista Software Inc.

 * Author: MontaVista Software, Inc.

 *         	ppopov@mvista.com or source@mvista.com

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED

 *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF

 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

 *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,

 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF

 *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

 *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT

 *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

 *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *  You should have received a copy of the  GNU General Public License along

 *  with this program; if not, write  to the Free Software Foundation, Inc.,

 *  675 Mass Ave, Cambridge, MA 02139, USA.

 */



#ifndef AU1000_IRCC_H

#define AU1000_IRCC_H



#include <linux/time.h>



#include <linux/spinlock.h>

#include <linux/pm.h>

#include <asm/io.h>



#define NUM_IR_IFF          1

#define NUM_IR_DESC        64

#define RING_SIZE_4       0x0

#define RING_SIZE_16      0x3

#define RING_SIZE_64      0xF

#define MAX_NUM_IR_DESC    64

#define MAX_BUF_SIZE     2048



#define BPS_115200          0

#define BPS_57600           1

#define BPS_38400           2

#define BPS_19200           5

#define BPS_9600           11

#define BPS_2400           47



/* Ring descriptor flags */

#define AU_OWN           (1<<7) /* tx,rx */



#define IR_DIS_CRC       (1<<6) /* tx */

#define IR_BAD_CRC       (1<<5) /* tx */

#define IR_NEED_PULSE    (1<<4) /* tx */

#define IR_FORCE_UNDER   (1<<3) /* tx */

#define IR_DISABLE_TX    (1<<2) /* tx */

#define IR_HW_UNDER      (1<<0) /* tx */

#define IR_TX_ERROR      (IR_DIS_CRC|IR_BAD_CRC|IR_HW_UNDER)



#define IR_PHY_ERROR     (1<<6) /* rx */

#define IR_CRC_ERROR     (1<<5) /* rx */

#define IR_MAX_LEN       (1<<4) /* rx */

#define IR_FIFO_OVER     (1<<3) /* rx */

#define IR_SIR_ERROR     (1<<2) /* rx */

#define IR_RX_ERROR      (IR_PHY_ERROR|IR_CRC_ERROR| \

		IR_MAX_LEN|IR_FIFO_OVER|IR_SIR_ERROR)



typedef struct db_dest {

	struct db_dest *pnext;

	volatile u32 *vaddr;

	dma_addr_t dma_addr;

} db_dest_t;





typedef struct ring_desc {

	u8 count_0;               /* 7:0  */

	u8 count_1;               /* 12:8 */

	u8 reserved;

	u8 flags;

	u8 addr_0;                /* 7:0   */

	u8 addr_1;                /* 15:8  */

	u8 addr_2;                /* 23:16 */

	u8 addr_3;                /* 31:24 */

} ring_dest_t;





/* Private data for each instance */

struct au1k_private {



	db_dest_t *pDBfree;

	db_dest_t db[2*NUM_IR_DESC];

	volatile ring_dest_t *rx_ring[NUM_IR_DESC];

	volatile ring_dest_t *tx_ring[NUM_IR_DESC];

	db_dest_t *rx_db_inuse[NUM_IR_DESC];

	db_dest_t *tx_db_inuse[NUM_IR_DESC];

	u32 rx_head;

	u32 tx_head;

	u32 tx_tail;

	u32 tx_full;



	iobuff_t rx_buff;



	struct net_device *netdev;

	

	struct timeval stamp;

	struct timeval now;

	struct qos_info		qos;

	struct irlap_cb		*irlap;

	

	u8 open;

	u32 speed;

	u32 newspeed;

	

	u32 intr_work_done; /* number of Rx and Tx pkts processed in the isr */

	struct timer_list timer;



	spinlock_t lock;           /* For serializing operations */

};

#endif /* AU1000_IRCC_H */