sh: remove the broken SH_MPC1211 support (f5f826c6) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sh/Kconfig

+2 −11

Original line number	Diff line number	Diff line
		@@ -448,14 +448,6 @@ config SH_DREAMCAST
		Select Dreamcast if configuring for a SEGA Dreamcast.
		More information at <http://www.linux-sh.org>

		config SH_MPC1211
		bool "Interface MPC1211"
		depends on CPU_SUBTYPE_SH7751 && BROKEN
		help
		CTP/PCI-SH02 is a CPU module computer that is produced
		by Interface Corporation.
		More information at <http://www.interface.co.jp>

		config SH_SH03
		bool "Interface CTP/PCI-SH03"
		depends on CPU_SUBTYPE_SH7751
		@@ -657,8 +649,7 @@ source "arch/sh/drivers/Kconfig"
		endmenu

		config ISA_DMA_API
		def_bool y
		depends on SH_MPC1211
		bool

		menu "Kernel features"

		@@ -763,7 +754,7 @@ menu "Boot options"

		config ZERO_PAGE_OFFSET
		hex "Zero page offset"
		default "0x00004000" if SH_MPC1211 \|\| SH_SH03
		default "0x00004000" if SH_SH03
		default "0x00010000" if PAGE_SIZE_64KB
		default "0x00002000" if PAGE_SIZE_8KB
		default "0x00001000"

arch/sh/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE) += se/7343
		machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE) += se/7721
		machdir-$(CONFIG_SH_HP6XX) += hp6xx
		machdir-$(CONFIG_SH_DREAMCAST) += dreamcast
		machdir-$(CONFIG_SH_MPC1211) += mpc1211
		machdir-$(CONFIG_SH_SH03) += sh03
		machdir-$(CONFIG_SH_SECUREEDGE5410) += snapgear
		machdir-$(CONFIG_SH_RTS7751R2D) += renesas/rts7751r2d

arch/sh/boards/mpc1211/Makefile

deleted100644 → 0

+0 −8

Original line number	Diff line number	Diff line
		#
		# Makefile for the Interface (CTP/PCI/MPC-SH02) specific parts of the kernel
		#

		obj-y := setup.o rtc.o

		obj-$(CONFIG_PCI) += pci.o

arch/sh/boards/mpc1211/pci.c

deleted100644 → 0

+0 −295

