sh: remove support for sh73180 and solution engine 73180 (870e8a24) · Commits · e / devices / android_kernel_fairphone_FP3

arch/sh/Kconfig

+1 −9

Original line number	Diff line number	Diff line
		@@ -274,14 +274,6 @@ config SH_7343_SOLUTION_ENGINE
		Select 7343 SolutionEngine if configuring for a Hitachi
		SH7343 (SH-Mobile 3AS) evaluation board.

		config SH_73180_SOLUTION_ENGINE
		bool "SolutionEngine73180"
		select SOLUTION_ENGINE
		depends on CPU_SUBTYPE_SH73180
		help
		Select 73180 SolutionEngine if configuring for a Hitachi
		SH73180(SH-Mobile 3) evaluation board.

		config SH_7751_SYSTEMH
		bool "SystemH7751R"
		depends on CPU_SUBTYPE_SH7751R
		@@ -445,7 +437,7 @@ config SH_TIMER_IRQ

		config SH_PCLK_FREQ
		int "Peripheral clock frequency (in Hz)"
		default "27000000" if CPU_SUBTYPE_SH73180 \|\| CPU_SUBTYPE_SH7343
		default "27000000" if CPU_SUBTYPE_SH7343
		default "31250000" if CPU_SUBTYPE_SH7619
		default "32000000" if CPU_SUBTYPE_SH7722
		default "33333333" if CPU_SUBTYPE_SH7300 \|\| CPU_SUBTYPE_SH7770 \|\| \

arch/sh/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,6 @@ machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) += se/7751
		machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE) += se/7780
		machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE) += se/7300
		machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE) += se/7343
		machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE) += se/73180
		machdir-$(CONFIG_SH_HP6XX) += hp6xx
		machdir-$(CONFIG_SH_DREAMCAST) += dreamcast
		machdir-$(CONFIG_SH_MPC1211) += mpc1211

arch/sh/boards/se/73180/Makefile

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		#
		# Makefile for the 73180 SolutionEngine specific parts of the kernel
		#

		obj-y := setup.o io.o irq.o

arch/sh/boards/se/73180/io.c

deleted100644 → 0

+0 −268

