From: Magnus D. <mag...@gm...> - 2007-07-24 14:48:24
|
sh: remove support for sh73180 and solution engine 73180 This patch removes old dead code: - kill off sh73180 cpu support - get rid of broken solution engine 73180 board support Signed-off-by: Magnus Damm <da...@ig...> --- arch/sh/Kconfig | 10 arch/sh/Makefile | 1 arch/sh/boards/se/73180/Makefile | 5 arch/sh/boards/se/73180/io.c | 268 ------------ arch/sh/boards/se/73180/irq.c | 136 ------ arch/sh/boards/se/73180/setup.c | 75 --- arch/sh/configs/se73180_defconfig | 648 ------------------------------- arch/sh/kernel/cpu/sh4/probe.c | 6 arch/sh/kernel/cpu/sh4a/Makefile | 2 arch/sh/kernel/cpu/sh4a/clock-sh73180.c | 81 --- arch/sh/kernel/cpu/sh4a/setup-sh73180.c | 43 -- arch/sh/kernel/setup.c | 2 arch/sh/mm/Kconfig | 4 drivers/serial/sh-sci.h | 11 include/asm-sh/bugs.h | 2 include/asm-sh/cpu-sh4/freq.h | 2 include/asm-sh/processor.h | 2 17 files changed, 5 insertions(+), 1293 deletions(-) --- 0003/arch/sh/Kconfig +++ work/arch/sh/Kconfig 2007-07-24 19:46:06.000000000 +0900 @@ -266,14 +266,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 @@ -437,7 +429,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_SH7770 || \ --- 0003/arch/sh/Makefile +++ work/arch/sh/Makefile 2007-07-24 19:44:17.000000000 +0900 @@ -92,7 +92,6 @@ machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) += se/7751 machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE) += se/7780 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 --- 0001/arch/sh/boards/se/73180/Makefile +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,5 +0,0 @@ -# -# Makefile for the 73180 SolutionEngine specific parts of the kernel -# - -obj-y := setup.o io.o irq.o --- 0001/arch/sh/boards/se/73180/io.c +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,268 +0,0 @@ -/* - * arch/sh/boards/se/73180/io.c - * - * Copyright (C) 2003 YOSHII Takashi <yos...@hi...> - * 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); -} --- 0001/arch/sh/boards/se/73180/irq.c +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,136 +0,0 @@ -/* - * arch/sh/boards/se/73180/irq.c - * - * Copyright (C) 2003 Takashi Kusuda <kus...@hi...> - * Based on arch/sh/boards/se/7300/irq.c - * - * Modified for SH-Mobile SolutionEngine 73180 Support - * by YOSHII Takashi <yos...@hi...> - * - */ - -#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 */ -} --- 0001/arch/sh/boards/se/73180/setup.c +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,75 +0,0 @@ -/* - * arch/sh/boards/se/73180/setup.c - * - * Copyright (C) 2003 Takashi Kusuda <kus...@hi...> - * Based on arch/sh/setup_shmse.c - * - * Modified for 73180 SolutionEngine - * by YOSHII Takashi <yos...@hi...> - * - */ - -#include <linux/init.h> -#include <linux/platform_device.h> -#include <asm/machvec.h> -#include <asm/se73180.h> -#include <asm/irq.h> - -void init_73180se_IRQ(void); - -static struct resource heartbeat_resources[] = { - [0] = { - .start = PA_LED, - .end = PA_LED + 8 - 1, - .flags = IORESOURCE_MEM, - }, -}; - -static struct platform_device heartbeat_device = { - .name = "heartbeat", - .id = -1, - .num_resources = ARRAY_SIZE(heartbeat_resources), - .resource = heartbeat_resources, -}; - -static struct platform_device *se73180_devices[] __initdata = { - &heartbeat_device, -}; - -static int __init se73180_devices_setup(void) -{ - return platform_add_devices(se73180_devices, - ARRAY_SIZE(se73180_devices)); -} -__initcall(se73180_devices_setup); - -/* - * The Machine Vector - */ -static struct sh_machine_vector mv_73180se __initmv = { - .mv_name = "SolutionEngine 73180", - .mv_nr_irqs = 108, - .mv_inb = sh73180se_inb, - .mv_inw = sh73180se_inw, - .mv_inl = sh73180se_inl, - .mv_outb = sh73180se_outb, - .mv_outw = sh73180se_outw, - .mv_outl = sh73180se_outl, - - .mv_inb_p = sh73180se_inb_p, - .mv_inw_p = sh73180se_inw, - .mv_inl_p = sh73180se_inl, - .mv_outb_p = sh73180se_outb_p, - .mv_outw_p = sh73180se_outw, - .mv_outl_p = sh73180se_outl, - - .mv_insb = sh73180se_insb, - .mv_insw = sh73180se_insw, - .mv_insl = sh73180se_insl, - .mv_outsb = sh73180se_outsb, - .mv_outsw = sh73180se_outsw, - .mv_outsl = sh73180se_outsl, - - .mv_init_irq = init_73180se_IRQ, - .mv_irq_demux = shmse_irq_demux, -}; --- 0001/arch/sh/configs/se73180_defconfig +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,648 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.18 -# Tue Oct 3 11:44:45 2006 -# -CONFIG_SUPERH=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -# CONFIG_SYSVIPC is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_UTS_NS is not set -# CONFIG_IKCONFIG is not set -# CONFIG_RELAY is not set -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_EMBEDDED=y -CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set -# CONFIG_HOTPLUG is not set -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -# CONFIG_FUTEX is not set -# CONFIG_EPOLL is not set -CONFIG_SHMEM=y -CONFIG_SLAB=y -CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -# CONFIG_MODULE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set - -# -# Block layer -# -CONFIG_BLOCK=y -# CONFIG_LBD is not set -# CONFIG_LSF is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" - -# -# System type -# -CONFIG_SOLUTION_ENGINE=y -# CONFIG_SH_SOLUTION_ENGINE is not set -# CONFIG_SH_7751_SOLUTION_ENGINE is not set -# CONFIG_SH_7300_SOLUTION_ENGINE is not set -# CONFIG_SH_7343_SOLUTION_ENGINE is not set -CONFIG_SH_73180_SOLUTION_ENGINE=y -# CONFIG_SH_7751_SYSTEMH is not set -# CONFIG_SH_HP6XX is not set -# CONFIG_SH_EC3104 is not set -# CONFIG_SH_SATURN is not set -# CONFIG_SH_DREAMCAST is not set -# CONFIG_SH_BIGSUR is not set -# CONFIG_SH_MPC1211 is not set -# CONFIG_SH_SH03 is not set -# CONFIG_SH_SECUREEDGE5410 is not set -# CONFIG_SH_HS7751RVOIP is not set -# CONFIG_SH_7710VOIPGW is not set -# CONFIG_SH_RTS7751R2D is not set -# CONFIG_SH_R7780RP is not set -# CONFIG_SH_EDOSK7705 is not set -# CONFIG_SH_SH4202_MICRODEV is not set -# CONFIG_SH_LANDISK is not set -# CONFIG_SH_TITAN is not set -# CONFIG_SH_SHMIN is not set -# CONFIG_SH_UNKNOWN is not set - -# -# Processor selection -# -CONFIG_CPU_SH4=y -CONFIG_CPU_SH4A=y -CONFIG_CPU_SH4AL_DSP=y - -# -# SH-2 Processor Support -# -# CONFIG_CPU_SUBTYPE_SH7604 is not set - -# -# SH-3 Processor Support -# -# CONFIG_CPU_SUBTYPE_SH7300 is not set -# CONFIG_CPU_SUBTYPE_SH7705 is not set -# CONFIG_CPU_SUBTYPE_SH7706 is not set -# CONFIG_CPU_SUBTYPE_SH7707 is not set -# CONFIG_CPU_SUBTYPE_SH7708 is not set -# CONFIG_CPU_SUBTYPE_SH7709 is not set -# CONFIG_CPU_SUBTYPE_SH7710 is not set - -# -# SH-4 Processor Support -# -# CONFIG_CPU_SUBTYPE_SH7750 is not set -# CONFIG_CPU_SUBTYPE_SH7091 is not set -# CONFIG_CPU_SUBTYPE_SH7750R is not set -# CONFIG_CPU_SUBTYPE_SH7750S is not set -# CONFIG_CPU_SUBTYPE_SH7751 is not set -# CONFIG_CPU_SUBTYPE_SH7751R is not set -# CONFIG_CPU_SUBTYPE_SH7760 is not set -# CONFIG_CPU_SUBTYPE_SH4_202 is not set - -# -# ST40 Processor Support -# -# CONFIG_CPU_SUBTYPE_ST40STB1 is not set -# CONFIG_CPU_SUBTYPE_ST40GX1 is not set - -# -# SH-4A Processor Support -# -# CONFIG_CPU_SUBTYPE_SH7770 is not set -# CONFIG_CPU_SUBTYPE_SH7780 is not set - -# -# SH4AL-DSP Processor Support -# -CONFIG_CPU_SUBTYPE_SH73180=y -# CONFIG_CPU_SUBTYPE_SH7343 is not set - -# -# Memory management options -# -CONFIG_MMU=y -CONFIG_PAGE_OFFSET=0x80000000 -CONFIG_MEMORY_START=0x0c000000 -CONFIG_MEMORY_SIZE=0x02000000 -CONFIG_32BIT=y -CONFIG_VSYSCALL=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set - -# -# Cache configuration -# -# CONFIG_SH_DIRECT_MAPPED is not set -# CONFIG_SH_WRITETHROUGH is not set -# CONFIG_SH_OCRAM is not set - -# -# Processor features -# -CONFIG_CPU_LITTLE_ENDIAN=y -# CONFIG_SH_FPU is not set -# CONFIG_SH_FPU_EMU is not set -CONFIG_SH_DSP=y -# CONFIG_SH_STORE_QUEUES is not set -CONFIG_CPU_HAS_INTEVT=y -CONFIG_CPU_HAS_SR_RB=y - -# -# Timer support -# -CONFIG_SH_TMU=y -CONFIG_SH_PCLK_FREQ=27000000 - -# -# CPU Frequency scaling -# -# CONFIG_CPU_FREQ is not set - -# -# DMA support -# -# CONFIG_SH_DMA is not set - -# -# Companion Chips -# -# CONFIG_HD6446X_SERIES is not set -CONFIG_HEARTBEAT=y - -# -# Kernel features -# -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 -# CONFIG_KEXEC is not set -# CONFIG_SMP is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set - -# -# Boot options -# -CONFIG_ZERO_PAGE_OFFSET=0x00010000 -CONFIG_BOOT_LINK_OFFSET=0x00800000 -# CONFIG_UBC_WAKEUP is not set -CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttySC0,38400 root=/dev/ram" - -# -# Bus options -# -# CONFIG_PCI is not set - -# -# PCCARD (PCMCIA/CardBus) support -# - -# -# PCI Hotplug Support -# - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_FLAT is not set -# CONFIG_BINFMT_MISC is not set - -# -# Power management options (EXPERIMENTAL) -# -# CONFIG_PM is not set - -# -# Networking -# -# CONFIG_NET is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# - -# -# Memory Technology Devices (MTD) -# -# CONFIG_MTD is not set - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CDROM_PKTCDVD is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_NETLINK is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# -# CONFIG_ATA is not set - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# I2O device support -# - -# -# ISDN subsystem -# - -# -# Telephony Support -# -# CONFIG_PHONE is not set - -# -# Input device support -# -# CONFIG_INPUT is not set - -# -# Hardware I/O ports -# -# CONFIG_SERIO is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -# CONFIG_VT is not set -# CONFIG_SERIAL_NONSTANDARD is not set - -# -# Serial drivers -# -# CONFIG_SERIAL_8250 is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=2 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_UNIX98_PTYS is not set -# CONFIG_LEGACY_PTYS is not set - -# -# IPMI -# -# CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set -# CONFIG_SH_WDT is not set -CONFIG_HW_RANDOM=y -# CONFIG_GEN_RTC is not set -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set - -# -# I2C support -# -# CONFIG_I2C is not set - -# -# SPI support -# -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# - -# -# Hardware Monitoring support -# -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Misc devices -# - -# -# Multimedia devices -# -# CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y - -# -# Digital Video Broadcasting Devices -# - -# -# Graphics support -# -CONFIG_FIRMWARE_EDID=y -# CONFIG_FB is not set - -# -# Sound -# -# CONFIG_SOUND is not set - -# -# USB support -# -# CONFIG_USB_ARCH_HAS_HCD is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set -# CONFIG_USB_ARCH_HAS_EHCI is not set - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# USB Gadget Support -# -# CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# -# CONFIG_MMC is not set - -# -# LED devices -# -# CONFIG_NEW_LEDS is not set - -# -# LED drivers -# - -# -# LED Triggers -# - -# -# InfiniBand support -# - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# - -# -# Real Time Clock -# -# CONFIG_RTC_CLASS is not set - -# -# DMA Engine support -# -# CONFIG_DMA_ENGINE is not set - -# -# DMA Clients -# - -# -# DMA Devices -# - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set -# CONFIG_XFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -# CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set - -# -# CD-ROM/DVD Filesystems -# -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set - -# -# DOS/FAT/NT Filesystems -# -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -# CONFIG_SYSFS is not set -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLBFS is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y - -# -# Miscellaneous filesystems -# -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y - -# -# Native Language Support -# -# CONFIG_NLS is not set - -# -# Profiling support -# -# CONFIG_PROFILING is not set - -# -# Kernel hacking -# -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_MUST_CHECK=y -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_SH_STANDARD_BIOS=y -# CONFIG_EARLY_SCIF_CONSOLE is not set -# CONFIG_EARLY_PRINTK is not set -# CONFIG_KGDB is not set - -# -# Security options -# -# CONFIG_KEYS is not set - -# -# Cryptographic options -# -# CONFIG_CRYPTO is not set - -# -# Library routines -# -# CONFIG_CRC_CCITT is not set -# CONFIG_CRC16 is not set -CONFIG_CRC32=y -# CONFIG_LIBCRC32C is not set --- 0001/arch/sh/kernel/cpu/sh4/probe.c +++ work/arch/sh/kernel/cpu/sh4/probe.c 2007-07-24 19:48:51.000000000 +0900 @@ -90,12 +90,6 @@ int __init detect_cpu_and_cache_system(v current_cpu_data.type = CPU_SH7751; current_cpu_data.flags |= CPU_HAS_FPU; break; - case 0x2000: - current_cpu_data.type = CPU_SH73180; - current_cpu_data.icache.ways = 4; - current_cpu_data.dcache.ways = 4; - current_cpu_data.flags |= CPU_HAS_LLSC; - break; case 0x2001: case 0x2004: current_cpu_data.type = CPU_SH7770; --- 0001/arch/sh/kernel/cpu/sh4a/Makefile +++ work/arch/sh/kernel/cpu/sh4a/Makefile 2007-07-24 19:45:01.000000000 +0900 @@ -6,13 +6,11 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7770) += setup-sh7770.o obj-$(CONFIG_CPU_SUBTYPE_SH7780) += setup-sh7780.o obj-$(CONFIG_CPU_SUBTYPE_SH7785) += setup-sh7785.o -obj-$(CONFIG_CPU_SUBTYPE_SH73180) += setup-sh73180.o obj-$(CONFIG_CPU_SUBTYPE_SH7343) += setup-sh7343.o obj-$(CONFIG_CPU_SUBTYPE_SH7722) += setup-sh7722.o obj-$(CONFIG_CPU_SUBTYPE_SHX3) += setup-shx3.o # Primary on-chip clocks (common) -clock-$(CONFIG_CPU_SUBTYPE_SH73180) := clock-sh73180.o clock-$(CONFIG_CPU_SUBTYPE_SH7770) := clock-sh7770.o clock-$(CONFIG_CPU_SUBTYPE_SH7780) := clock-sh7780.o clock-$(CONFIG_CPU_SUBTYPE_SH7785) := clock-sh7785.o --- 0001/arch/sh/kernel/cpu/sh4a/clock-sh73180.c +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,81 +0,0 @@ -/* - * arch/sh/kernel/cpu/sh4a/clock-sh73180.c - * - * SH73180 support for the clock framework - * - * Copyright (C) 2005 Paul Mundt - * - * FRQCR parsing hacked out of arch/sh/kernel/time.c - * - * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka - * Copyright (C) 2000 Philipp Rumpf <pr...@tu...> - * Copyright (C) 2002, 2003, 2004 Paul Mundt - * Copyright (C) 2002 M. R. Brown <mr...@li...> - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#include <linux/init.h> -#include <linux/kernel.h> -#include <asm/clock.h> -#include <asm/freq.h> -#include <asm/io.h> - -/* - * SH73180 uses a common set of divisors, so this is quite simple.. - */ -static int divisors[] = { 1, 2, 3, 4, 6, 8, 12, 16 }; - -static void master_clk_init(struct clk *clk) -{ - clk->rate *= divisors[ctrl_inl(FRQCR) & 0x0007]; -} - -static struct clk_ops sh73180_master_clk_ops = { - .init = master_clk_init, -}; - -static void module_clk_recalc(struct clk *clk) -{ - int idx = (ctrl_inl(FRQCR) & 0x0007); - clk->rate = clk->parent->rate / divisors[idx]; -} - -static struct clk_ops sh73180_module_clk_ops = { - .recalc = module_clk_recalc, -}; - -static void bus_clk_recalc(struct clk *clk) -{ - int idx = (ctrl_inl(FRQCR) >> 12) & 0x0007; - clk->rate = clk->parent->rate / divisors[idx]; -} - -static struct clk_ops sh73180_bus_clk_ops = { - .recalc = bus_clk_recalc, -}; - -static void cpu_clk_recalc(struct clk *clk) -{ - int idx = (ctrl_inl(FRQCR) >> 20) & 0x0007; - clk->rate = clk->parent->rate / divisors[idx]; -} - -static struct clk_ops sh73180_cpu_clk_ops = { - .recalc = cpu_clk_recalc, -}; - -static struct clk_ops *sh73180_clk_ops[] = { - &sh73180_master_clk_ops, - &sh73180_module_clk_ops, - &sh73180_bus_clk_ops, - &sh73180_cpu_clk_ops, -}; - -void __init arch_init_clk_ops(struct clk_ops **ops, int idx) -{ - if (idx < ARRAY_SIZE(sh73180_clk_ops)) - *ops = sh73180_clk_ops[idx]; -} - --- 0001/arch/sh/kernel/cpu/sh4a/setup-sh73180.c +++ /dev/null 2007-07-17 09:16:46.626928230 +0900 @@ -1,43 +0,0 @@ -/* - * SH73180 Setup - * - * Copyright (C) 2006 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#include <linux/platform_device.h> -#include <linux/init.h> -#include <linux/serial.h> -#include <asm/sci.h> - -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase = 0xffe80000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 80, 81, 83, 82 }, - }, { - .flags = 0, - } -}; - -static struct platform_device sci_device = { - .name = "sh-sci", - .id = -1, - .dev = { - .platform_data = sci_platform_data, - }, -}; - -static struct platform_device *sh73180_devices[] __initdata = { - &sci_device, -}; - -static int __init sh73180_devices_setup(void) -{ - return platform_add_devices(sh73180_devices, - ARRAY_SIZE(sh73180_devices)); -} -__initcall(sh73180_devices_setup); --- 0003/arch/sh/kernel/setup.c +++ work/arch/sh/kernel/setup.c 2007-07-24 19:49:18.000000000 +0900 @@ -283,7 +283,7 @@ static const char *cpu_name[] = { [CPU_SH7729] = "SH7729", [CPU_SH7750] = "SH7750", [CPU_SH7750S] = "SH7750S", [CPU_SH7750R] = "SH7750R", [CPU_SH7751] = "SH7751", [CPU_SH7751R] = "SH7751R", - [CPU_SH7760] = "SH7760", [CPU_SH73180] = "SH73180", + [CPU_SH7760] = "SH7760", [CPU_ST40RA] = "ST40RA", [CPU_ST40GX1] = "ST40GX1", [CPU_SH4_202] = "SH4-202", [CPU_SH4_501] = "SH4-501", [CPU_SH7770] = "SH7770", [CPU_SH7780] = "SH7780", --- 0003/arch/sh/mm/Kconfig +++ work/arch/sh/mm/Kconfig 2007-07-24 19:44:32.000000000 +0900 @@ -198,10 +198,6 @@ config CPU_SUBTYPE_SHX3 # SH4AL-DSP Processor Support -config CPU_SUBTYPE_SH73180 - bool "Support SH73180 processor" - select CPU_SH4AL_DSP - config CPU_SUBTYPE_SH7343 bool "Support SH7343 processor" select CPU_SH4AL_DSP --- 0003/drivers/serial/sh-sci.h +++ work/drivers/serial/sh-sci.h 2007-07-24 19:47:04.000000000 +0900 @@ -82,12 +82,6 @@ # define PBCR 0xa4050102 # define SCSCR_INIT(port) 0x3B # define SCIF_ONLY -#elif defined(CONFIG_CPU_SUBTYPE_SH73180) -# define SCPDR 0xA4050138 /* 16 bit SCIF */ -# define SCSPTR2 SCPDR -# define SCIF_ORER 0x0001 /* overrun error bit */ -# define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1 */ -# define SCIF_ONLY #elif defined(CONFIG_CPU_SUBTYPE_SH7343) # define SCSPTR0 0xffe00010 /* 16 bit SCIF */ # define SCSPTR1 0xffe10010 /* 16 bit SCIF */ @@ -556,11 +550,6 @@ static inline int sci_rxd_in(struct uart return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */ return 1; } -#elif defined(CONFIG_CPU_SUBTYPE_SH73180) -static inline int sci_rxd_in(struct uart_port *port) -{ - return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCIF0 */ -} #elif defined(CONFIG_CPU_SUBTYPE_SH7343) static inline int sci_rxd_in(struct uart_port *port) { --- 0003/include/asm-sh/bugs.h +++ work/include/asm-sh/bugs.h 2007-07-24 19:47:46.000000000 +0900 @@ -39,7 +39,7 @@ static void __init check_bugs(void) *p++ = '4'; *p++ = 'a'; break; - case CPU_SH73180 ... CPU_SH7722: + case CPU_SH7343 ... CPU_SH7722: *p++ = '4'; *p++ = 'a'; *p++ = 'l'; --- 0001/include/asm-sh/cpu-sh4/freq.h +++ work/include/asm-sh/cpu-sh4/freq.h 2007-07-24 19:48:19.000000000 +0900 @@ -10,7 +10,7 @@ #ifndef __ASM_CPU_SH4_FREQ_H #define __ASM_CPU_SH4_FREQ_H -#if defined(CONFIG_CPU_SUBTYPE_SH73180) || defined(CONFIG_CPU_SUBTYPE_SH7722) +#if defined(CONFIG_CPU_SUBTYPE_SH7722) #define FRQCR 0xa4150000 #define VCLKCR 0xa4150004 #define SCLKACR 0xa4150008 --- 0003/include/asm-sh/processor.h +++ work/include/asm-sh/processor.h 2007-07-24 19:47:41.000000000 +0900 @@ -55,7 +55,7 @@ enum cpu_type { CPU_SH7770, CPU_SH7780, CPU_SH7781, CPU_SH7785, CPU_SHX3, /* SH4AL-DSP types */ - CPU_SH73180, CPU_SH7343, CPU_SH7722, + CPU_SH7343, CPU_SH7722, /* Unknown subtype */ CPU_SH_NONE |
From: Paul M. <le...@li...> - 2007-07-25 00:51:50
|
On Tue, Jul 24, 2007 at 11:46:52PM +0900, Magnus Damm wrote: > sh: remove support for sh73180 and solution engine 73180 > > This patch removes old dead code: > - kill off sh73180 cpu support > - get rid of broken solution engine 73180 board support > > Signed-off-by: Magnus Damm <da...@ig...> Looks fine, thanks. |
From: Paul M. <le...@li...> - 2007-07-25 03:10:43
|
On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: > On Tue, Jul 24, 2007 at 11:46:52PM +0900, Magnus Damm wrote: > > sh: remove support for sh73180 and solution engine 73180 > > > > This patch removes old dead code: > > - kill off sh73180 cpu support > > - get rid of broken solution engine 73180 board support > > > > Signed-off-by: Magnus Damm <da...@ig...> > > Looks fine, thanks. > Since we're in the purging mood, perhaps it's also worth looking at some others: - edosk7705 and systemh can likely go, people have had the opportunity to speak up about these, but they seem intent to simply poke away at these out-of-tree. - mpc1211 and sh03 are a bit worrying. These used to see regular maintenance, but have since fallen off. Perhaps the vendor just needs some prodding to wake up, however. - snapgear boards are also unlikely to be revitalized, so that's probably another good candidate. With those out of the way or tidied up, we can also reexamine if we want to rework some of the board layout. The current scheme does not lend itself terribly well to sharing, and I'd also like to get some of the header mess in asm-sh/ tidied up. These will be 2.6.24 issues, though. |
From: Paul M. <le...@li...> - 2007-11-07 07:48:04
|
On Wed, Jul 25, 2007 at 12:10:12PM +0900, Paul Mundt wrote: > On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: > > On Tue, Jul 24, 2007 at 11:46:52PM +0900, Magnus Damm wrote: > > > sh: remove support for sh73180 and solution engine 73180 > > > > > > This patch removes old dead code: > > > - kill off sh73180 cpu support > > > - get rid of broken solution engine 73180 board support > > > > > > Signed-off-by: Magnus Damm <da...@ig...> > > > > Looks fine, thanks. > > > Since we're in the purging mood, perhaps it's also worth looking at some > others: > I've also ripped out the left over ST40 cruft, which has been broken in-tree the majority of the time since its last update, over 3 years ago (at present it randomly breaks randconfigs, which is simply not good form). I'll push the ST40 purge for 2.6.24-rc3, it's basically pretty uninteresting: arch/sh/drivers/pci/Makefile | 1 arch/sh/drivers/pci/pci-st40.c | 488 ----------------------------------------- arch/sh/drivers/pci/pci-st40.h | 136 ----------- arch/sh/kernel/cpu/sh4/probe.c | 8 arch/sh/kernel/setup.c | 1 arch/sh/mm/Kconfig | 21 - drivers/serial/sh-sci.h | 18 - include/asm-sh/processor.h | 2 8 files changed, 3 insertions(+), 672 deletions(-) ST can resurrect the ST40 support for 2.6.25 if they feel like it, or simply continue to keep it out-of-tree. |
From: Magnus D. <mag...@gm...> - 2007-07-25 03:44:07
|
On 7/25/07, David McCullough <Dav...@se...> wrote: > > Jivin Paul Mundt lays it down ... > > On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: > > Since we're in the purging mood, perhaps it's also worth looking at some > > others: > > > > - snapgear boards are also unlikely to be revitalized, so that's > > probably another good candidate. > > How bad is it ? I am running 2.6.22 here on the snapgear boards and > it seems ok. I can send you some diffs if you want ? As of 2.6.23-rc1: The snapgear_defconfig seems to be out of sync with the rest of the Kconfig - both SH7751 and SH7751R are defined in the defconfig - this leads to that only SH7751 is selected which in turn leads to that CONFIG_SH_SECUREEDGE5410 never gets set. So the defconfig doesn't select the right board. I sent patches fixing a similar issue on r2d this a while ago. If the right board is selected using menuconfig, then arch/sh/boards/snapgear/setup.c doesn't compile... So patches for defconfig and board support are more than welcome. =) Also, the cpu-specific interrupt code has been rewritten for 2.6.23-rc1. The new code seems to work just fine on the r2d board, but it wouldn't hurt with some testing on other 7750-ish boards. Thanks! / magnus |
From: Paul M. <le...@li...> - 2007-07-25 03:51:55
|
On Wed, Jul 25, 2007 at 12:44:04PM +0900, Magnus Damm wrote: > On 7/25/07, David McCullough <Dav...@se...> wrote: > >Jivin Paul Mundt lays it down ... > >> On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: > >> Since we're in the purging mood, perhaps it's also worth looking at some > >> others: > >> > >> - snapgear boards are also unlikely to be revitalized, so that's > >> probably another good candidate. > > > >How bad is it ? I am running 2.6.22 here on the snapgear boards and > >it seems ok. I can send you some diffs if you want ? > > As of 2.6.23-rc1: > > The snapgear_defconfig seems to be out of sync with the rest of the > Kconfig - both SH7751 and SH7751R are defined in the defconfig - this > leads to that only SH7751 is selected which in turn leads to that > CONFIG_SH_SECUREEDGE5410 never gets set. So the defconfig doesn't > select the right board. I sent patches fixing a similar issue on r2d > this a while ago. > > If the right board is selected using menuconfig, then > arch/sh/boards/snapgear/setup.c doesn't compile... > > So patches for defconfig and board support are more than welcome. =) > The defconfig parts are my fault, due to a lot of reordering for the machvec tidying. So people do need to make sure there are no surprises (a simple make oldconfig on -rc1 will leave quite a few boards in a not entirely expected state). > Also, the cpu-specific interrupt code has been rewritten for > 2.6.23-rc1. The new code seems to work just fine on the r2d board, but > it wouldn't hurt with some testing on other 7750-ish boards. > Yes, it's basically just the board bits and some other stuff that are out of sync. The rtc stubs have been broken for some time, and there hasn't been any feedback on this, either. If folks are actually using this board in recent kernels, then patches bringing it back in sync are certainly welcome ;-) I'd also like to add defacto board maintainers to MAINTAINERS so it's more obvious who to hassle when the board stops working. Stuff that's actively being used, we can roll in to the nightly builds so we can watch out for regressions and keep folks notified as to the status of their board in current git kernels. |
From: Magnus D. <mag...@gm...> - 2007-07-25 04:08:21
|
On 7/25/07, David McCullough <Dav...@se...> wrote: > Jivin Magnus Damm lays it down ... > > On 7/25/07, David McCullough <Dav...@se...> wrote: > > > > > >Jivin Paul Mundt lays it down ... > > >> On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: > > >> Since we're in the purging mood, perhaps it's also worth looking at some > > >> others: > > >> > > >> - snapgear boards are also unlikely to be revitalized, so that's > > >> probably another good candidate. > > > > > >How bad is it ? I am running 2.6.22 here on the snapgear boards and > > >it seems ok. I can send you some diffs if you want ? > > > > As of 2.6.23-rc1: > > > > The snapgear_defconfig seems to be out of sync with the rest of the > > Kconfig - both SH7751 and SH7751R are defined in the defconfig - this > > leads to that only SH7751 is selected which in turn leads to that > > CONFIG_SH_SECUREEDGE5410 never gets set. So the defconfig doesn't > > select the right board. I sent patches fixing a similar issue on r2d > > this a while ago. > > The CONFIG_SH_SECUREEDGE5410 define can (well used to) handle both > 7751 and 7751R CPU's and the kernel adjusted according to whatever HW it > booted on. > > Is this still possible ? According to arch/sh/Kconfig, only 7751R is supported as of 2.6.23-rc1. So if the board can be populated with 7751 or 7751R, then the Kconfig needs to be updated. And maybe we should have two defconfigs to make sure that both combinations build... > > Also, the cpu-specific interrupt code has been rewritten for > > 2.6.23-rc1. The new code seems to work just fine on the r2d board, but > > it wouldn't hurt with some testing on other 7750-ish boards. > > Ok, then I guess I need to be on 2.6.23-rc1, where is the git tree I > should clone to make patches against (yes I should check for the doc :-) I built my stuff on top of 2.6.23-rc1 yesterday, but since then a few patches have been accepted by Paul. So use the sh-2.6 tree: http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=summary / magnus |
From: Paul M. <le...@li...> - 2007-07-25 04:10:16
|
On Wed, Jul 25, 2007 at 02:01:40PM +1000, David McCullough wrote: > > Jivin Magnus Damm lays it down ... > > On 7/25/07, David McCullough <Dav...@se...> wrote: > > > > > >Jivin Paul Mundt lays it down ... > > >> On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: > > >> Since we're in the purging mood, perhaps it's also worth looking at some > > >> others: > > >> > > >> - snapgear boards are also unlikely to be revitalized, so that's > > >> probably another good candidate. > > > > > >How bad is it ? I am running 2.6.22 here on the snapgear boards and > > >it seems ok. I can send you some diffs if you want ? > > > > As of 2.6.23-rc1: > > > > The snapgear_defconfig seems to be out of sync with the rest of the > > Kconfig - both SH7751 and SH7751R are defined in the defconfig - this > > leads to that only SH7751 is selected which in turn leads to that > > CONFIG_SH_SECUREEDGE5410 never gets set. So the defconfig doesn't > > select the right board. I sent patches fixing a similar issue on r2d > > this a while ago. > > The CONFIG_SH_SECUREEDGE5410 define can (well used to) handle both > 7751 and 7751R CPU's and the kernel adjusted according to whatever HW it > booted on. > > Is this still possible ? > Yes, though at the moment it just expects 7751R. You can add 7751 to the depends on, though. > Ok, then I guess I need to be on 2.6.23-rc1, where is the git tree I > should clone to make patches against (yes I should check for the doc :-) > You can either use Linus's tree directly or sh-2.6.git: git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git I usually have Linus pull once a week or so, so either one is fine. There are a few things there that will be bound for -rc2 already. In any event, we'll certainly keep the board around now that we know what the intent is, which is usually what these sorts of board removal suggestions aim to stir up :-) |
From: Jamie L. <le...@tw...> - 2007-07-29 02:54:48
|
On Wed, Jul 25, 2007 at 12:44:04PM +0900, Magnus Damm wrote: [...] > Also, the cpu-specific interrupt code has been rewritten for > 2.6.23-rc1. The new code seems to work just fine on the r2d board, but > it wouldn't hurt with some testing on other 7750-ish boards. I've just tested 2.6.23-rc1-ge8a53af7 (lastest sh-2.6.git) on the titan 7751R board and everything looks to be working just fine. Also the "sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4" change has fixed the "scheduling while atomic" messages I was seeing when running from NFS-root. boot log: http://twibble.org/dist/misc/titan-boot-ge8a53af7.txt config: http://twibble.org/dist/misc/titan-config-ge8a53af7.txt Thanks. -- Jamie Lenehan <le...@tw...> |
From: Paul M. <le...@li...> - 2007-07-30 22:18:20
|
On Sun, Jul 29, 2007 at 12:54:36PM +1000, Jamie Lenehan wrote: > On Wed, Jul 25, 2007 at 12:44:04PM +0900, Magnus Damm wrote: > [...] > > Also, the cpu-specific interrupt code has been rewritten for > > 2.6.23-rc1. The new code seems to work just fine on the r2d board, but > > it wouldn't hurt with some testing on other 7750-ish boards. > > I've just tested 2.6.23-rc1-ge8a53af7 (lastest sh-2.6.git) on the > titan 7751R board and everything looks to be working just fine. > > Also the "sh: Add kmap_coherent()/kunmap_coherent() interface for > SH-4" change has fixed the "scheduling while atomic" messages I was > seeing when running from NFS-root. > > boot log: http://twibble.org/dist/misc/titan-boot-ge8a53af7.txt > config: http://twibble.org/dist/misc/titan-config-ge8a53af7.txt > That's good to hear. Thanks for testing, Jamie. |
From: Stuart M. <stu...@st...> - 2007-11-07 11:20:01
|
Paul Mundt wrote: > On Wed, Jul 25, 2007 at 12:10:12PM +0900, Paul Mundt wrote: >> On Wed, Jul 25, 2007 at 09:51:22AM +0900, Paul Mundt wrote: >>> On Tue, Jul 24, 2007 at 11:46:52PM +0900, Magnus Damm wrote: >>>> sh: remove support for sh73180 and solution engine 73180 >>>> >>>> This patch removes old dead code: >>>> - kill off sh73180 cpu support >>>> - get rid of broken solution engine 73180 board support >>>> >>>> Signed-off-by: Magnus Damm <da...@ig...> >>> Looks fine, thanks. >>> >> Since we're in the purging mood, perhaps it's also worth looking at some >> others: >> > I've also ripped out the left over ST40 cruft, which has been broken > in-tree the majority of the time since its last update, over 3 years ago > (at present it randomly breaks randconfigs, which is simply not good > form). I'll push the ST40 purge for 2.6.24-rc3, it's basically pretty > uninteresting: > > arch/sh/drivers/pci/Makefile | 1 > arch/sh/drivers/pci/pci-st40.c | 488 ----------------------------------------- arch/sh/drivers/pci/pci-st40.h | 136 ----------- > arch/sh/kernel/cpu/sh4/probe.c | 8 > arch/sh/kernel/setup.c | 1 > arch/sh/mm/Kconfig | 21 - > drivers/serial/sh-sci.h | 18 - > include/asm-sh/processor.h | 2 > 8 files changed, 3 insertions(+), 672 deletions(-) > > ST can resurrect the ST40 support for 2.6.25 if they feel like it, or > simply continue to keep it out-of-tree. As of last week I finally got all our stuff working on a 2.6.23 kernel. It still needs a bit of tidying, but I was planning to start submitting it over the next few weeks. But what was in the git tree was so out of date, removing it is no great loss! Stuart |
From: Paul M. <le...@li...> - 2007-11-07 11:45:26
|
On Wed, Nov 07, 2007 at 11:19:11AM +0000, Stuart MENEFY wrote: > Paul Mundt wrote: > > ST can resurrect the ST40 support for 2.6.25 if they feel like it, or > > simply continue to keep it out-of-tree. > > As of last week I finally got all our stuff working on a 2.6.23 kernel. > It still needs a bit of tidying, but I was planning to start submitting > it over the next few weeks. > Ho hum, sh-2.6.24 $ git diff --shortstat v2.6.23.. 9704 files changed, 750316 insertions(+), 462288 deletions(-) You might want to re-examine your development methodology. Fork-driven development doesn't scale, as you've probably realized :-) Hopefully once it's all synced up it will be less of a pain to keep on top of! |