Original line number	Diff line number	Diff line
		/*
		* Low-Level PCI Support for the MPC-1211(CTP/PCI/MPC-SH02)
		*
		* (c) 2002-2003 Saito.K & Jeanne
		*
		* Dustin McIntire (dustin@sensoria.com)
		* Derived from arch/i386/kernel/pci-*.c which bore the message:
		* (c) 1999--2000 Martin Mares <mj@ucw.cz>
		*
		* May be copied or modified under the terms of the GNU General Public
		* License. See linux/COPYING for more information.
		*
		*/
		#include <linux/types.h>
		#include <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/delay.h>
		#include <linux/pci.h>
		#include <linux/sched.h>
		#include <linux/ioport.h>
		#include <linux/errno.h>
		#include <linux/irq.h>
		#include <linux/interrupt.h>

		#include <asm/machvec.h>
		#include <asm/io.h>
		#include <asm/mpc1211/pci.h>

		static struct resource mpcpci_io_resource = {
		"MPCPCI IO",
		0x00000000,
		0xffffffff,
		IORESOURCE_IO
		};

		static struct resource mpcpci_mem_resource = {
		"MPCPCI mem",
		0x00000000,
		0xffffffff,
		IORESOURCE_MEM
		};

		static struct pci_ops pci_direct_conf1;
		struct pci_channel board_pci_channels[] = {
		{&pci_direct_conf1, &mpcpci_io_resource, &mpcpci_mem_resource, 0, 256},
		{NULL, NULL, NULL, 0, 0},
		};

		/*
		* Direct access to PCI hardware...
		*/


		#define CONFIG_CMD(bus, devfn, where) (0x80000000 \| (bus->number << 16) \| (devfn << 8) \| (where & ~3))

		/*
		* Functions for accessing PCI configuration space with type 1 accesses
		*/
		static int pci_conf1_read(struct pci_bus bus, unsigned int devfn, int where, int size, u32 value)
		{
		u32 word;
		unsigned long flags;

		/*
		* PCIPDR may only be accessed as 32 bit words,
		* so we must do byte alignment by hand
		*/
		local_irq_save(flags);
		writel(CONFIG_CMD(bus,devfn,where), PCIPAR);
		word = readl(PCIPDR);
		local_irq_restore(flags);

		switch (size) {
		case 1:
		switch (where & 0x3) {
		case 3:
		*value = (u8)(word >> 24);
		break;
		case 2:
		*value = (u8)(word >> 16);
		break;
		case 1:
		*value = (u8)(word >> 8);
		break;
		default:
		*value = (u8)word;
		break;
		}
		break;
		case 2:
		switch (where & 0x3) {
		case 3:
		*value = (u16)(word >> 24);
		local_irq_save(flags);
		writel(CONFIG_CMD(bus,devfn,(where+1)), PCIPAR);
		word = readl(PCIPDR);
		local_irq_restore(flags);
		*value \|= ((word & 0xff) << 8);
		break;
		case 2:
		*value = (u16)(word >> 16);
		break;
		case 1:
		*value = (u16)(word >> 8);
		break;
		default:
		*value = (u16)word;
		break;
		}
		break;
		case 4:
		*value = word;
		break;
		}
		PCIDBG(4,"pci_conf1_read@0x%08x=0x%x\n", CONFIG_CMD(bus,devfn,where),*value);
		return PCIBIOS_SUCCESSFUL;
		}

		/*
		* Since MPC-1211 only does 32bit access we'll have to do a read,mask,write operation.
		* We'll allow an odd byte offset, though it should be illegal.
		*/
		static int pci_conf1_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
		{
		u32 word,mask = 0;
		unsigned long flags;
		u32 shift = (where & 3) * 8;

		if(size == 1) {
		mask = ((1 << 8) - 1) << shift; // create the byte mask
		} else if(size == 2){
		if(shift == 24)
		return PCIBIOS_BAD_REGISTER_NUMBER;
		mask = ((1 << 16) - 1) << shift; // create the word mask
		}
		local_irq_save(flags);
		writel(CONFIG_CMD(bus,devfn,where), PCIPAR);
		if(size == 4){
		writel(value, PCIPDR);
		local_irq_restore(flags);
		PCIDBG(4,"pci_conf1_write@0x%08x=0x%x\n", CONFIG_CMD(bus,devfn,where),value);
		return PCIBIOS_SUCCESSFUL;
		}
		word = readl(PCIPDR);
		word &= ~mask;
		word \|= ((value << shift) & mask);
		writel(word, PCIPDR);
		local_irq_restore(flags);
		PCIDBG(4,"pci_conf1_write@0x%08x=0x%x\n", CONFIG_CMD(bus,devfn,where),word);
		return PCIBIOS_SUCCESSFUL;
		}

		#undef CONFIG_CMD

		static struct pci_ops pci_direct_conf1 = {
		.read = pci_conf1_read,
		.write = pci_conf1_write,
		};

		static void __devinit quirk_ali_ide_ports(struct pci_dev *dev)
		{
		dev->resource[0].start = 0x1f0;
		dev->resource[0].end = 0x1f7;
		dev->resource[0].flags = IORESOURCE_IO;
		dev->resource[1].start = 0x3f6;
		dev->resource[1].end = 0x3f6;
		dev->resource[1].flags = IORESOURCE_IO;
		dev->resource[2].start = 0x170;
		dev->resource[2].end = 0x177;
		dev->resource[2].flags = IORESOURCE_IO;
		dev->resource[3].start = 0x376;
		dev->resource[3].end = 0x376;
		dev->resource[3].flags = IORESOURCE_IO;
		dev->resource[4].start = 0xf000;
		dev->resource[4].end = 0xf00f;
		dev->resource[4].flags = IORESOURCE_IO;
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, quirk_ali_ide_ports);

		char * __devinit pcibios_setup(char *str)
		{
		return str;
		}

		/*
		* Called after each bus is probed, but before its children
		* are examined.
		*/

		void __devinit pcibios_fixup_bus(struct pci_bus *b)
		{
		pci_read_bridge_bases(b);
		}

		/*
		* IRQ functions
		*/
		static inline u8 bridge_swizzle(u8 pin, u8 slot)
		{
		return (((pin-1) + slot) % 4) + 1;
		}

		static inline u8 bridge_swizzle_pci_1(u8 pin, u8 slot)
		{
		return (((pin-1) - slot) & 3) + 1;
		}

		static u8 __init mpc1211_swizzle(struct pci_dev dev, u8 pinp)
		{
		unsigned long flags;
		u8 pin = *pinp;
		u32 word;

		for ( ; dev->bus->self; dev = dev->bus->self) {
		if (!pin)
		continue;

		if (dev->bus->number == 1) {
		local_irq_save(flags);
		writel(0x80000000 \| 0x2c, PCIPAR);
		word = readl(PCIPDR);
		local_irq_restore(flags);
		word >>= 16;

		if (word == 0x0001)
		pin = bridge_swizzle_pci_1(pin, PCI_SLOT(dev->devfn));
		else
		pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
		} else
		pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
		}

		*pinp = pin;

		return PCI_SLOT(dev->devfn);
		}

		static int __init map_mpc1211_irq(struct pci_dev *dev, u8 slot, u8 pin)
		{
		int irq = -1;

		/* now lookup the actual IRQ on a platform specific basis (pci-'platform'.c) */
		if (dev->bus->number == 0) {
		switch (slot) {
		case 13: irq = 9; break; /* USB */
		case 22: irq = 10; break; /* LAN */
		default: irq = 0; break;
		}
		} else {
		switch (pin) {
		case 0: irq = 0; break;
		case 1: irq = 7; break;
		case 2: irq = 9; break;
		case 3: irq = 10; break;
		case 4: irq = 11; break;
		}
		}

		if( irq < 0 ) {
		PCIDBG(3, "PCI: Error mapping IRQ on device %s\n", pci_name(dev));
		return irq;
		}

		PCIDBG(2, "Setting IRQ for slot %s to %d\n", pci_name(dev), irq);

		return irq;
		}

		void __init pcibios_fixup_irqs(void)
		{
		pci_fixup_irqs(mpc1211_swizzle, map_mpc1211_irq);
		}

		void pcibios_align_resource(void data, struct resource res,
		resource_size_t size, resource_size_t align)
		{
		resource_size_t start = res->start;

		if (res->flags & IORESOURCE_IO) {
		if (start >= 0x10000UL) {
		if ((start & 0xffffUL) < 0x4000UL) {
		start = (start & 0xffff0000UL) + 0x4000UL;
		} else if ((start & 0xffffUL) >= 0xf000UL) {
		start = (start & 0xffff0000UL) + 0x10000UL;
		}
		res->start = start;
		} else {
		if (start & 0x300) {
		start = (start + 0x3ff) & ~0x3ff;
		res->start = start;
		}
		}
		}
		}