Original line number	Diff line number	Diff line
		/*
		* arch/sh/boards/se/73180/io.c
		*
		* Copyright (C) 2003 YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
		* Based on arch/sh/boards/se/7300/io.c
		*
		* I/O routine for SH-Mobile3 73180 SolutionEngine.
		*
		*/

		#include <linux/kernel.h>
		#include <asm/mach/se73180.h>
		#include <asm/io.h>

		#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)

		struct iop {
		unsigned long start, end;
		unsigned long base;
		struct iop (check) (struct iop * p, unsigned long port);
		unsigned char (inb) (struct iop p, unsigned long port);
		unsigned short (inw) (struct iop p, unsigned long port);
		void (outb) (struct iop p, unsigned char value, unsigned long port);
		void (outw) (struct iop p, unsigned short value, unsigned long port);
		};

		struct iop *
		simple_check(struct iop *p, unsigned long port)
		{
		if ((p->start <= port) && (port <= p->end))
		return p;
		else
		badio(check, port);
		}

		struct iop *
		ide_check(struct iop *p, unsigned long port)
		{
		if (((0x1f0 <= port) && (port <= 0x1f7)) \|\| (port == 0x3f7))
		return p;
		return NULL;
		}

		unsigned char
		simple_inb(struct iop *p, unsigned long port)
		{
		return (unsigned char ) (p->base + port);
		}

		unsigned short
		simple_inw(struct iop *p, unsigned long port)
		{
		return (unsigned short ) (p->base + port);
		}

		void
		simple_outb(struct iop *p, unsigned char value, unsigned long port)
		{
		(unsigned char ) (p->base + port) = value;
		}

		void
		simple_outw(struct iop *p, unsigned short value, unsigned long port)
		{
		(unsigned short ) (p->base + port) = value;
		}

		unsigned char
		pcc_inb(struct iop *p, unsigned long port)
		{
		unsigned long addr = p->base + port + 0x40000;
		unsigned long v;

		if (port & 1)
		addr += 0x00400000;
		v = (volatile unsigned char ) addr;
		return v;
		}

		void
		pcc_outb(struct iop *p, unsigned char value, unsigned long port)
		{
		unsigned long addr = p->base + port + 0x40000;

		if (port & 1)
		addr += 0x00400000;
		(volatile unsigned char ) addr = value;
		}

		unsigned char
		bad_inb(struct iop *p, unsigned long port)
		{
		badio(inb, port);
		}

		void
		bad_outb(struct iop *p, unsigned char value, unsigned long port)
		{
		badio(inw, port);
		}

		#ifdef CONFIG_SMC91X
		/* MSTLANEX01 LAN at 0xb400:0000 */
		static struct iop laniop = {
		.start = 0x300,
		.end = 0x30f,
		.base = 0xb4000000,
		.check = simple_check,
		.inb = simple_inb,
		.inw = simple_inw,
		.outb = simple_outb,
		.outw = simple_outw,
		};
		#endif

		/* NE2000 pc card NIC */
		static struct iop neiop = {
		.start = 0x280,
		.end = 0x29f,
		.base = 0xb0600000 + 0x80, /* soft 0x280 -> hard 0x300 */
		.check = simple_check,
		.inb = pcc_inb,
		.inw = simple_inw,
		.outb = pcc_outb,
		.outw = simple_outw,
		};

		#ifdef CONFIG_IDE
		/* CF in CF slot */
		static struct iop cfiop = {
		.base = 0xb0600000,
		.check = ide_check,
		.inb = pcc_inb,
		.inw = simple_inw,
		.outb = pcc_outb,
		.outw = simple_outw,
		};
		#endif

		static __inline__ struct iop *
		port2iop(unsigned long port)
		{
		if (0) ;
		#if defined(CONFIG_SMC91X)
		else if (laniop.check(&laniop, port))
		return &laniop;
		#endif
		#if defined(CONFIG_NE2000)
		else if (neiop.check(&neiop, port))
		return &neiop;
		#endif
		#if defined(CONFIG_IDE)
		else if (cfiop.check(&cfiop, port))
		return &cfiop;
		#endif
		else
		return &neiop; /* fallback */
		}

		static inline void
		delay(void)
		{
		ctrl_inw(0xac000000);
		ctrl_inw(0xac000000);
		}

		unsigned char
		sh73180se_inb(unsigned long port)
		{
		struct iop *p = port2iop(port);
		return (p->inb) (p, port);
		}

		unsigned char
		sh73180se_inb_p(unsigned long port)
		{
		unsigned char v = sh73180se_inb(port);
		delay();
		return v;
		}

		unsigned short
		sh73180se_inw(unsigned long port)
		{
		struct iop *p = port2iop(port);
		return (p->inw) (p, port);
		}

		unsigned int
		sh73180se_inl(unsigned long port)
		{
		badio(inl, port);
		}

		void
		sh73180se_outb(unsigned char value, unsigned long port)
		{
		struct iop *p = port2iop(port);
		(p->outb) (p, value, port);
		}

		void
		sh73180se_outb_p(unsigned char value, unsigned long port)
		{
		sh73180se_outb(value, port);
		delay();
		}

		void
		sh73180se_outw(unsigned short value, unsigned long port)
		{
		struct iop *p = port2iop(port);
		(p->outw) (p, value, port);
		}

		void
		sh73180se_outl(unsigned int value, unsigned long port)
		{
		badio(outl, port);
		}

		void
		sh73180se_insb(unsigned long port, void *addr, unsigned long count)
		{
		unsigned char *a = addr;
		struct iop *p = port2iop(port);
		while (count--)
		*a++ = (p->inb) (p, port);
		}

		void
		sh73180se_insw(unsigned long port, void *addr, unsigned long count)
		{
		unsigned short *a = addr;
		struct iop *p = port2iop(port);
		while (count--)
		*a++ = (p->inw) (p, port);
		}

		void
		sh73180se_insl(unsigned long port, void *addr, unsigned long count)
		{
		badio(insl, port);
		}

		void
		sh73180se_outsb(unsigned long port, const void *addr, unsigned long count)
		{
		unsigned char a = (unsigned char ) addr;
		struct iop *p = port2iop(port);
		while (count--)
		(p->outb) (p, *a++, port);
		}

		void
		sh73180se_outsw(unsigned long port, const void *addr, unsigned long count)
		{
		unsigned short a = (unsigned short ) addr;
		struct iop *p = port2iop(port);
		while (count--)
		(p->outw) (p, *a++, port);
		}

		void
		sh73180se_outsl(unsigned long port, const void *addr, unsigned long count)
		{
		badio(outsw, port);
		}

arch/sh/boards/se/73180/irq.c

deleted100644 → 0

+0 −136

