sh: Remove SH5-based Cayman platform (8a8e5462) · Commits · 戴 / test

arch/sh/Kconfig

+2 −3

Original line number	Diff line number	Diff line
		@@ -123,8 +123,8 @@ config ARCH_HAS_ILOG2_U64

		config NO_IOPORT_MAP
		def_bool !PCI
		depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
		!SH_HP6XX && !SH_SOLUTION_ENGINE
		depends on !SH_SH4202_MICRODEV && !SH_SHMIN && !SH_HP6XX && \
		!SH_SOLUTION_ENGINE

		config IO_TRAPPED
		bool
		@@ -726,7 +726,6 @@ config ZERO_PAGE_OFFSET
		config BOOT_LINK_OFFSET
		hex
		default "0x00210000" if SH_SHMIN
		default "0x00400000" if SH_CAYMAN
		default "0x00810000" if SH_7780_SOLUTION_ENGINE
		default "0x009e0000" if SH_TITAN
		default "0x01800000" if SH_SDK7780

arch/sh/Makefile

+0 −5

Original line number	Diff line number	Diff line
		@@ -15,11 +15,7 @@ ifneq ($(SUBARCH),$(ARCH))
		endif
		endif

		ifeq ($(ARCH),sh)
		KBUILD_DEFCONFIG := shx3_defconfig
		else
		KBUILD_DEFCONFIG := cayman_defconfig
		endif

		isa-y := any
		isa-$(CONFIG_SH_DSP) := sh
		@@ -143,7 +139,6 @@ machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp
		machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev
		machdir-$(CONFIG_SH_LANDISK) += mach-landisk
		machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
		machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
		machdir-$(CONFIG_SH_RSK) += mach-rsk

		ifneq ($(machdir-y),)

arch/sh/boards/Kconfig

+0 −6

Original line number	Diff line number	Diff line
		@@ -340,12 +340,6 @@ config SH_MAGIC_PANEL_R2
		help
		Select Magic Panel R2 if configuring for Magic Panel R2.

		config SH_CAYMAN
		bool "Hitachi Cayman"
		depends on CPU_SUBTYPE_SH5_101 \|\| CPU_SUBTYPE_SH5_103
		select HAVE_PCI
		select ARCH_MIGHT_HAVE_PC_SERIO

		config SH_POLARIS
		bool "SMSC Polaris"
		select CPU_HAS_IPR_IRQ

arch/sh/boards/mach-cayman/Makefile

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		#
		# Makefile for the Hitachi Cayman specific parts of the kernel
		#
		obj-y := setup.o irq.o panic.o

arch/sh/boards/mach-cayman/irq.c

deleted100644 → 0

+0 −148

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* arch/sh/mach-cayman/irq.c - SH-5 Cayman Interrupt Support
		*
		* This file handles the board specific parts of the Cayman interrupt system
		*
		* Copyright (C) 2002 Stuart Menefy
		*/
		#include <linux/io.h>
		#include <linux/irq.h>
		#include <linux/interrupt.h>
		#include <linux/signal.h>
		#include <cpu/irq.h>
		#include <asm/page.h>

		/* Setup for the SMSC FDC37C935 / LAN91C100FD */
		#define SMSC_IRQ IRQ_IRL1

		/* Setup for PCI Bus 2, which transmits interrupts via the EPLD */
		#define PCI2_IRQ IRQ_IRL3

		unsigned long epld_virt;

		#define EPLD_BASE 0x04002000
		#define EPLD_STATUS_BASE (epld_virt + 0x10)
		#define EPLD_MASK_BASE (epld_virt + 0x20)

		/* Note the SMSC SuperIO chip and SMSC LAN chip interrupts are all muxed onto
		the same SH-5 interrupt */

		static irqreturn_t cayman_interrupt_smsc(int irq, void *dev_id)
		{
		printk(KERN_INFO "CAYMAN: spurious SMSC interrupt\n");
		return IRQ_NONE;
		}

		static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id)
		{
		printk(KERN_INFO "CAYMAN: spurious PCI interrupt, IRQ %d\n", irq);
		return IRQ_NONE;
		}

		static void enable_cayman_irq(struct irq_data *data)
		{
		unsigned int irq = data->irq;
		unsigned long flags;
		unsigned long mask;
		unsigned int reg;
		unsigned char bit;

		irq -= START_EXT_IRQS;
		reg = EPLD_MASK_BASE + ((irq / 8) << 2);
		bit = 1<<(irq % 8);
		local_irq_save(flags);
		mask = __raw_readl(reg);
		mask \|= bit;
		__raw_writel(mask, reg);
		local_irq_restore(flags);
		}

		static void disable_cayman_irq(struct irq_data *data)
		{
		unsigned int irq = data->irq;
		unsigned long flags;
		unsigned long mask;
		unsigned int reg;
		unsigned char bit;

		irq -= START_EXT_IRQS;
		reg = EPLD_MASK_BASE + ((irq / 8) << 2);
		bit = 1<<(irq % 8);
		local_irq_save(flags);
		mask = __raw_readl(reg);
		mask &= ~bit;
		__raw_writel(mask, reg);
		local_irq_restore(flags);
		}

		struct irq_chip cayman_irq_type = {
		.name = "Cayman-IRQ",
		.irq_unmask = enable_cayman_irq,
		.irq_mask = disable_cayman_irq,
		};

		int cayman_irq_demux(int evt)
		{
		int irq = intc_evt_to_irq[evt];

		if (irq == SMSC_IRQ) {
		unsigned long status;
		int i;

		status = __raw_readl(EPLD_STATUS_BASE) &
		__raw_readl(EPLD_MASK_BASE) & 0xff;
		if (status == 0) {
		irq = -1;
		} else {
		for (i=0; i<8; i++) {
		if (status & (1<<i))
		break;
		}
		irq = START_EXT_IRQS + i;
		}
		}

		if (irq == PCI2_IRQ) {
		unsigned long status;
		int i;

		status = __raw_readl(EPLD_STATUS_BASE + 3 * sizeof(u32)) &
		__raw_readl(EPLD_MASK_BASE + 3 * sizeof(u32)) & 0xff;
		if (status == 0) {
		irq = -1;
		} else {
		for (i=0; i<8; i++) {
		if (status & (1<<i))
		break;
		}
		irq = START_EXT_IRQS + (3 * 8) + i;
		}
		}

		return irq;
		}

		void init_cayman_irq(void)
		{
		int i;

		epld_virt = (unsigned long)ioremap(EPLD_BASE, 1024);
		if (!epld_virt) {
		printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");
		return;
		}

		for (i = 0; i < NR_EXT_IRQS; i++) {
		irq_set_chip_and_handler(START_EXT_IRQS + i,
		&cayman_irq_type, handle_level_irq);
		}

		/* Setup the SMSC interrupt */
		if (request_irq(SMSC_IRQ, cayman_interrupt_smsc, 0, "Cayman SMSC Mux",
		NULL))
		pr_err("Failed to register Cayman SMSC Mux interrupt\n");
		if (request_irq(PCI2_IRQ, cayman_interrupt_pci2, 0, "Cayman PCI2 Mux",
		NULL))
		pr_err("Failed to register Cayman PCI2 Mux interrupt\n");
		}

Admin message