arch/sh/boards/mpc1211/rtc.c

deleted100644 → 0

+0 −136

Original line number	Diff line number	Diff line
		/*
		* linux/arch/sh/kernel/rtc-mpc1211.c -- MPC-1211 on-chip RTC support
		*
		* Copyright (C) 2002 Saito.K & Jeanne
		*
		*/

		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/sched.h>
		#include <linux/time.h>
		#include <linux/bcd.h>
		#include <linux/mc146818rtc.h>

		unsigned long get_cmos_time(void)
		{
		unsigned int year, mon, day, hour, min, sec;

		spin_lock(&rtc_lock);

		do {
		sec = CMOS_READ(RTC_SECONDS);
		min = CMOS_READ(RTC_MINUTES);
		hour = CMOS_READ(RTC_HOURS);
		day = CMOS_READ(RTC_DAY_OF_MONTH);
		mon = CMOS_READ(RTC_MONTH);
		year = CMOS_READ(RTC_YEAR);
		} while (sec != CMOS_READ(RTC_SECONDS));

		if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD) {
		BCD_TO_BIN(sec);
		BCD_TO_BIN(min);
		BCD_TO_BIN(hour);
		BCD_TO_BIN(day);
		BCD_TO_BIN(mon);
		BCD_TO_BIN(year);
		}

		spin_unlock(&rtc_lock);

		year += 1900;
		if (year < 1970)
		year += 100;

		return mktime(year, mon, day, hour, min, sec);
		}

		void mpc1211_rtc_gettimeofday(struct timeval *tv)
		{

		tv->tv_sec = get_cmos_time();
		tv->tv_usec = 0;
		}

		/* arc/i386/kernel/time.c */
		/*
		* In order to set the CMOS clock precisely, set_rtc_mmss has to be
		* called 500 ms after the second nowtime has started, because when
		* nowtime is written into the registers of the CMOS clock, it will
		* jump to the next second precisely 500 ms later. Check the Motorola
		* MC146818A or Dallas DS12887 data sheet for details.
		*
		* BUG: This routine does not handle hour overflow properly; it just
		* sets the minutes. Usually you'll only notice that after reboot!
		*/
		static int set_rtc_mmss(unsigned long nowtime)
		{
		int retval = 0;
		int real_seconds, real_minutes, cmos_minutes;
		unsigned char save_control, save_freq_select;

		/* gets recalled with irq locally disabled */
		spin_lock(&rtc_lock);
		save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */
		CMOS_WRITE((save_control\|RTC_SET), RTC_CONTROL);

		save_freq_select = CMOS_READ(RTC_FREQ_SELECT); /* stop and reset prescaler */
		CMOS_WRITE((save_freq_select\|RTC_DIV_RESET2), RTC_FREQ_SELECT);

		cmos_minutes = CMOS_READ(RTC_MINUTES);
		if (!(save_control & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD)
		BCD_TO_BIN(cmos_minutes);

		/*
		* since we're only adjusting minutes and seconds,
		* don't interfere with hour overflow. This avoids
		* messing with unknown time zones but requires your
		* RTC not to be off by more than 15 minutes
		*/
		real_seconds = nowtime % 60;
		real_minutes = nowtime / 60;
		if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
		real_minutes += 30; /* correct for half hour time zone */
		real_minutes %= 60;

		if (abs(real_minutes - cmos_minutes) < 30) {
		if (!(save_control & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD) {
		BIN_TO_BCD(real_seconds);
		BIN_TO_BCD(real_minutes);
		}
		CMOS_WRITE(real_seconds,RTC_SECONDS);
		CMOS_WRITE(real_minutes,RTC_MINUTES);
		} else {
		printk(KERN_WARNING
		"set_rtc_mmss: can't update from %d to %d\n",
		cmos_minutes, real_minutes);
		retval = -1;
		}

		/* The following flags have to be released exactly in this order,
		* otherwise the DS12887 (popular MC146818A clone with integrated
		* battery and quartz) will not reset the oscillator and will not
		* update precisely 500 ms later. You won't find this mentioned in
		* the Dallas Semiconductor data sheets, but who believes data
		* sheets anyway ... -- Markus Kuhn
		*/
		CMOS_WRITE(save_control, RTC_CONTROL);
		CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
		spin_unlock(&rtc_lock);

		return retval;
		}

		int mpc1211_rtc_settimeofday(const struct timeval *tv)
		{
		unsigned long nowtime = tv->tv_sec;

		return set_rtc_mmss(nowtime);
		}

		void mpc1211_time_init(void)
		{
		rtc_sh_get_time = mpc1211_rtc_gettimeofday;
		rtc_sh_set_time = mpc1211_rtc_settimeofday;
		}