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

Commit 321de3c8 authored by Frank Pavlic's avatar Frank Pavlic Committed by Jeff Garzik
Browse files

[PATCH] s390: claw driver wiring 



[patch 1/10] s390: claw driver wiring.

From: Andy Richter <richtera@us.ibm.com>

claw network driver changes:
 - Add an entry to the drivers/s390/net Makefile to build the claw driver.
 - Add claw channel type to cu3088.

Signed-off-by: default avatarFrank Pavlic <pavlic@de.ibm.com>
parent 88d7bd8c

drivers/s390/net/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o 
obj-$(CONFIG_SMSGIUCV) += smsgiucv.o

obj-$(CONFIG_SMSGIUCV) += smsgiucv.o

obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o

obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o

obj-$(CONFIG_LCS) += lcs.o cu3088.o

obj-$(CONFIG_LCS) += lcs.o cu3088.o

obj-$(CONFIG_CLAW) += claw.o cu3088.o

qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.o

qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.o

qeth-$(CONFIG_PROC_FS) += qeth_proc.o

qeth-$(CONFIG_PROC_FS) += qeth_proc.o

obj-$(CONFIG_QETH) += qeth.o
 
obj-$(CONFIG_QETH) += qeth.o

drivers/s390/net/cu3088.c

+3 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * $Id: cu3088.c,v 1.34 2004/06/15 13:16:27 pavlic Exp $

 * $Id: cu3088.c,v 1.35 2005/03/30 19:28:52 richtera Exp $

 *

 *

 * CTC / LCS ccw_device driver

 * CTC / LCS ccw_device driver

 *

 *
@@ -39,6 +39,7 @@ const char *cu3088_type[] = { 
	"FICON channel",

	"FICON channel",

	"P390 LCS card",

	"P390 LCS card",

	"OSA LCS card",

	"OSA LCS card",

	"CLAW channel device",

	"unknown channel type",

	"unknown channel type",

	"unsupported channel type",

	"unsupported channel type",

};

};
@@ -51,6 +52,7 @@ static struct ccw_device_id cu3088_ids[] = { 
	{ CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },

	{ CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },

	{ CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },

	{ CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },

	{ CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },

	{ CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },

	{ CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },

	{ /* end of list */ }

	{ /* end of list */ }

};

};

drivers/s390/net/cu3088.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,9 @@ enum channel_types { 
	/* Device is a OSA2 card */

	/* Device is a OSA2 card */

	channel_type_osa2,

	channel_type_osa2,





	/* Device is a CLAW channel device */

	channel_type_claw,



	/* Device is a channel, but we don't know

	/* Device is a channel, but we don't know

	 * anything about it */

	 * anything about it */

	channel_type_unknown,

	channel_type_unknown,