Original line number	Diff line number	Diff line
		/*
		* arch/sh/boards/se/73180/irq.c
		*
		* Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
		* Based on arch/sh/boards/se/7300/irq.c
		*
		* Modified for SH-Mobile SolutionEngine 73180 Support
		* by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
		*
		*/

		#include <linux/init.h>
		#include <linux/irq.h>
		#include <asm/irq.h>
		#include <asm/io.h>
		#include <asm/mach/se73180.h>

		static int
		irq2intreq(int irq)
		{
		if (irq == 10)
		return 5;
		return 7 - (irq - 32);
		}

		static void
		disable_intreq_irq(unsigned int irq)
		{
		ctrl_outb(1 << (7 - irq2intreq(irq)), INTMSK0);
		}

		static void
		enable_intreq_irq(unsigned int irq)
		{
		ctrl_outb(1 << (7 - irq2intreq(irq)), INTMSKCLR0);
		}

		static void
		mask_and_ack_intreq_irq(unsigned int irq)
		{
		disable_intreq_irq(irq);
		}

		static unsigned int
		startup_intreq_irq(unsigned int irq)
		{
		enable_intreq_irq(irq);
		return 0;
		}

		static void
		shutdown_intreq_irq(unsigned int irq)
		{
		disable_intreq_irq(irq);
		}

		static void
		end_intreq_irq(unsigned int irq)
		{
		if (!(irq_desc[irq].status & (IRQ_DISABLED \| IRQ_INPROGRESS)))
		enable_intreq_irq(irq);
		}

		static struct hw_interrupt_type intreq_irq_type = {
		.typename = "intreq",
		.startup = startup_intreq_irq,
		.shutdown = shutdown_intreq_irq,
		.enable = enable_intreq_irq,
		.disable = disable_intreq_irq,
		.ack = mask_and_ack_intreq_irq,
		.end = end_intreq_irq
		};

		void
		make_intreq_irq(unsigned int irq)
		{
		disable_irq_nosync(irq);
		irq_desc[irq].chip = &intreq_irq_type;
		disable_intreq_irq(irq);
		}

		int
		shmse_irq_demux(int irq)
		{
		if (irq == IRQ5_IRQ)
		return 10;
		return irq;
		}

		static struct ipr_data se73180_siof0_ipr_map[] = {
		{ SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
		};
		static struct ipr_data se73180_vpu_ipr_map[] = {
		{ VPU_IRQ, VPU_IPR_ADDR, VPU_IPR_POS, 8 },
		};
		static struct ipr_data se73180_other_ipr_map[] = {
		{ DMTE2_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
		{ DMTE3_IRQ, DMA1_IPR_ADDR, DMA1_IPR_POS, DMA1_PRIORITY },
		{ DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY },
		{ IIC0_ALI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
		{ IIC0_TACKI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
		{ IIC0_WAITI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
		{ IIC0_DTEI_IRQ, IIC0_IPR_ADDR, IIC0_IPR_POS, IIC0_PRIORITY },
		{ SIOF0_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY },
		{ SIU_IRQ, SIU_IPR_ADDR, SIU_IPR_POS, SIU_PRIORITY },

		/* VIO interrupt */
		{ CEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
		{ BEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },
		{ VEU_IRQ, VIO_IPR_ADDR, VIO_IPR_POS, VIO_PRIORITY },

		{ LCDC_IRQ, LCDC_IPR_ADDR, LCDC_IPR_POS, LCDC_PRIORITY },
		};

		/*
		* Initialize IRQ setting
		*/
		void __init
		init_73180se_IRQ(void)
		{
		make_ipr_irq(se73180_siof0_ipr_map, ARRAY_SIZE(se73180_siof0_ipr_map));

		ctrl_outw(0x2000, 0xb03fffec); /* mrshpc irq enable */
		ctrl_outw(0x2000, 0xb07fffec); /* mrshpc irq enable */
		ctrl_outl(3 << ((7 - 5) * 4), INTC_INTPRI0); /* irq5 pri=3 */
		ctrl_outw(2 << ((7 - 5) * 2), INTC_ICR1); /* low-level irq */
		make_intreq_irq(10);

		make_ipr_irq(se73180_vpu_ipr_map, ARRAY_SIZE(se73180_vpu_ipr_map));

		ctrl_outb(0x0f, INTC_IMCR5); /* enable SCIF IRQ */

		make_ipr_irq(se73180_other_ipr_map, ARRAY_SIZE(se73180_other_ipr_map));

		ctrl_outw(0x2000, PA_MRSHPC + 0x0c); /* mrshpc irq enable */
		}