mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-07 04:09:21 +00:00
sh: Kill off cf-enabler with extreme prejudice.
Now that the rest of the boards that were using cf-enabler "generically" have switched to setting up their mappings on their own, only the mach-se boards were left using it. All of the cf-enabler using mach-se boards use a special initialization of the MRSHPC windows rather than going through the special PTE as other SH-4 platforms do. This consolidates the MRSHPC setup logic, hooks it up on the boards that care, and gets rid of any and all remaining references to cf-enabler. This has been long overdue, as cf-enabler has been the bane of arch/sh/kernel for the last 7 years. Good riddance. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
parent
8c197c3afb
commit
073da9c0de
8 changed files with 63 additions and 220 deletions
|
|
@ -701,49 +701,6 @@ config MAPLE
|
|||
Dreamcast with a serial line terminal or a remote network
|
||||
connection.
|
||||
|
||||
config CF_ENABLER
|
||||
bool "Compact Flash Enabler support"
|
||||
depends on SOLUTION_ENGINE
|
||||
---help---
|
||||
Compact Flash is a small, removable mass storage device introduced
|
||||
in 1994 originally as a PCMCIA device. If you say `Y' here, you
|
||||
compile in support for Compact Flash devices directly connected to
|
||||
a SuperH processor. A Compact Flash FAQ is available at
|
||||
<http://www.compactflash.org/faqs/faq.htm>.
|
||||
|
||||
If your board has "Directly Connected" CompactFlash at area 5 or 6,
|
||||
you may want to enable this option. Then, you can use CF as
|
||||
primary IDE drive (only tested for SanDisk).
|
||||
|
||||
If in doubt, select 'N'.
|
||||
|
||||
choice
|
||||
prompt "Compact Flash Connection Area"
|
||||
depends on CF_ENABLER
|
||||
default CF_AREA6
|
||||
|
||||
config CF_AREA5
|
||||
bool "Area5"
|
||||
help
|
||||
If your board has "Directly Connected" CompactFlash, You should
|
||||
select the area where your CF is connected to.
|
||||
|
||||
- "Area5" if CompactFlash is connected to Area 5 (0x14000000)
|
||||
- "Area6" if it is connected to Area 6 (0x18000000)
|
||||
|
||||
"Area6" will work for most boards.
|
||||
|
||||
config CF_AREA6
|
||||
bool "Area6"
|
||||
|
||||
endchoice
|
||||
|
||||
config CF_BASE_ADDR
|
||||
hex
|
||||
depends on CF_ENABLER
|
||||
default "0xb8000000" if CF_AREA6
|
||||
default "0xb4000000" if CF_AREA5
|
||||
|
||||
source "arch/sh/drivers/pci/Kconfig"
|
||||
|
||||
source "drivers/pci/Kconfig"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@
|
|||
*/
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <mach-se/mach/se.h>
|
||||
#include <mach-se/mach/mrshpc.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/smc37c93x.h>
|
||||
#include <asm/heartbeat.h>
|
||||
|
|
@ -175,6 +176,7 @@ static struct platform_device *se_devices[] __initdata = {
|
|||
|
||||
static int __init se_devices_setup(void)
|
||||
{
|
||||
mrshpc_setup_windows();
|
||||
return platform_add_devices(se_devices, ARRAY_SIZE(se_devices));
|
||||
}
|
||||
device_initcall(se_devices_setup);
|
||||
|
|
|
|||
|
|
@ -12,8 +12,9 @@
|
|||
*/
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <mach-se/mach/se7721.h>
|
||||
#include <mach-se/mach/mrshpc.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/heartbeat.h>
|
||||
|
||||
|
|
@ -74,8 +75,8 @@ static struct platform_device *se7721_devices[] __initdata = {
|
|||
|
||||
static int __init se7721_devices_setup(void)
|
||||
{
|
||||
return platform_add_devices(se7721_devices,
|
||||
ARRAY_SIZE(se7721_devices));
|
||||
mrshpc_setup_windows();
|
||||
return platform_add_devices(se7721_devices, ARRAY_SIZE(se7721_devices));
|
||||
}
|
||||
device_initcall(se7721_devices_setup);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,10 @@
|
|||
#include <linux/ata_platform.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/smc91x.h>
|
||||
#include <mach-se/mach/se7722.h>
|
||||
#include <mach-se/mach/mrshpc.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <asm/clock.h>
|
||||
#include <mach-se/mach/se7722.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/heartbeat.h>
|
||||
#include <asm/sh_keysc.h>
|
||||
|
|
@ -147,8 +148,8 @@ static struct platform_device *se7722_devices[] __initdata = {
|
|||
|
||||
static int __init se7722_devices_setup(void)
|
||||
{
|
||||
return platform_add_devices(se7722_devices,
|
||||
ARRAY_SIZE(se7722_devices));
|
||||
mrshpc_setup_windows();
|
||||
return platform_add_devices(se7722_devices, ARRAY_SIZE(se7722_devices));
|
||||
}
|
||||
device_initcall(se7722_devices_setup);
|
||||
|
||||
|
|
|
|||
52
arch/sh/include/mach-se/mach/mrshpc.h
Normal file
52
arch/sh/include/mach-se/mach/mrshpc.h
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
#ifndef __MACH_SE_MRSHPC_H
|
||||
#define __MACH_SE_MRSHPC_H
|
||||
|
||||
#include <linux/io.h>
|
||||
|
||||
static void __init mrshpc_setup_windows(void)
|
||||
{
|
||||
if ((__raw_readw(MRSHPC_CSR) & 0x000c) != 0)
|
||||
return; /* Not detected */
|
||||
|
||||
if ((__raw_readw(MRSHPC_CSR) & 0x0080) == 0) {
|
||||
__raw_writew(0x0674, MRSHPC_CPWCR); /* Card Vcc is 3.3v? */
|
||||
} else {
|
||||
__raw_writew(0x0678, MRSHPC_CPWCR); /* Card Vcc is 5V */
|
||||
}
|
||||
|
||||
/*
|
||||
* PC-Card window open
|
||||
* flag == COMMON/ATTRIBUTE/IO
|
||||
*/
|
||||
/* common window open */
|
||||
__raw_writew(0x8a84, MRSHPC_MW0CR1);
|
||||
if((__raw_readw(MRSHPC_CSR) & 0x4000) != 0)
|
||||
/* common mode & bus width 16bit SWAP = 1*/
|
||||
__raw_writew(0x0b00, MRSHPC_MW0CR2);
|
||||
else
|
||||
/* common mode & bus width 16bit SWAP = 0*/
|
||||
__raw_writew(0x0300, MRSHPC_MW0CR2);
|
||||
|
||||
/* attribute window open */
|
||||
__raw_writew(0x8a85, MRSHPC_MW1CR1);
|
||||
if ((__raw_readw(MRSHPC_CSR) & 0x4000) != 0)
|
||||
/* attribute mode & bus width 16bit SWAP = 1*/
|
||||
__raw_writew(0x0a00, MRSHPC_MW1CR2);
|
||||
else
|
||||
/* attribute mode & bus width 16bit SWAP = 0*/
|
||||
__raw_writew(0x0200, MRSHPC_MW1CR2);
|
||||
|
||||
/* I/O window open */
|
||||
__raw_writew(0x8a86, MRSHPC_IOWCR1);
|
||||
__raw_writew(0x0008, MRSHPC_CDCR); /* I/O card mode */
|
||||
if ((__raw_readw(MRSHPC_CSR) & 0x4000) != 0)
|
||||
__raw_writew(0x0a00, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 1*/
|
||||
else
|
||||
__raw_writew(0x0200, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 0*/
|
||||
|
||||
__raw_writew(0x2000, MRSHPC_ICR);
|
||||
__raw_writeb(0x00, PA_MRSHPC_MW2 + 0x206);
|
||||
__raw_writeb(0x42, PA_MRSHPC_MW2 + 0x200);
|
||||
}
|
||||
|
||||
#endif /* __MACH_SE_MRSHPC_H */
|
||||
|
|
@ -17,7 +17,6 @@ obj-y := debugtraps.o disassemble.o idle.o io.o io_generic.o irq.o \
|
|||
obj-y += cpu/ timers/
|
||||
obj-$(CONFIG_VSYSCALL) += vsyscall/
|
||||
obj-$(CONFIG_SMP) += smp.o
|
||||
obj-$(CONFIG_CF_ENABLER) += cf-enabler.o
|
||||
obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
|
||||
obj-$(CONFIG_KGDB) += kgdb.o
|
||||
obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ obj-y := debugtraps.o idle.o io.o io_generic.o irq.o machvec.o process_64.o \
|
|||
obj-y += cpu/ timers/
|
||||
obj-$(CONFIG_VSYSCALL) += vsyscall/
|
||||
obj-$(CONFIG_SMP) += smp.o
|
||||
obj-$(CONFIG_CF_ENABLER) += cf-enabler.o
|
||||
obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
|
||||
obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o
|
||||
obj-$(CONFIG_MODULES) += sh_ksyms_64.o module.o
|
||||
|
|
|
|||
|
|
@ -1,168 +0,0 @@
|
|||
/* $Id: cf-enabler.c,v 1.4 2004/02/22 22:44:36 kkojima Exp $
|
||||
*
|
||||
* linux/drivers/block/cf-enabler.c
|
||||
*
|
||||
* Copyright (C) 1999 Niibe Yutaka
|
||||
* Copyright (C) 2000 Toshiharu Nozawa
|
||||
* Copyright (C) 2001 A&D Co., Ltd.
|
||||
*
|
||||
* Enable the CF configuration.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
/*
|
||||
* You can connect Compact Flash directly to the bus of SuperH.
|
||||
* This is the enabler for that.
|
||||
*
|
||||
* SIM: How generic is this really? It looks pretty board, or at
|
||||
* least SH sub-type, specific to me.
|
||||
* I know it doesn't work on the Overdrive!
|
||||
*/
|
||||
|
||||
/*
|
||||
* 0xB8000000 : Attribute
|
||||
* 0xB8001000 : Common Memory
|
||||
* 0xBA000000 : I/O
|
||||
*/
|
||||
#if defined(CONFIG_CPU_SH4)
|
||||
/* SH4 can't access PCMCIA interface through P2 area.
|
||||
* we must remap it with appropriate attribute bit of the page set.
|
||||
* this part is based on Greg Banks' hd64465_ss.c implementation - Masahiro Abe */
|
||||
|
||||
#if defined(CONFIG_CF_AREA6)
|
||||
#define slot_no 0
|
||||
#else
|
||||
#define slot_no 1
|
||||
#endif
|
||||
|
||||
/* use this pointer to access to directly connected compact flash io area*/
|
||||
void *cf_io_base;
|
||||
|
||||
static int __init allocate_cf_area(void)
|
||||
{
|
||||
pgprot_t prot;
|
||||
unsigned long paddrbase, psize;
|
||||
|
||||
/* open I/O area window */
|
||||
paddrbase = virt_to_phys((void*)CONFIG_CF_BASE_ADDR);
|
||||
psize = PAGE_SIZE;
|
||||
prot = PAGE_KERNEL_PCC(slot_no, _PAGE_PCC_IO16);
|
||||
cf_io_base = p3_ioremap(paddrbase, psize, prot.pgprot);
|
||||
if (!cf_io_base) {
|
||||
printk("allocate_cf_area : can't open CF I/O window!\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
/* printk("p3_ioremap(paddr=0x%08lx, psize=0x%08lx, prot=0x%08lx)=0x%08lx\n",
|
||||
paddrbase, psize, prot.pgprot, cf_io_base);*/
|
||||
|
||||
/* XXX : do we need attribute and common-memory area also? */
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __init cf_init_default(void)
|
||||
{
|
||||
/* You must have enabled the card, and set the level interrupt
|
||||
* before reaching this point. Possibly in boot ROM or boot loader.
|
||||
*/
|
||||
#if defined(CONFIG_CPU_SH4)
|
||||
allocate_cf_area();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_SH_SOLUTION_ENGINE)
|
||||
#include <mach-se/mach/se.h>
|
||||
#elif defined(CONFIG_SH_7722_SOLUTION_ENGINE)
|
||||
#include <mach-se/mach/se7722.h>
|
||||
#elif defined(CONFIG_SH_7721_SOLUTION_ENGINE)
|
||||
#include <mach-se/mach/se7721.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SolutionEngine Seriese
|
||||
*
|
||||
* about MS770xSE
|
||||
* 0xB8400000 : Common Memory
|
||||
* 0xB8500000 : Attribute
|
||||
* 0xB8600000 : I/O
|
||||
*
|
||||
* about MS7722SE
|
||||
* 0xB0400000 : Common Memory
|
||||
* 0xB0500000 : Attribute
|
||||
* 0xB0600000 : I/O
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_SH_SOLUTION_ENGINE) || \
|
||||
defined(CONFIG_SH_7722_SOLUTION_ENGINE) || \
|
||||
defined(CONFIG_SH_7721_SOLUTION_ENGINE)
|
||||
static int __init cf_init_se(void)
|
||||
{
|
||||
if ((ctrl_inw(MRSHPC_CSR) & 0x000c) != 0)
|
||||
return 0; /* Not detected */
|
||||
|
||||
if ((ctrl_inw(MRSHPC_CSR) & 0x0080) == 0) {
|
||||
ctrl_outw(0x0674, MRSHPC_CPWCR); /* Card Vcc is 3.3v? */
|
||||
} else {
|
||||
ctrl_outw(0x0678, MRSHPC_CPWCR); /* Card Vcc is 5V */
|
||||
}
|
||||
|
||||
/*
|
||||
* PC-Card window open
|
||||
* flag == COMMON/ATTRIBUTE/IO
|
||||
*/
|
||||
/* common window open */
|
||||
ctrl_outw(0x8a84, MRSHPC_MW0CR1);
|
||||
if((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
|
||||
/* common mode & bus width 16bit SWAP = 1*/
|
||||
ctrl_outw(0x0b00, MRSHPC_MW0CR2);
|
||||
else
|
||||
/* common mode & bus width 16bit SWAP = 0*/
|
||||
ctrl_outw(0x0300, MRSHPC_MW0CR2);
|
||||
|
||||
/* attribute window open */
|
||||
ctrl_outw(0x8a85, MRSHPC_MW1CR1);
|
||||
if ((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
|
||||
/* attribute mode & bus width 16bit SWAP = 1*/
|
||||
ctrl_outw(0x0a00, MRSHPC_MW1CR2);
|
||||
else
|
||||
/* attribute mode & bus width 16bit SWAP = 0*/
|
||||
ctrl_outw(0x0200, MRSHPC_MW1CR2);
|
||||
|
||||
/* I/O window open */
|
||||
ctrl_outw(0x8a86, MRSHPC_IOWCR1);
|
||||
ctrl_outw(0x0008, MRSHPC_CDCR); /* I/O card mode */
|
||||
if ((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
|
||||
ctrl_outw(0x0a00, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 1*/
|
||||
else
|
||||
ctrl_outw(0x0200, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 0*/
|
||||
|
||||
ctrl_outw(0x2000, MRSHPC_ICR);
|
||||
ctrl_outb(0x00, PA_MRSHPC_MW2 + 0x206);
|
||||
ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200);
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static int __init cf_init_se(void)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __init cf_init(void)
|
||||
{
|
||||
if (mach_is_se() || mach_is_7722se() || mach_is_7721se())
|
||||
return cf_init_se();
|
||||
|
||||
return cf_init_default();
|
||||
}
|
||||
|
||||
__initcall (cf_init);
|
||||
Loading…
Reference in a new issue