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

Commit 89b5c1ab authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

serial: sh-sci: Remove platform data mapbase and irqs fields 



The fields are not used anymore by board files, remove them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 878fbb91

drivers/tty/serial/sh-sci.c

+34 −26
Original line number Diff line number Diff line
@@ -58,6 +58,23 @@ 


#include "sh-sci.h"



/* Offsets into the sci_port->irqs array */

enum {

	SCIx_ERI_IRQ,

	SCIx_RXI_IRQ,

	SCIx_TXI_IRQ,

	SCIx_BRI_IRQ,

	SCIx_NR_IRQS,



	SCIx_MUX_IRQ = SCIx_NR_IRQS,	/* special case */

};



#define SCIx_IRQ_IS_MUXED(port)			\

	((port)->irqs[SCIx_ERI_IRQ] ==	\

	 (port)->irqs[SCIx_RXI_IRQ]) ||	\

	((port)->irqs[SCIx_ERI_IRQ] &&	\

	 ((port)->irqs[SCIx_RXI_IRQ] < 0))



struct sci_port {

	struct uart_port	port;
@@ -2094,8 +2111,6 @@ static int sci_init_single(struct platform_device *dev, 
	port->iotype	= UPIO_MEM;

	port->line	= index;



	if (dev->num_resources) {

		/* Device has resources, use them. */

	res = platform_get_resource(dev, IORESOURCE_MEM, 0);

	if (res == NULL)

		return -ENOMEM;
@@ -2105,11 +2120,10 @@ static int sci_init_single(struct platform_device *dev, 
	for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)

		sci_port->irqs[i] = platform_get_irq(dev, i);



		/* The SCI generates several interrupts. They can be muxed

		 * together or connected to different interrupt lines. In the

		 * muxed case only one interrupt resource is specified. In the

		 * non-muxed case three or four interrupt resources are

		 * specified, as the BRI interrupt is optional.

	/* The SCI generates several interrupts. They can be muxed together or

	 * connected to different interrupt lines. In the muxed case only one

	 * interrupt resource is specified. In the non-muxed case three or four

	 * interrupt resources are specified, as the BRI interrupt is optional.

	 */

	if (sci_port->irqs[0] < 0)

		return -ENXIO;
@@ -2119,12 +2133,6 @@ static int sci_init_single(struct platform_device *dev, 
		sci_port->irqs[2] = sci_port->irqs[0];

		sci_port->irqs[3] = sci_port->irqs[0];

	}

	} else {

		/* No resources, use old-style platform data. */

		port->mapbase = p->mapbase;

		for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)

			sci_port->irqs[i] = p->irqs[i] ? p->irqs[i] : -ENXIO;

	}



	if (p->regtype == SCIx_PROBE_REGTYPE) {

		ret = sci_probe_regmap(p);

include/linux/serial_sci.h

+0 −26
Original line number Diff line number Diff line
@@ -50,17 +50,6 @@ 
/* HSSRR HSCIF */

#define HSCIF_SRE	0x8000



/* Offsets into the sci_port->irqs array */

enum {

	SCIx_ERI_IRQ,

	SCIx_RXI_IRQ,

	SCIx_TXI_IRQ,

	SCIx_BRI_IRQ,

	SCIx_NR_IRQS,



	SCIx_MUX_IRQ = SCIx_NR_IRQS,	/* special case */

};



enum {

	SCIx_PROBE_REGTYPE,
@@ -79,19 +68,6 @@ enum { 
	SCIx_NR_REGTYPES,

};



#define SCIx_IRQ_MUXED(irq)		\

{					\

	[SCIx_ERI_IRQ]	= (irq),	\

	[SCIx_RXI_IRQ]	= (irq),	\

	[SCIx_TXI_IRQ]	= (irq),	\

	[SCIx_BRI_IRQ]	= (irq),	\

}



#define SCIx_IRQ_IS_MUXED(port)			\

	((port)->irqs[SCIx_ERI_IRQ] ==	\

	 (port)->irqs[SCIx_RXI_IRQ]) ||	\

	((port)->irqs[SCIx_ERI_IRQ] &&	\

	 ((port)->irqs[SCIx_RXI_IRQ] < 0))

/*

 * SCI register subset common for all port types.

 * Not all registers will exist on all parts.
@@ -120,8 +96,6 @@ struct plat_sci_port_ops { 
 * Platform device specific platform_data struct

 */

struct plat_sci_port {

	unsigned long	mapbase;		/* resource base */

	unsigned int	irqs[SCIx_NR_IRQS];	/* ERI, RXI, TXI, BRI */

	unsigned int	type;			/* SCI / SCIF / IRDA / HSCIF */

	upf_t		flags;			/* UPF_* flags */

	unsigned long	capabilities;		/* Port features/capabilities */