Menu
▾
▴
linuxsh-cvs
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(47) |
Sep
(524) |
Oct
(365) |
Nov
(277) |
Dec
(178) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(431) |
Feb
(340) |
Mar
(249) |
Apr
(678) |
May
(407) |
Jun
(449) |
Jul
(712) |
Aug
(391) |
Sep
(205) |
Oct
(692) |
Nov
(45) |
Dec
(61) |
| 2002 |
Jan
(237) |
Feb
(28) |
Mar
(138) |
Apr
(59) |
May
(75) |
Jun
(65) |
Jul
|
Aug
(26) |
Sep
(3) |
Oct
(294) |
Nov
(193) |
Dec
(121) |
| 2003 |
Jan
(160) |
Feb
(2) |
Mar
(277) |
Apr
(71) |
May
(252) |
Jun
(82) |
Jul
(211) |
Aug
(184) |
Sep
(105) |
Oct
(129) |
Nov
(46) |
Dec
(13) |
| 2004 |
Jan
(37) |
Feb
(113) |
Mar
(115) |
Apr
(115) |
May
(45) |
Jun
(141) |
Jul
(13) |
Aug
(82) |
Sep
(12) |
Oct
(69) |
Nov
|
Dec
(37) |
| 2005 |
Jan
(18) |
Feb
(5) |
Mar
(79) |
Apr
(9) |
May
(47) |
Jun
(60) |
Jul
(10) |
Aug
(89) |
Sep
(28) |
Oct
(65) |
Nov
(54) |
Dec
(23) |
| 2006 |
Jan
(198) |
Feb
(51) |
Mar
(23) |
Apr
|
May
|
Jun
(6) |
Jul
(103) |
Aug
(217) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul M. <le...@us...> - 2006-08-07 10:10:39
|
Update of /cvsroot/linuxsh/linux/drivers/serial In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29960/drivers/serial Modified Files: sh-sci.c sh-sci.h Log Message: SH7343 SCIF support. Index: sh-sci.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/serial/sh-sci.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- sh-sci.c 7 Aug 2006 07:50:16 -0000 1.49 +++ sh-sci.c 7 Aug 2006 10:10:36 -0000 1.50 @@ -329,7 +329,9 @@ if (cflag & CRTSCTS) { fcr_val |= SCFCR_MCE; } else { -#ifdef CONFIG_CPU_SUBTYPE_SH7780 +#ifdef CONFIG_CPU_SUBTYPE_SH7343 + /* Nothing */ +#elif defined(CONFIG_CPU_SUBTYPE_SH7780) ctrl_outw(0x0080, SCSPTR0); /* Set RTS = 1 */ #else ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */ Index: sh-sci.h =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/serial/sh-sci.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- sh-sci.h 7 Aug 2006 07:50:16 -0000 1.25 +++ sh-sci.h 7 Aug 2006 10:10:36 -0000 1.26 @@ -84,6 +84,13 @@ # 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 */ +# define SCSPTR2 0xffe20010 /* 16 bit SCIF */ +# define SCSPTR3 0xffe30010 /* 16 bit SCIF */ +# define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0,CKE=1 */ +# define SCIF_ONLY #elif defined(CONFIG_CPU_SUBTYPE_SH4_202) # define SCSPTR2 0xffe80020 /* 16 bit SCIF */ # define SCIF_ORER 0x0001 /* overrun error bit */ @@ -487,6 +494,19 @@ { return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCIF0 */ } +#elif defined(CONFIG_CPU_SUBTYPE_SH7343) +static inline int sci_rxd_in(struct uart_port *port) +{ + if (port->mapbase == 0xffe00000) + return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */ + if (port->mapbase == 0xffe10000) + return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */ + if (port->mapbase == 0xffe20000) + return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */ + if (port->mapbase == 0xffe30000) + return ctrl_inw(SCSPTR3) & 0x0001 ? 1 : 0; /* SCIF */ + return 1; +} #elif defined(CONFIG_CPU_SUBTYPE_ST40STB1) static inline int sci_rxd_in(struct uart_port *port) { |
|
From: Paul M. <le...@us...> - 2006-08-07 09:47:18
|
Update of /cvsroot/linuxsh/linux/arch/sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20225/arch/sh Modified Files: Kconfig Log Message: Add SH7343 CPU subtype support. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/Kconfig,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- Kconfig 7 Aug 2006 09:27:51 -0000 1.113 +++ Kconfig 7 Aug 2006 09:47:14 -0000 1.114 @@ -361,8 +361,9 @@ int "Peripheral clock frequency (in Hz)" default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780 default "60000000" if CPU_SUBTYPE_SH7751 - default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760 - default "27000000" if CPU_SUBTYPE_SH73180 + default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \ + CPU_SUBTYPE_SH7760 + default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343 default "66000000" if CPU_SUBTYPE_SH4_202 help This option is used to specify the peripheral clock frequency. |
|
From: Paul M. <le...@us...> - 2006-08-07 09:47:18
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20225/include/asm-sh Modified Files: irq-sh73180.h irq.h processor.h Added Files: irq-sh7343.h Log Message: Add SH7343 CPU subtype support. --- NEW FILE: irq-sh7343.h --- #ifndef __ASM_SH_IRQ_SH7343_H #define __ASM_SH_IRQ_SH7343_H /* * linux/include/asm-sh/irq-sh7343.h * * Copyright (C) 2006 Kenati Technologies Inc. * Andre Mccurdy <an...@ke...> * Ranjit Deshpande <ra...@ke...> */ #undef INTC_IPRA #undef INTC_IPRB #undef INTC_IPRC #undef INTC_IPRD #undef DMTE0_IRQ #undef DMTE1_IRQ #undef DMTE2_IRQ #undef DMTE3_IRQ #undef DMTE4_IRQ #undef DMTE5_IRQ #undef DMTE6_IRQ #undef DMTE7_IRQ #undef DMAE_IRQ #undef DMA_IPR_ADDR #undef DMA_IPR_POS #undef DMA_PRIORITY #undef INTC_IMCR0 #undef INTC_IMCR1 #undef INTC_IMCR2 #undef INTC_IMCR3 #undef INTC_IMCR4 #undef INTC_IMCR5 #undef INTC_IMCR6 #undef INTC_IMCR7 #undef INTC_IMCR8 #undef INTC_IMCR9 #undef INTC_IMCR10 #define INTC_IPRA 0xA4080000UL #define INTC_IPRB 0xA4080004UL #define INTC_IPRC 0xA4080008UL #define INTC_IPRD 0xA408000CUL #define INTC_IPRE 0xA4080010UL #define INTC_IPRF 0xA4080014UL #define INTC_IPRG 0xA4080018UL #define INTC_IPRH 0xA408001CUL #define INTC_IPRI 0xA4080020UL #define INTC_IPRJ 0xA4080024UL #define INTC_IPRK 0xA4080028UL #define INTC_IPRL 0xA408002CUL #define INTC_IMR0 0xA4080080UL #define INTC_IMR1 0xA4080084UL #define INTC_IMR2 0xA4080088UL #define INTC_IMR3 0xA408008CUL #define INTC_IMR4 0xA4080090UL #define INTC_IMR5 0xA4080094UL #define INTC_IMR6 0xA4080098UL #define INTC_IMR7 0xA408009CUL #define INTC_IMR8 0xA40800A0UL #define INTC_IMR9 0xA40800A4UL #define INTC_IMR10 0xA40800A8UL #define INTC_IMR11 0xA40800ACUL #define INTC_IMCR0 0xA40800C0UL #define INTC_IMCR1 0xA40800C4UL #define INTC_IMCR2 0xA40800C8UL #define INTC_IMCR3 0xA40800CCUL #define INTC_IMCR4 0xA40800D0UL #define INTC_IMCR5 0xA40800D4UL #define INTC_IMCR6 0xA40800D8UL #define INTC_IMCR7 0xA40800DCUL #define INTC_IMCR8 0xA40800E0UL #define INTC_IMCR9 0xA40800E4UL #define INTC_IMCR10 0xA40800E8UL #define INTC_IMCR11 0xA40800ECUL #define INTC_ICR0 0xA4140000UL #define INTC_ICR1 0xA414001CUL #define INTMSK0 0xa4140044 #define INTMSKCLR0 0xa4140064 #define INTC_INTPRI0 0xa4140010 /* NOTE: *_IRQ = (INTEVT2 - 0x200)/0x20 */ /* TMU0 */ #define TMU0_IRQ 16 #define TMU0_IPR_ADDR INTC_IPRA #define TMU0_IPR_POS 3 #define TMU0_PRIORITY 2 #define TIMER_IRQ 16 #define TIMER_IPR_ADDR INTC_IPRA #define TIMER_IPR_POS 3 #define TIMER_PRIORITY 2 /* TMU1 */ #define TMU1_IRQ 17 #define TMU1_IPR_ADDR INTC_IPRA #define TMU1_IPR_POS 2 #define TMU1_PRIORITY 2 /* TMU2 */ #define TMU2_IRQ 18 #define TMU2_IPR_ADDR INTC_IPRA #define TMU2_IPR_POS 1 #define TMU2_PRIORITY 2 /* LCDC */ #define LCDC_IRQ 28 #define LCDC_IPR_ADDR INTC_IPRB #define LCDC_IPR_POS 2 #define LCDC_PRIORITY 2 /* VIO (Video I/O) */ #define CEU_IRQ 52 #define BEU_IRQ 53 #define VEU_IRQ 54 #define VOU_IRQ 55 #define VIO_IPR_ADDR INTC_IPRE #define VIO_IPR_POS 2 #define VIO_PRIORITY 2 /* MFI (Multi Functional Interface) */ #define MFI_IRQ 56 #define MFI_IPR_ADDR INTC_IPRE #define MFI_IPR_POS 1 #define MFI_PRIORITY 2 /* VPU (Video Processing Unit) */ #define VPU_IRQ 60 #define VPU_IPR_ADDR INTC_IPRE #define VPU_IPR_POS 0 #define VPU_PRIORITY 2 /* 3DG */ #define TDG_IRQ 63 #define TDG_IPR_ADDR INTC_IPRJ #define TDG_IPR_POS 2 #define TDG_PRIORITY 2 /* DMAC(1) */ #define DMTE0_IRQ 48 #define DMTE1_IRQ 49 #define DMTE2_IRQ 50 #define DMTE3_IRQ 51 #define DMA1_IPR_ADDR INTC_IPRE #define DMA1_IPR_POS 3 #define DMA1_PRIORITY 7 /* DMAC(2) */ #define DMTE4_IRQ 76 #define DMTE5_IRQ 77 #define DMA2_IPR_ADDR INTC_IPRF #define DMA2_IPR_POS 2 #define DMA2_PRIORITY 7 /* SCIF0 */ #define SCIF_ERI_IRQ 80 #define SCIF_RXI_IRQ 81 #define SCIF_BRI_IRQ 82 #define SCIF_TXI_IRQ 83 #define SCIF_IPR_ADDR INTC_IPRG #define SCIF_IPR_POS 3 #define SCIF_PRIORITY 3 /* SIOF0 */ #define SIOF0_IRQ 84 #define SIOF0_IPR_ADDR INTC_IPRH #define SIOF0_IPR_POS 3 #define SIOF0_PRIORITY 3 /* FLCTL (Flash Memory Controller) */ #define FLSTE_IRQ 92 #define FLTEND_IRQ 93 #define FLTRQ0_IRQ 94 #define FLTRQ1_IRQ 95 #define FLCTL_IPR_ADDR INTC_IPRH #define FLCTL_IPR_POS 1 #define FLCTL_PRIORITY 3 /* IIC(0) (IIC Bus Interface) */ #define IIC0_ALI_IRQ 96 #define IIC0_TACKI_IRQ 97 #define IIC0_WAITI_IRQ 98 #define IIC0_DTEI_IRQ 99 #define IIC0_IPR_ADDR INTC_IPRH #define IIC0_IPR_POS 0 #define IIC0_PRIORITY 3 /* IIC(1) (IIC Bus Interface) */ #define IIC1_ALI_IRQ 44 #define IIC1_TACKI_IRQ 45 #define IIC1_WAITI_IRQ 46 #define IIC1_DTEI_IRQ 47 #define IIC1_IPR_ADDR INTC_IPRI #define IIC1_IPR_POS 0 #define IIC1_PRIORITY 3 /* SIO0 */ #define SIO0_IRQ 88 #define SIO0_IPR_ADDR INTC_IPRI #define SIO0_IPR_POS 3 #define SIO0_PRIORITY 3 /* SDHI */ #define SDHI_SDHII0_IRQ 100 #define SDHI_SDHII1_IRQ 101 #define SDHI_SDHII2_IRQ 102 #define SDHI_SDHII3_IRQ 103 #define SDHI_IPR_ADDR INTC_IPRK #define SDHI_IPR_POS 0 #define SDHI_PRIORITY 3 /* SIU (Sound Interface Unit) */ #define SIU_IRQ 108 #define SIU_IPR_ADDR INTC_IPRJ #define SIU_IPR_POS 1 #define SIU_PRIORITY 3 #define PORT_PACR 0xA4050100UL #define PORT_PBCR 0xA4050102UL #define PORT_PCCR 0xA4050104UL #define PORT_PDCR 0xA4050106UL #define PORT_PECR 0xA4050108UL #define PORT_PFCR 0xA405010AUL #define PORT_PGCR 0xA405010CUL #define PORT_PHCR 0xA405010EUL #define PORT_PJCR 0xA4050110UL #define PORT_PKCR 0xA4050112UL #define PORT_PLCR 0xA4050114UL #define PORT_SCPCR 0xA4050116UL #define PORT_PMCR 0xA4050118UL #define PORT_PNCR 0xA405011AUL #define PORT_PQCR 0xA405011CUL #define PORT_PRCR 0xA405011EUL #define PORT_PTCR 0xA405014CUL #define PORT_PUCR 0xA405014EUL #define PORT_PVCR 0xA4050150UL #define PORT_PSELA 0xA4050140UL #define PORT_PSELB 0xA4050142UL #define PORT_PSELC 0xA4050144UL #define PORT_PSELE 0xA4050158UL #define PORT_HIZCRA 0xA4050146UL #define PORT_HIZCRB 0xA4050148UL #define PORT_DRVCR 0xA405014AUL #define PORT_PADR 0xA4050120UL #define PORT_PBDR 0xA4050122UL #define PORT_PCDR 0xA4050124UL #define PORT_PDDR 0xA4050126UL #define PORT_PEDR 0xA4050128UL #define PORT_PFDR 0xA405012AUL #define PORT_PGDR 0xA405012CUL #define PORT_PHDR 0xA405012EUL #define PORT_PJDR 0xA4050130UL #define PORT_PKDR 0xA4050132UL #define PORT_PLDR 0xA4050134UL #define PORT_SCPDR 0xA4050136UL #define PORT_PMDR 0xA4050138UL #define PORT_PNDR 0xA405013AUL #define PORT_PQDR 0xA405013CUL #define PORT_PRDR 0xA405013EUL #define PORT_PTDR 0xA405016CUL #define PORT_PUDR 0xA405016EUL #define PORT_PVDR 0xA4050170UL #define IRQ0_IRQ 32 #define IRQ1_IRQ 33 #define IRQ2_IRQ 34 #define IRQ3_IRQ 35 #define IRQ4_IRQ 36 #define IRQ5_IRQ 37 #define IRQ6_IRQ 38 #define IRQ7_IRQ 39 #define INTPRI00 0xA4140010UL #define IRQ0_IPR_ADDR INTPRI00 #define IRQ1_IPR_ADDR INTPRI00 #define IRQ2_IPR_ADDR INTPRI00 #define IRQ3_IPR_ADDR INTPRI00 #define IRQ4_IPR_ADDR INTPRI00 #define IRQ5_IPR_ADDR INTPRI00 #define IRQ6_IPR_ADDR INTPRI00 #define IRQ7_IPR_ADDR INTPRI00 #define IRQ0_IPR_POS 7 #define IRQ1_IPR_POS 6 #define IRQ2_IPR_POS 5 #define IRQ3_IPR_POS 4 #define IRQ4_IPR_POS 3 #define IRQ5_IPR_POS 2 #define IRQ6_IPR_POS 1 #define IRQ7_IPR_POS 0 #define IRQ0_PRIORITY 1 #define IRQ1_PRIORITY 1 #define IRQ2_PRIORITY 1 #define IRQ3_PRIORITY 1 #define IRQ4_PRIORITY 1 #define IRQ5_PRIORITY 1 #define IRQ6_PRIORITY 1 #define IRQ7_PRIORITY 1 #endif /* __ASM_SH_IRQ_SH7343_H */ Index: irq-sh73180.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/irq-sh73180.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- irq-sh73180.h 8 Jan 2006 12:22:58 -0000 1.2 +++ irq-sh73180.h 7 Aug 2006 09:47:14 -0000 1.3 @@ -311,6 +311,4 @@ #define IRQ6_PRIORITY 1 #define IRQ7_PRIORITY 1 -int shmse_irq_demux(int irq); - #endif /* __ASM_SH_IRQ_SH73180_H */ Index: irq.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/irq.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- irq.h 7 Aug 2006 07:50:16 -0000 1.33 +++ irq.h 7 Aug 2006 09:47:14 -0000 1.34 @@ -280,7 +280,8 @@ #elif defined(CONFIG_CPU_SUBTYPE_ST40STB1) # define ONCHIP_NR_IRQS 144 #elif defined(CONFIG_CPU_SUBTYPE_SH7300) || \ - defined(CONFIG_CPU_SUBTYPE_SH73180) + defined(CONFIG_CPU_SUBTYPE_SH73180) || \ + defined(CONFIG_CPU_SUBTYPE_SH7343) # define ONCHIP_NR_IRQS 109 #elif defined(CONFIG_CPU_SUBTYPE_SH7780) # define ONCHIP_NR_IRQS 111 @@ -704,6 +705,8 @@ #endif +extern int shmse_irq_demux(int irq); + static inline int generic_irq_demux(int irq) { return irq; @@ -719,4 +722,8 @@ #include <asm/irq-sh73180.h> #endif +#if defined(CONFIG_CPU_SUBTYPE_SH7343) +#include <asm/irq-sh7343.h> +#endif + #endif /* __ASM_SH_IRQ_H */ Index: processor.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/processor.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- processor.h 7 Aug 2006 07:50:17 -0000 1.39 +++ processor.h 7 Aug 2006 09:47:14 -0000 1.40 @@ -46,7 +46,7 @@ /* SH-4 types */ CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R, CPU_SH7760, CPU_ST40RA, CPU_ST40GX1, CPU_SH4_202, CPU_SH4_501, - CPU_SH73180, CPU_SH7770, CPU_SH7780, CPU_SH7781, + CPU_SH73180, CPU_SH7343, CPU_SH7770, CPU_SH7780, CPU_SH7781, /* Unknown subtype */ CPU_SH_NONE |
|
From: Paul M. <le...@us...> - 2006-08-07 09:47:17
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh4 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20225/arch/sh/kernel/cpu/sh4 Modified Files: ex.S probe.c Log Message: Add SH7343 CPU subtype support. Index: ex.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh4/ex.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ex.S 21 Aug 2005 23:47:31 -0000 1.3 +++ ex.S 7 Aug 2006 09:47:14 -0000 1.4 @@ -39,9 +39,9 @@ #endif #if defined(CONFIG_SH_FPU) .long do_fpu_error /* 120 */ -#else +#else .long exception_error /* 120 */ -#endif +#endif .long exception_error /* 140 */ .long system_call ! Unconditional Trap /* 160 */ .long exception_error ! reserved_instruction (filled by trap_init) /* 180 */ @@ -124,19 +124,27 @@ .long do_IRQ ! 45 dmte5 .long do_IRQ ! 46 dmte6 .long do_IRQ ! 47 dmte7 /* 7E0 */ +#elif defined(CONFIG_CPU_SUBTYPE_SH7343) + .long do_IRQ ! 44 IIC1 ali /* 780 */ + .long do_IRQ ! 45 tacki + .long do_IRQ ! 46 waiti + .long do_IRQ ! 47 dtei /* 7E0 */ + .long do_IRQ ! 48 DMAC dei0 /* 800 */ + .long do_IRQ ! 49 dei1 /* 820 */ #else .long exception_error ! 44 /* 780 */ .long exception_error ! 45 .long exception_error ! 46 .long exception_error ! 47 #endif -#if defined(CONFIG_SH_FPU) +#if defined(CONFIG_SH_FPU) .long do_fpu_state_restore ! 48 /* 800 */ .long do_fpu_state_restore ! 49 /* 820 */ -#else +#elif !defined(CONFIG_CPU_SUBTYPE_SH7343) && \ + !defined(CONFIG_CPU_SUBTYPE_SH73180) .long exception_error .long exception_error -#endif +#endif #if defined(CONFIG_CPU_SUBTYPE_SH7751) .long exception_error /* 840 */ .long exception_error @@ -226,7 +234,7 @@ .long exception_error .long do_IRQ ! ADC adi .long do_IRQ ! CMT cmti /* FA0 */ -#elif defined(CONFIG_CPU_SUBTYPE_SH73180) +#elif defined(CONFIG_CPU_SUBTYPE_SH73180) || defined(CONFIG_CPU_SUBTYPE_SH7343) .long do_IRQ ! 50 0x840 .long do_IRQ ! 51 0x860 .long do_IRQ ! 52 0x880 Index: probe.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh4/probe.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- probe.c 8 Oct 2005 22:08:40 -0000 1.6 +++ probe.c 7 Aug 2006 09:47:14 -0000 1.7 @@ -3,7 +3,7 @@ * * CPU Subtype Probing for SH-4. * - * Copyright (C) 2001 - 2005 Paul Mundt + * Copyright (C) 2001 - 2006 Paul Mundt * Copyright (C) 2003 Richard Curnow * * This file is subject to the terms and conditions of the GNU General Public @@ -76,12 +76,6 @@ cpu_data->type = CPU_SH73180; cpu_data->icache.ways = 4; cpu_data->dcache.ways = 4; - - /* - * XXX: Double check this, none of the SH-4A/SH-4AL processors - * should have this, as it's essentially a legacy thing. - */ - cpu_data->flags |= CPU_HAS_PTEA; break; case 0x2001: case 0x2004: @@ -89,8 +83,7 @@ cpu_data->icache.ways = 4; cpu_data->dcache.ways = 4; - /* Same note as above applies here for PTEA */ - cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA; + cpu_data->flags |= CPU_HAS_FPU; break; case 0x2006: case 0x200A: @@ -104,6 +97,12 @@ cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PERF_COUNTER; break; + case 0x3000: + case 0x3003: + cpu_data->type = CPU_SH7343; + cpu_data->icache.ways = 4; + cpu_data->dcache.ways = 4; + break; case 0x8000: cpu_data->type = CPU_ST40RA; cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA; |
|
From: Paul M. <le...@us...> - 2006-08-07 09:47:17
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20225/arch/sh/kernel Modified Files: setup.c Log Message: Add SH7343 CPU subtype support. Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/setup.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- setup.c 7 Aug 2006 07:50:16 -0000 1.57 +++ setup.c 7 Aug 2006 09:47:14 -0000 1.58 @@ -403,7 +403,8 @@ [CPU_ST40RA] = "ST40RA", [CPU_ST40GX1] = "ST40GX1", [CPU_SH4_202] = "SH4-202", [CPU_SH4_501] = "SH4-501", [CPU_SH7770] = "SH7770", [CPU_SH7780] = "SH7780", - [CPU_SH7781] = "SH7781", [CPU_SH_NONE] = "Unknown" + [CPU_SH7781] = "SH7781", [CPU_SH7343] = "SH7343", + [CPU_SH_NONE] = "Unknown" }; const char *get_cpu_subtype(void) |
|
From: Paul M. <le...@us...> - 2006-08-07 09:47:17
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20225/arch/sh/mm Modified Files: Kconfig Log Message: Add SH7343 CPU subtype support. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/Kconfig,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Kconfig 7 Aug 2006 08:10:59 -0000 1.15 +++ Kconfig 7 Aug 2006 09:47:14 -0000 1.16 @@ -148,6 +148,10 @@ bool "Support SH73180 processor" select CPU_SH4A +config CPU_SUBTYPE_SH7343 + bool "Support SH7343 processor" + select CPU_SH4A + config CPU_SUBTYPE_SH7770 bool "Support SH7770 processor" select CPU_SH4A |
|
From: Paul M. <le...@us...> - 2006-08-07 09:27:54
|
Update of /cvsroot/linuxsh/linux/arch/sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13071/arch/sh Modified Files: Kconfig Log Message: Support CONFIG_SH_DSP for all CPUs, we can do run-time probing. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/Kconfig,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- Kconfig 7 Aug 2006 08:14:02 -0000 1.112 +++ Kconfig 7 Aug 2006 09:27:51 -0000 1.113 @@ -289,12 +289,12 @@ config SH_DSP bool "DSP support" - depends on !CPU_SH4 default y help Selecting this option will enable support for SH processors that - have DSP units (ie, SH2-DSP and SH3-DSP). It is safe to say Y here - by default, as the existance of the DSP will be probed at runtime. + have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP). It is safe to + say Y here by default, as the existance of the DSP will be probed at + runtime. This option must be set in order to enable the DSP. |
|
From: Paul M. <le...@us...> - 2006-08-07 08:15:56
|
Update of /cvsroot/linuxsh/linux/arch/sh/tools In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17258/arch/sh/tools Modified Files: mach-types Log Message: Add sh7710voipgw to the mach-types. Index: mach-types =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/tools/mach-types,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- mach-types 7 Aug 2006 02:02:50 -0000 1.18 +++ mach-types 7 Aug 2006 08:15:49 -0000 1.19 @@ -28,3 +28,4 @@ R7780MP SH_R7780MP TITAN SH_TITAN SHMIN SH_SHMIN +7710VOIPGW SH_7710VOIPGW |
|
From: Paul M. <le...@us...> - 2006-08-07 08:14:06
|
Update of /cvsroot/linuxsh/linux/arch/sh/configs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16452/arch/sh/configs Added Files: sh7710voipgw_defconfig Log Message: Add SH7710 VoIP Gateway board support. --- NEW FILE: sh7710voipgw_defconfig --- # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 # Mon Aug 7 17:07:06 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 # # 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 is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y 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 is not set CONFIG_SLAB=y CONFIG_TINY_SHMEM=y CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set CONFIG_OBSOLETE_INTERMODULE=y # # Loadable module support # CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_KMOD is not set # # Block layer # # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_AS is not set CONFIG_IOSCHED_DEADLINE=y # CONFIG_IOSCHED_CFQ is not set # CONFIG_DEFAULT_AS is not set CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" # # System type # # 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_73180_SOLUTION_ENGINE is not set # 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=y # 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_SH3=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=y # # 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_SH73180 is not set # CONFIG_CPU_SUBTYPE_SH7770 is not set # CONFIG_CPU_SUBTYPE_SH7780 is not set # # Memory management options # CONFIG_MMU=y CONFIG_PAGE_OFFSET=0x80000000 CONFIG_MEMORY_START=0x0c000000 CONFIG_MEMORY_SIZE=0x00800000 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 # # 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_EMU is not set CONFIG_SH_DSP=y # CONFIG_SH_ADC is not set CONFIG_CPU_HAS_INTEVT=y CONFIG_CPU_HAS_SR_RB=y # # Timer support # CONFIG_SH_TMU=y CONFIG_SH_PCLK_FREQ=32768000 # # 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 # # 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_PREEMPT is not set # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # # Boot options # CONFIG_ZERO_PAGE_OFFSET=0x00001000 CONFIG_BOOT_LINK_OFFSET=0x00800000 # CONFIG_UBC_WAKEUP is not set # CONFIG_CMDLINE_BOOL is not set # # Bus options # # CONFIG_PCI is not set # # PCCARD (PCMCIA/CardBus) support # # CONFIG_PCCARD is not set # # 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=y # # Networking options # # CONFIG_NETDEBUG is not set CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y # # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set # # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=y # CONFIG_IP_NF_CT_ACCT is not set # CONFIG_IP_NF_CONNTRACK_MARK is not set # CONFIG_IP_NF_CONNTRACK_EVENTS is not set # CONFIG_IP_NF_CT_PROTO_SCTP is not set CONFIG_IP_NF_FTP=m # CONFIG_IP_NF_IRC is not set # CONFIG_IP_NF_NETBIOS_NS is not set # CONFIG_IP_NF_TFTP is not set # CONFIG_IP_NF_AMANDA is not set CONFIG_IP_NF_PPTP=m # CONFIG_IP_NF_H323 is not set # CONFIG_IP_NF_QUEUE is not set # # DCCP Configuration (EXPERIMENTAL) # # CONFIG_IP_DCCP is not set # # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set # # TIPC Configuration (EXPERIMENTAL) # # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # # QoS and/or fair queueing # CONFIG_NET_SCHED=y CONFIG_NET_SCH_CLK_JIFFIES=y # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set # CONFIG_NET_SCH_CLK_CPU is not set # # Queueing/Scheduling # CONFIG_NET_SCH_CBQ=y # CONFIG_NET_SCH_HTB is not set # CONFIG_NET_SCH_HFSC is not set # CONFIG_NET_SCH_PRIO is not set # CONFIG_NET_SCH_RED is not set # CONFIG_NET_SCH_SFQ is not set # CONFIG_NET_SCH_TEQL is not set # CONFIG_NET_SCH_TBF is not set # CONFIG_NET_SCH_GRED is not set # CONFIG_NET_SCH_DSMARK is not set # CONFIG_NET_SCH_NETEM is not set CONFIG_NET_SCH_INGRESS=y # # Classification # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_TCINDEX=y CONFIG_NET_CLS_ROUTE4=y CONFIG_NET_CLS_ROUTE=y # CONFIG_NET_CLS_FW is not set CONFIG_NET_CLS_U32=y # CONFIG_CLS_U32_PERF is not set # CONFIG_CLS_U32_MARK is not set # CONFIG_NET_CLS_RSVP is not set # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_EMATCH is not set # CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y # CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # # Network testing # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_IEEE80211 is not set # # Device Drivers # # # Generic Driver Options # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # # Connector - unified userspace <-> kernelspace linker # # CONFIG_CONNECTOR is not set # # Memory Technology Devices (MTD) # CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # # User Modules And Translation Layers # CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # # RAM/ROM/Flash chip drivers # CONFIG_MTD_CFI=y # CONFIG_MTD_JEDECPROBE is not set CONFIG_MTD_GEN_PROBE=y # CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_CFI_STAA is not set CONFIG_MTD_CFI_UTIL=y CONFIG_MTD_RAM=y # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_SOLUTIONENGINE is not set CONFIG_MTD_SH7710VOIPGW=y # CONFIG_MTD_PLATRAM is not set # # Self-contained MTD device drivers # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLOCK2MTD is not set # # Disk-On-Chip Device Drivers # # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set # # NAND Flash Device Drivers # # CONFIG_MTD_NAND is not set # # OneNAND Flash Device Drivers # # CONFIG_MTD_ONENAND 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 is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH 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 # # 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 # # # Network device support # CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # # PHY device support # # CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y # CONFIG_MII is not set # CONFIG_STNIC is not set # CONFIG_SMC91X is not set # CONFIG_NE2000 is not set # # Ethernet (1000 Mbit) # # # Ethernet (10000 Mbit) # # # Token Ring devices # # # Wireless LAN (non-hamradio) # # CONFIG_NET_RADIO is not set # # Wan interfaces # # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set # # ISDN subsystem # # CONFIG_ISDN is not set # # Telephony Support # CONFIG_PHONE=y # CONFIG_PHONE_IXJ is not set # # Input device support # CONFIG_INPUT=y # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set # CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC 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=y CONFIG_LEGACY_PTY_COUNT=256 # # IPMI # # CONFIG_IPMI_HANDLER is not set # # Watchdog Cards # # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set # 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 # # CONFIG_W1 is not set # # Hardware Monitoring support # # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set # # Misc devices # # # Multimedia devices # # CONFIG_VIDEO_DEV is not set CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices # # CONFIG_DVB is not set # # Graphics support # # 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 # # File systems # # CONFIG_EXT2_FS 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_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_DNOTIFY is not set # 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 is not set CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set # # 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_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_SUMMARY is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN 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 # # Network File Systems # # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set # CONFIG_9P_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_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_FS is not set # CONFIG_SH_STANDARD_BIOS is not set # CONFIG_KGDB is not set # # Security options # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # # Cryptographic options # # CONFIG_CRYPTO is not set # # Hardware crypto devices # # # Library routines # # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y |
|
From: Paul M. <le...@us...> - 2006-08-07 08:14:06
|
Update of /cvsroot/linuxsh/linux/drivers/mtd/maps In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16452/drivers/mtd/maps Modified Files: Kconfig Makefile Added Files: sh7710voipgw.c Log Message: Add SH7710 VoIP Gateway board support. --- NEW FILE: sh7710voipgw.c --- /* * linux/drivers/mtd/sh7710voipgw.c * */ #include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/init.h> #include <asm/io.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> #include <linux/config.h> #include <linux/errno.h> static struct map_info sh7710voipgw_flash_map = { .name = "SH7710 VoIP Gateway", .phys = 0xA0000000, .size = (4 * 1024 * 1024), .bankwidth = 2, }; static struct mtd_partition sh7710voipgw_partitions[] = { { .name = "U-Boot", .offset = 0, .size = (128 * 1024), }, { .name = "U-Boot Environment", .offset = MTDPART_OFS_APPEND, .size = (64 * 1024), }, { .name = "rootfs", .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, }, }; static int __init init_sh7710voipgw_maps (void) { struct mtd_info *flash_mtd; printk ("SH7710 VoIP Gateway flash device: %lx at %lx\n", sh7710voipgw_flash_map.size, sh7710voipgw_flash_map.phys); sh7710voipgw_flash_map.virt = ioremap(sh7710voipgw_flash_map.phys, sh7710voipgw_flash_map.size); if (!sh7710voipgw_flash_map.virt) { printk ("Failed to ioremap\n"); return -EIO; } simple_map_init (&sh7710voipgw_flash_map); flash_mtd = do_map_probe ("cfi_probe", &sh7710voipgw_flash_map); if (!flash_mtd) return -ENXIO; add_mtd_partitions (flash_mtd, sh7710voipgw_partitions, ARRAY_SIZE(sh7710voipgw_partitions)); return 0; } static void __exit cleanup_sh7710voipgw_maps (void) { /* unloading not supported... */ } module_init(init_sh7710voipgw_maps); module_exit(cleanup_sh7710voipgw_maps); MODULE_DESCRIPTION("MTD map driver for SH7710 VoIP Gateway"); MODULE_LICENSE("GPL"); Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/mtd/maps/Kconfig,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Kconfig 27 Mar 2006 21:06:14 -0000 1.18 +++ Kconfig 7 Aug 2006 08:14:03 -0000 1.19 @@ -433,13 +433,21 @@ tristate "CFI Flash device mapped on Renesas RTS7751R2D" depends on SUPERH && SH_RTS7751R2D && MTD_CFI && MTD_PARTITIONS help - This enables access to the flash chips on the Renesas Technology Sales RTS7751R2D. + This enables access to the flash chips on the Renesas + Technology Sales RTS7751R2D. + Say 'Y' if you are building a kernel for such a board. config MTD_MICRODEV tristate "CFI Flash device mapped on SuperH SH4-202 MicroDev" depends on SUPERH && SH_SH4202_MICRODEV && MTD_CFI && MTD_PARTITIONS +config MTD_SH7710VOIPGW + bool "CFI Flash on the Renesas SH7710 VoIP Gateway" + depends on MTD_CFI && SH_7710VOIPGW + help + Enable flash support for the Renesas SH7710 VoIP Gateway. + config MTD_ARM_INTEGRATOR tristate "CFI Flash device mapped on ARM Integrator/P720T" depends on ARM && MTD_CFI Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/mtd/maps/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile 27 Mar 2006 21:06:14 -0000 1.16 +++ Makefile 7 Aug 2006 08:14:03 -0000 1.17 @@ -73,3 +73,4 @@ obj-$(CONFIG_MTD_MICRODEV) += microdev-flash.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_TQM834x) += tqm834x.o +obj-$(CONFIG_MTD_SH7710VOIPGW) += sh7710voipgw.o |
|
From: Paul M. <le...@us...> - 2006-08-07 08:14:06
|
Update of /cvsroot/linuxsh/linux/arch/sh/boards/renesas/sh7710voipgw In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16452/arch/sh/boards/renesas/sh7710voipgw Added Files: Makefile setup.c Log Message: Add SH7710 VoIP Gateway board support. --- NEW FILE: Makefile --- obj-y := setup.o --- NEW FILE: setup.c --- /* * Renesas Technology SH7710 VoIP Gateway * * Copyright (C) 2006 Ranjit Deshpande * Kenati Technologies Inc. * * May be copied or modified under the terms of the GNU General Public * License. See linux/COPYING for more information. */ #include <linux/init.h> #include <asm/machvec.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/irq.h> /* * Initialize IRQ setting */ static void __init sh7710voipgw_init_irq(void) { /* Disable all interrupts in IPR registers */ ctrl_outw(0x0, INTC_IPRA); ctrl_outw(0x0, INTC_IPRB); ctrl_outw(0x0, INTC_IPRC); ctrl_outw(0x0, INTC_IPRD); ctrl_outw(0x0, INTC_IPRE); ctrl_outw(0x0, INTC_IPRF); ctrl_outw(0x0, INTC_IPRG); ctrl_outw(0x0, INTC_IPRH); ctrl_outw(0x0, INTC_IPRI); /* Ack all interrupt sources in the IRR0 register */ ctrl_outb(0x3f, INTC_IRR0); /* Use IRQ0 - IRQ3 as active low interrupt lines i.e. disable * IRL mode. */ ctrl_outw(0x2aa, INTC_ICR1); /* Now make IPR interrupts */ make_ipr_irq(TIMER2_IRQ, TIMER2_IPR_ADDR, TIMER2_IPR_POS, TIMER2_PRIORITY); make_ipr_irq(WDT_IRQ, WDT_IPR_ADDR, WDT_IPR_POS, WDT_PRIORITY); /* SCIF0 */ make_ipr_irq(SCIF0_ERI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY); make_ipr_irq(SCIF0_RXI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY); make_ipr_irq(SCIF0_BRI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY); make_ipr_irq(SCIF0_TXI_IRQ, SCIF0_IPR_ADDR, SCIF0_IPR_POS, SCIF0_PRIORITY); /* DMAC-1 */ make_ipr_irq(DMTE0_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY); make_ipr_irq(DMTE1_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY); make_ipr_irq(DMTE2_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY); make_ipr_irq(DMTE3_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY); /* DMAC-2 */ make_ipr_irq(DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY); make_ipr_irq(DMTE4_IRQ, DMA2_IPR_ADDR, DMA2_IPR_POS, DMA2_PRIORITY); /* IPSEC */ make_ipr_irq(IPSEC_IRQ, IPSEC_IPR_ADDR, IPSEC_IPR_POS, IPSEC_PRIORITY); /* EDMAC */ make_ipr_irq(EDMAC0_IRQ, EDMAC0_IPR_ADDR, EDMAC0_IPR_POS, EDMAC0_PRIORITY); make_ipr_irq(EDMAC1_IRQ, EDMAC1_IPR_ADDR, EDMAC1_IPR_POS, EDMAC1_PRIORITY); make_ipr_irq(EDMAC2_IRQ, EDMAC2_IPR_ADDR, EDMAC2_IPR_POS, EDMAC2_PRIORITY); /* SIOF0 */ make_ipr_irq(SIOF0_ERI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY); make_ipr_irq(SIOF0_TXI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY); make_ipr_irq(SIOF0_RXI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY); make_ipr_irq(SIOF0_CCI_IRQ, SIOF0_IPR_ADDR, SIOF0_IPR_POS, SIOF0_PRIORITY); /* SIOF1 */ make_ipr_irq(SIOF1_ERI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY); make_ipr_irq(SIOF1_TXI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY); make_ipr_irq(SIOF1_RXI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY); make_ipr_irq(SIOF1_CCI_IRQ, SIOF1_IPR_ADDR, SIOF1_IPR_POS, SIOF1_PRIORITY); /* SLIC IRQ's */ make_ipr_irq(IRQ1_IRQ, IRQ1_IPR_ADDR, IRQ1_IPR_POS, IRQ1_PRIORITY); make_ipr_irq(IRQ2_IRQ, IRQ2_IPR_ADDR, IRQ2_IPR_POS, IRQ2_PRIORITY); } /* * The Machine Vector */ struct sh_machine_vector mv_sh7710voipgw __initmv = { .mv_name = "SH7710 VoIP Gateway", .mv_nr_irqs = 104, .mv_init_irq = sh7710voipgw_init_irq, }; ALIAS_MV(sh7710voipgw) |
|
From: Paul M. <le...@us...> - 2006-08-07 08:14:06
|
Update of /cvsroot/linuxsh/linux/arch/sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16452/arch/sh Modified Files: Kconfig Makefile Log Message: Add SH7710 VoIP Gateway board support. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/Kconfig,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- Kconfig 7 Aug 2006 05:21:13 -0000 1.111 +++ Kconfig 7 Aug 2006 08:14:02 -0000 1.112 @@ -149,6 +149,13 @@ Select HS7751RVOIP if configuring for a Renesas Technology Sales VoIP board. +config SH_7710VOIPGW + bool "SH7710-VOIP-GW" + select CPU_SUBTYPE_SH7710 + help + Select this option to build a kernel for the SH7710 based + VOIP GW. + config SH_RTS7751R2D bool "RTS7751R2D" select CPU_SUBTYPE_SH7751R Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/Makefile,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- Makefile 7 Aug 2006 02:00:33 -0000 1.72 +++ Makefile 7 Aug 2006 08:14:02 -0000 1.73 @@ -99,6 +99,7 @@ machdir-$(CONFIG_SH_7751_SYSTEMH) := renesas/systemh machdir-$(CONFIG_SH_EDOSK7705) := renesas/edosk7705 machdir-$(CONFIG_SH_R7780RP) := renesas/r7780rp +machdir-$(CONFIG_SH_7710VOIPGW) := renesas/sh7710voipgw machdir-$(CONFIG_SH_SH4202_MICRODEV) := superh/microdev machdir-$(CONFIG_SH_LANDISK) := landisk machdir-$(CONFIG_SH_TITAN) := titan |
|
From: Paul M. <le...@us...> - 2006-08-07 08:13:19
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16394/arch/sh/kernel Modified Files: sh_ksyms.c Log Message: Fixup clear_user_page() export for SH-3. Index: sh_ksyms.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/sh_ksyms.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- sh_ksyms.c 4 Aug 2006 07:44:08 -0000 1.27 +++ sh_ksyms.c 7 Aug 2006 08:13:16 -0000 1.28 @@ -90,7 +90,8 @@ EXPORT_SYMBOL(__flush_purge_region); #endif -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU) && (defined(CONFIG_CPU_SH4) || \ + defined(CONFIG_SH7705_CACHE_32KB)) EXPORT_SYMBOL(clear_user_page); #endif |
|
From: Paul M. <le...@us...> - 2006-08-07 08:11:03
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15247/arch/sh/mm Modified Files: Kconfig Log Message: Missing 'help' keyword. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Kconfig 7 Aug 2006 07:50:16 -0000 1.14 +++ Kconfig 7 Aug 2006 08:10:59 -0000 1.15 @@ -77,6 +77,7 @@ config CPU_SUBTYPE_SH7710 bool "Support SH7710 processor" select CPU_SH3 + help Select SH7710 if you have a SH3-DSP SH7710 CPU. comment "SH-4 Processor Support" |
|
From: Paul M. <le...@us...> - 2006-08-07 08:09:47
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14758/arch/sh/mm Modified Files: fault.c Log Message: Missing header. Index: fault.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/fault.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- fault.c 7 Aug 2006 06:50:26 -0000 1.22 +++ fault.c 7 Aug 2006 08:09:43 -0000 1.23 @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/hardirq.h> +#include <linux/kprobes.h> #include <asm/system.h> #include <asm/mmu_context.h> #include <asm/kgdb.h> |
|
From: Paul M. <le...@us...> - 2006-08-07 08:05:16
|
Update of /cvsroot/linuxsh/linux/arch/sh/boards/renesas/sh7710voipgw In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13045/arch/sh/boards/renesas/sh7710voipgw Log Message: Directory /cvsroot/linuxsh/linux/arch/sh/boards/renesas/sh7710voipgw added to the repository |
|
From: Paul M. <le...@us...> - 2006-08-07 07:50:24
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6669/include/asm-sh Modified Files: irq.h processor.h Log Message: Add support for SH7710 CPU subtype. Index: irq.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/irq.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- irq.h 2 Aug 2006 14:40:10 -0000 1.32 +++ irq.h 7 Aug 2006 07:50:16 -0000 1.33 @@ -267,6 +267,8 @@ defined(CONFIG_CPU_SUBTYPE_SH7705) # define ONCHIP_NR_IRQS 64 // Actually 61 # define PINT_NR_IRQS 16 +#elif defined(CONFIG_CPU_SUBTYPE_SH7710) +# define ONCHIP_NR_IRQS 104 #elif defined(CONFIG_CPU_SUBTYPE_SH7750) # define ONCHIP_NR_IRQS 48 // Actually 44 #elif defined(CONFIG_CPU_SUBTYPE_SH7751) @@ -481,7 +483,8 @@ #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \ defined(CONFIG_CPU_SUBTYPE_SH7706) || \ defined(CONFIG_CPU_SUBTYPE_SH7707) || \ - defined(CONFIG_CPU_SUBTYPE_SH7709) + defined(CONFIG_CPU_SUBTYPE_SH7709) || \ + defined(CONFIG_CPU_SUBTYPE_SH7710) #define INTC_IRR0 0xa4000004UL #define INTC_IRR1 0xa4000006UL #define INTC_IRR2 0xa4000008UL @@ -500,8 +503,105 @@ #define INTC_IPRF 0xa4080000UL #define INTC_IPRG 0xa4080002UL #define INTC_IPRH 0xa4080004UL -#endif +#elif defined(CONFIG_CPU_SUBTYPE_SH7710) +/* Interrupt Controller Registers */ +#undef INTC_IPRA +#undef INTC_IPRB +#define INTC_IPRA 0xA414FEE2UL +#define INTC_IPRB 0xA414FEE4UL +#define INTC_IPRF 0xA4080000UL +#define INTC_IPRG 0xA4080002UL +#define INTC_IPRH 0xA4080004UL +#define INTC_IPRI 0xA4080006UL + +#undef INTC_ICR0 +#undef INTC_ICR1 +#define INTC_ICR0 0xA414FEE0UL +#define INTC_ICR1 0xA4140010UL +#define INTC_IRR0 0xa4000004UL +#define INTC_IRR1 0xa4000006UL +#define INTC_IRR2 0xa4000008UL +#define INTC_IRR3 0xa400000AUL +#define INTC_IRR4 0xa400000CUL +#define INTC_IRR5 0xa4080020UL +#define INTC_IRR7 0xa4080024UL +#define INTC_IRR8 0xa4080026UL + +/* Interrupt numbers */ +#define TIMER2_IRQ 18 +#define TIMER2_IPR_ADDR INTC_IPRA +#define TIMER2_IPR_POS 1 +#define TIMER2_PRIORITY 2 + +/* WDT */ +#define WDT_IRQ 27 +#define WDT_IPR_ADDR INTC_IPRB +#define WDT_IPR_POS 3 +#define WDT_PRIORITY 2 + +#define SCIF0_ERI_IRQ 52 +#define SCIF0_RXI_IRQ 53 +#define SCIF0_BRI_IRQ 54 +#define SCIF0_TXI_IRQ 55 +#define SCIF0_IPR_ADDR INTC_IPRE +#define SCIF0_IPR_POS 2 +#define SCIF0_PRIORITY 3 + +#define DMTE4_IRQ 76 +#define DMTE5_IRQ 77 +#define DMA2_IPR_ADDR INTC_IPRF +#define DMA2_IPR_POS 2 +#define DMA2_PRIORITY 7 + +#define IPSEC_IRQ 79 +#define IPSEC_IPR_ADDR INTC_IPRF +#define IPSEC_IPR_POS 3 +#define IPSEC_PRIORITY 3 + +/* EDMAC */ +#define EDMAC0_IRQ 80 +#define EDMAC0_IPR_ADDR INTC_IPRG +#define EDMAC0_IPR_POS 3 +#define EDMAC0_PRIORITY 3 + +#define EDMAC1_IRQ 81 +#define EDMAC1_IPR_ADDR INTC_IPRG +#define EDMAC1_IPR_POS 2 +#define EDMAC1_PRIORITY 3 + +#define EDMAC2_IRQ 82 +#define EDMAC2_IPR_ADDR INTC_IPRG +#define EDMAC2_IPR_POS 1 +#define EDMAC2_PRIORITY 3 + +/* SIOF */ +#define SIOF0_ERI_IRQ 96 +#define SIOF0_TXI_IRQ 97 +#define SIOF0_RXI_IRQ 98 +#define SIOF0_CCI_IRQ 99 +#define SIOF0_IPR_ADDR INTC_IPRH +#define SIOF0_IPR_POS 0 +#define SIOF0_PRIORITY 7 + +#define SIOF1_ERI_IRQ 100 +#define SIOF1_TXI_IRQ 101 +#define SIOF1_RXI_IRQ 102 +#define SIOF1_CCI_IRQ 103 +#define SIOF1_IPR_ADDR INTC_IPRI +#define SIOF1_IPR_POS 1 +#define SIOF1_PRIORITY 7 +#endif /* CONFIG_CPU_SUBTYPE_SH7710 */ + +#if defined(CONFIG_CPU_SUBTYPE_SH7710) +#define PORT_PACR 0xa4050100UL +#define PORT_PBCR 0xa4050102UL +#define PORT_PCCR 0xa4050104UL +#define PORT_PETCR 0xa4050106UL +#define PORT_PADR 0xa4050120UL +#define PORT_PBDR 0xa4050122UL +#define PORT_PCDR 0xa4050124UL +#else #define PORT_PACR 0xa4000100UL #define PORT_PBCR 0xa4000102UL #define PORT_PCCR 0xa4000104UL @@ -510,6 +610,7 @@ #define PORT_PBDR 0xa4000122UL #define PORT_PCDR 0xa4000124UL #define PORT_PFDR 0xa400012aUL +#endif #define IRQ0_IRQ 32 #define IRQ1_IRQ 33 Index: processor.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/processor.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- processor.h 4 Aug 2006 01:00:39 -0000 1.38 +++ processor.h 7 Aug 2006 07:50:17 -0000 1.39 @@ -40,7 +40,8 @@ /* SH-3 types */ CPU_SH7705, CPU_SH7706, CPU_SH7707, CPU_SH7708, CPU_SH7708S, CPU_SH7708R, - CPU_SH7709, CPU_SH7709A, CPU_SH7729, CPU_SH7300, + CPU_SH7709, CPU_SH7709A, CPU_SH7710, + CPU_SH7729, CPU_SH7300, /* SH-4 types */ CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R, |
|
From: Paul M. <le...@us...> - 2006-08-07 07:50:24
|
Update of /cvsroot/linuxsh/linux/include/asm-sh/cpu-sh3 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6669/include/asm-sh/cpu-sh3 Modified Files: cache.h mmu_context.h timer.h ubc.h Log Message: Add support for SH7710 CPU subtype. Index: cache.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/cpu-sh3/cache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cache.h 30 Aug 2004 12:55:32 -0000 1.4 +++ cache.h 7 Aug 2006 07:50:17 -0000 1.5 @@ -26,12 +26,10 @@ #define CCR_CACHE_ENABLE CCR_CACHE_CE #define CCR_CACHE_INVALIDATE CCR_CACHE_CF -#if defined(CONFIG_CPU_SUBTYPE_SH7705) +#if defined(CONFIG_CPU_SUBTYPE_SH7705) || defined(CONFIG_CPU_SUBTYPE_SH7710) #define CCR3 0xa40000b4 #define CCR_CACHE_16KB 0x00010000 #define CCR_CACHE_32KB 0x00020000 #endif - #endif /* __ASM_CPU_SH3_CACHE_H */ - Index: mmu_context.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/cpu-sh3/mmu_context.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mmu_context.h 2 Aug 2006 14:40:10 -0000 1.5 +++ mmu_context.h 7 Aug 2006 07:50:17 -0000 1.6 @@ -27,9 +27,12 @@ #define TRA 0xffffffd0 #define EXPEVT 0xffffffd4 -#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \ +#if defined(CONFIG_CPU_SUBTYPE_SH7707) || \ + defined(CONFIG_CPU_SUBTYPE_SH7709) || \ defined(CONFIG_CPU_SUBTYPE_SH7706) || \ - defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705) + defined(CONFIG_CPU_SUBTYPE_SH7300) || \ + defined(CONFIG_CPU_SUBTYPE_SH7705) || \ + defined(CONFIG_CPU_SUBTYPE_SH7710) #define INTEVT 0xa4000000 /* INTEVTE2(0xa4000000) */ #else #define INTEVT 0xffffffd8 Index: timer.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/cpu-sh3/timer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- timer.h 31 May 2005 14:07:35 -0000 1.3 +++ timer.h 7 Aug 2006 07:50:17 -0000 1.4 @@ -20,6 +20,7 @@ * SH7710 * SH7720 * SH7300 + * SH7710 * --------------------------------------------------------------------------- */ Index: ubc.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/cpu-sh3/ubc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ubc.h 4 May 2003 19:30:08 -0000 1.2 +++ ubc.h 7 Aug 2006 07:50:17 -0000 1.3 @@ -11,6 +11,19 @@ #ifndef __ASM_CPU_SH3_UBC_H #define __ASM_CPU_SH3_UBC_H +#if defined(CONFIG_CPU_SUBTYPE_SH7710) +#define UBC_BARA 0xa4ffffb0 +#define UBC_BAMRA 0xa4ffffb4 +#define UBC_BBRA 0xa4ffffb8 +#define UBC_BASRA 0xffffffe4 +#define UBC_BARB 0xa4ffffa0 +#define UBC_BAMRB 0xa4ffffa4 +#define UBC_BBRB 0xa4ffffa8 +#define UBC_BASRB 0xffffffe8 +#define UBC_BDRB 0xa4ffff90 +#define UBC_BDMRB 0xa4ffff94 +#define UBC_BRCR 0xa4ffff98 +#else #define UBC_BARA 0xffffffb0 #define UBC_BAMRA 0xffffffb4 #define UBC_BBRA 0xffffffb8 @@ -22,6 +35,6 @@ #define UBC_BDRB 0xffffff90 #define UBC_BDMRB 0xffffff94 #define UBC_BRCR 0xffffff98 +#endif #endif /* __ASM_CPU_SH3_UBC_H */ - |
|
From: Paul M. <le...@us...> - 2006-08-07 07:50:20
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6669/arch/sh/kernel Modified Files: process.c setup.c Log Message: Add support for SH7710 CPU subtype. Index: process.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/process.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- process.c 4 Aug 2006 07:44:08 -0000 1.43 +++ process.c 7 Aug 2006 07:50:16 -0000 1.44 @@ -309,7 +309,7 @@ ctrl_outl(0, UBC_BAMRA); - if (cpu_data->type == CPU_SH7729) { + if (cpu_data->type == CPU_SH7729 || cpu_data->type == CPU_SH7710) { ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA); ctrl_outl(BRCR_PCBA | BRCR_PCTE, UBC_BRCR); } else { Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/setup.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- setup.c 7 Aug 2006 06:27:26 -0000 1.56 +++ setup.c 7 Aug 2006 07:50:16 -0000 1.57 @@ -392,27 +392,18 @@ subsys_initcall(topology_init); static const char *cpu_name[] = { - [CPU_SH7604] = "SH7604", - [CPU_SH7705] = "SH7705", - [CPU_SH7706] = "SH7706", - [CPU_SH7708] = "SH7708", - [CPU_SH7729] = "SH7729", - [CPU_SH7300] = "SH7300", - [CPU_SH7750] = "SH7750", - [CPU_SH7750S] = "SH7750S", - [CPU_SH7750R] = "SH7750R", - [CPU_SH7751] = "SH7751", - [CPU_SH7751R] = "SH7751R", - [CPU_SH7760] = "SH7760", - [CPU_SH73180] = "SH73180", - [CPU_ST40RA] = "ST40RA", - [CPU_ST40GX1] = "ST40GX1", - [CPU_SH4_202] = "SH4-202", - [CPU_SH4_501] = "SH4-501", - [CPU_SH7770] = "SH7770", - [CPU_SH7780] = "SH7780", - [CPU_SH7781] = "SH7781", - [CPU_SH_NONE] = "Unknown" + [CPU_SH7604] = "SH7604", [CPU_SH7300] = "SH7300", + [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", + [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", + [CPU_SH7709] = "SH7709", [CPU_SH7710] = "SH7710", + [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_ST40RA] = "ST40RA", [CPU_ST40GX1] = "ST40GX1", + [CPU_SH4_202] = "SH4-202", [CPU_SH4_501] = "SH4-501", + [CPU_SH7770] = "SH7770", [CPU_SH7780] = "SH7780", + [CPU_SH7781] = "SH7781", [CPU_SH_NONE] = "Unknown" }; const char *get_cpu_subtype(void) |
|
From: Paul M. <le...@us...> - 2006-08-07 07:50:20
|
Update of /cvsroot/linuxsh/linux/drivers/serial In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6669/drivers/serial Modified Files: sh-sci.c sh-sci.h Log Message: Add support for SH7710 CPU subtype. Index: sh-sci.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/serial/sh-sci.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- sh-sci.c 2 Aug 2006 14:40:09 -0000 1.48 +++ sh-sci.c 7 Aug 2006 07:50:16 -0000 1.49 @@ -286,7 +286,7 @@ #endif #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF) -#if defined(CONFIG_CPU_SUBTYPE_SH7300) +#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710) /* SH7300 doesn't use RTS/CTS */ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag) { Index: sh-sci.h =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/serial/sh-sci.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- sh-sci.h 2 Aug 2006 14:40:09 -0000 1.24 +++ sh-sci.h 7 Aug 2006 07:50:16 -0000 1.25 @@ -74,6 +74,10 @@ # define SCPDR 0xA4050136 /* 16 bit SCIF */ # define SCSCR_INIT(port) 0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */ # define SCIF_ONLY +#elif defined(CONFIG_CPU_SUBTYPE_SH7710) +# define SCSPTR0 0xA4400000 /* 16 bit SCIF */ +# define SCSCR_INIT(port) 0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */ +# define SCIF_ONLY #elif defined(CONFIG_CPU_SUBTYPE_SH73180) # define SCPDR 0xA4050138 /* 16 bit SCIF */ # define SCSPTR2 SCPDR @@ -302,7 +306,9 @@ } #ifdef CONFIG_CPU_SH3 -#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705) +#if defined(CONFIG_CPU_SUBTYPE_SH7300) || \ + defined(CONFIG_CPU_SUBTYPE_SH7705) || \ + defined(CONFIG_CPU_SUBTYPE_SH7710) #define SCIF_FNS(name, scif_offset, scif_size) \ CPU_SCIF_FNS(name, scif_offset, scif_size) #else @@ -328,7 +334,9 @@ CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size) #endif -#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705) +#if defined(CONFIG_CPU_SUBTYPE_SH7300) || \ + defined(CONFIG_CPU_SUBTYPE_SH7705) || \ + defined(CONFIG_CPU_SUBTYPE_SH7710) SCIF_FNS(SCSMR, 0x00, 16) SCIF_FNS(SCBRR, 0x04, 8) SCIF_FNS(SCSCR, 0x08, 16) @@ -435,6 +443,13 @@ return ctrl_inb(SCPDR)&0x10 ? 1 : 0; /* SCIF */ return 1; } +#elif defined(CONFIG_CPU_SUBTYPE_SH7710) +static inline int sci_rxd_in(struct uart_port *port) +{ + if (port->mapbase == SCSPTR0) + return ctrl_inw(SCSPTR0 + 0x10) & 0x01 ? 1 : 0; + return 1; +} #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \ defined(CONFIG_CPU_SUBTYPE_SH7751) || \ defined(CONFIG_CPU_SUBTYPE_SH4_202) @@ -555,4 +570,3 @@ #else /* Generic SH */ #define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1) #endif - |
|
From: Paul M. <le...@us...> - 2006-08-07 07:50:20
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh3 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6669/arch/sh/kernel/cpu/sh3 Modified Files: Makefile ex.S probe.c Added Files: setup-sh7710.c Log Message: Add support for SH7710 CPU subtype. --- NEW FILE: setup-sh7710.c --- /* * SH7710 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 = 0xa4400000, .flags = UPF_BOOT_AUTOCONF, .type = PORT_SCIF, .irqs = { 52, 53, 55, 54 }, }, { .flags = 0, } }; static struct platform_device sci_device = { .name = "sh-sci", .id = -1, .dev = { .platform_data = sci_platform_data, }, }; static struct platform_device *sh7710_devices[] __initdata = { &sci_device, }; static int __init sh7710_devices_setup(void) { return platform_add_devices(sh7710_devices, ARRAY_SIZE(sh7710_devices)); } __initcall(sh7710_devices_setup); Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh3/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 2 Aug 2006 14:40:09 -0000 1.8 +++ Makefile 7 Aug 2006 07:50:16 -0000 1.9 @@ -11,6 +11,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7708) += setup-sh7708.o obj-$(CONFIG_CPU_SUBTYPE_SH7709) += setup-sh7709.o obj-$(CONFIG_CPU_SUBTYPE_SH7300) += setup-sh7300.o +obj-$(CONFIG_CPU_SUBTYPE_SH7710) += setup-sh7710.o # Primary on-chip clocks (common) clock-$(CONFIG_CPU_SH3) := clock-sh3.o @@ -18,6 +19,6 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7705) := clock-sh7705.o clock-$(CONFIG_CPU_SUBTYPE_SH7706) := clock-sh7706.o clock-$(CONFIG_CPU_SUBTYPE_SH7709) := clock-sh7709.o +clock-$(CONFIG_CPU_SUBTYPE_SH7710) := clock-sh7300.o obj-y += $(clock-y) - Index: ex.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh3/ex.S,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ex.S 2 Aug 2006 14:40:09 -0000 1.5 +++ ex.S 7 Aug 2006 07:50:16 -0000 1.6 @@ -85,9 +85,12 @@ .long do_IRQ ! rovi .long do_IRQ .long do_IRQ /* 5E0 */ -#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \ +#if defined(CONFIG_CPU_SUBTYPE_SH7707) || \ + defined(CONFIG_CPU_SUBTYPE_SH7709) || \ defined(CONFIG_CPU_SUBTYPE_SH7706) || \ - defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705) + defined(CONFIG_CPU_SUBTYPE_SH7300) || \ + defined(CONFIG_CPU_SUBTYPE_SH7705) || \ + defined(CONFIG_CPU_SUBTYPE_SH7710) .long do_IRQ ! 32 IRQ irq0 /* 600 */ .long do_IRQ ! 33 irq1 .long do_IRQ ! 34 irq2 @@ -149,6 +152,51 @@ .long do_IRQ ! 62 PCC pcc0i .long do_IRQ ! 63 pcc1i /* 9E0 */ #endif +#if defined(CONFIG_CPU_SUBTYPE_SH7710) + .long exception_none ! 61 /* 9A0 */ + .long exception_none ! 62 + .long exception_none ! 63 + .long exception_none ! 64 /* A00 */ + .long exception_none ! 65 + .long exception_none ! 66 + .long exception_none ! 67 + .long exception_none ! 68 + .long exception_none ! 69 + .long exception_none ! 70 + .long exception_none ! 71 + .long exception_none ! 72 /* B00 */ + .long exception_none ! 73 + .long exception_none ! 74 + .long exception_none ! 75 + .long do_IRQ ! 76 DMAC2 dei4 /* B80 */ + .long do_IRQ ! 77 DMAC2 dei5 + .long exception_none ! 78 + .long do_IRQ ! 79 IPSEC ipseci /* BE0 */ + .long do_IRQ ! 80 EDMAC eint0 /* C00 */ + .long do_IRQ ! 81 EDMAC eint1 + .long do_IRQ ! 82 EDMAC eint2 + .long exception_none ! 83 /* C60 */ + .long exception_none ! 84 + .long exception_none ! 85 + .long exception_none ! 86 + .long exception_none ! 87 + .long exception_none ! 88 /* D00 */ + .long exception_none ! 89 + .long exception_none ! 90 + .long exception_none ! 91 + .long exception_none ! 92 + .long exception_none ! 93 + .long exception_none ! 94 + .long exception_none ! 95 + .long do_IRQ ! 96 SIOF eri0 /* E00 */ + .long do_IRQ ! 97 txi0 + .long do_IRQ ! 98 rxi0 + .long do_IRQ ! 99 cci0 + .long do_IRQ ! 100 eri1 /* E80 */ + .long do_IRQ ! 101 txi1 + .long do_IRQ ! 102 rxi2 + .long do_IRQ ! 103 cci3 +#endif #if defined(CONFIG_CPU_SUBTYPE_SH7300) .long do_IRQ ! 64 .long do_IRQ ! 65 @@ -197,4 +245,3 @@ .long do_IRQ ! 108 #endif #endif - Index: probe.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/sh3/probe.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- probe.c 2 Aug 2006 14:40:09 -0000 1.3 +++ probe.c 7 Aug 2006 07:50:16 -0000 1.4 @@ -75,6 +75,9 @@ #if defined(CONFIG_CPU_SUBTYPE_SH7706) cpu_data->type = CPU_SH7706; #endif +#if defined(CONFIG_CPU_SUBTYPE_SH7710) + cpu_data->type = CPU_SH7710; +#endif #if defined(CONFIG_CPU_SUBTYPE_SH7705) cpu_data->type = CPU_SH7705; |
|
From: Paul M. <le...@us...> - 2006-08-07 07:50:20
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6669/arch/sh/mm Modified Files: Kconfig Log Message: Add support for SH7710 CPU subtype. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Kconfig 4 Aug 2006 07:44:08 -0000 1.13 +++ Kconfig 7 Aug 2006 07:50:16 -0000 1.14 @@ -74,6 +74,11 @@ help Select SH7709 if you have a 80 Mhz SH-3 HD6417709 CPU. +config CPU_SUBTYPE_SH7710 + bool "Support SH7710 processor" + select CPU_SH3 + Select SH7710 if you have a SH3-DSP SH7710 CPU. + comment "SH-4 Processor Support" config CPU_SUBTYPE_SH7750 |
|
From: Paul M. <le...@us...> - 2006-08-07 06:57:59
|
Update of /cvsroot/linuxsh/linux/arch/sh/boards/renesas/r7780rp In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18413/arch/sh/boards/renesas/r7780rp Modified Files: setup.c Log Message: Kill off some left-over debug cruft. Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/renesas/r7780rp/setup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- setup.c 7 Aug 2006 06:27:25 -0000 1.4 +++ setup.c 7 Aug 2006 06:57:55 -0000 1.5 @@ -81,10 +81,6 @@ &ivdr_clk, }; -static const char *r7780rp_system_type(void) -{ -} - static void r7780rp_power_off(void) { #ifdef CONFIG_SH_R7780MP |
|
From: Paul M. <le...@us...> - 2006-08-07 06:50:30
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15373/arch/sh/mm Modified Files: fault.c Log Message: Shut up gcc4, fix a case in __do_page_fault() where the mm context can be uninitialized. Index: fault.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/fault.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- fault.c 27 Mar 2006 21:06:14 -0000 1.21 +++ fault.c 7 Aug 2006 06:50:26 -0000 1.22 @@ -189,15 +189,16 @@ /* * Called with interrupts disabled. */ -asmlinkage int __do_page_fault(struct pt_regs *regs, unsigned long writeaccess, - unsigned long address) +asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs, + unsigned long writeaccess, + unsigned long address) { pgd_t *pgd; pud_t *pud; pmd_t *pmd; pte_t *pte; pte_t entry; - struct mm_struct *mm; + struct mm_struct *mm = current->mm; spinlock_t *ptl; int ret = 1; @@ -215,10 +216,10 @@ pgd = pgd_offset_k(address); mm = NULL; } else { - if (unlikely(address >= TASK_SIZE || !(mm = current->mm))) + if (unlikely(address >= TASK_SIZE || !mm)) return 1; - pgd = pgd_offset(current->mm, address); + pgd = pgd_offset(mm, address); } pud = pud_offset(pgd, address); |
|
From: Paul M. <le...@us...> - 2006-08-07 06:27:36
|
Update of /cvsroot/linuxsh/linux/arch/sh/boards/superh/microdev In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6166/arch/sh/boards/superh/microdev Modified Files: setup.c Log Message: Some more machvec overhauling and setup code cleanup. Kill off get_system_type() and platform_setup(), we can do these both through the machvec. While we're add it, kill off more useless mach.c's and drop some legacy cruft from setup.c. Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/superh/microdev/setup.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- setup.c 3 Jan 2006 22:35:50 -0000 1.7 +++ setup.c 7 Aug 2006 06:27:26 -0000 1.8 @@ -10,7 +10,6 @@ * May be copied or modified under the terms of the GNU General Public * License. See linux/COPYING for more information. */ - #include <linux/config.h> #include <linux/init.h> #include <linux/platform_device.h> @@ -22,41 +21,6 @@ extern void microdev_heartbeat(void); -/* - * The Machine Vector - */ - -struct sh_machine_vector mv_sh4202_microdev __initmv = { - .mv_nr_irqs = 72, /* QQQ need to check this - use the MACRO */ - - .mv_inb = microdev_inb, - .mv_inw = microdev_inw, - .mv_inl = microdev_inl, - .mv_outb = microdev_outb, - .mv_outw = microdev_outw, - .mv_outl = microdev_outl, - - .mv_inb_p = microdev_inb_p, - .mv_inw_p = microdev_inw_p, - .mv_inl_p = microdev_inl_p, - .mv_outb_p = microdev_outb_p, - .mv_outw_p = microdev_outw_p, - .mv_outl_p = microdev_outl_p, - - .mv_insb = microdev_insb, - .mv_insw = microdev_insw, - .mv_insl = microdev_insl, - .mv_outsb = microdev_outsb, - .mv_outsw = microdev_outsw, - .mv_outsl = microdev_outsl, - - .mv_init_irq = init_microdev_irq, - -#ifdef CONFIG_HEARTBEAT - .mv_heartbeat = microdev_heartbeat, -#endif -}; -ALIAS_MV(sh4202_microdev) /****************************************************************************/ @@ -114,11 +78,6 @@ /* assume a Keyboard Controller is present */ int microdev_kbd_controller_present = 1; -const char *get_system_type(void) -{ - return "SH4-202 MicroDev"; -} - static struct resource smc91x_resources[] = { [0] = { .start = 0x300, @@ -292,25 +251,9 @@ return platform_add_devices(microdev_devices, ARRAY_SIZE(microdev_devices)); } -__initcall(microdev_devices_setup); - -void __init platform_setup(void) -{ - int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul); - const int fpgaRevision = *fpgaRevisionRegister; - int * const CacheControlRegister = (int*)CCR; - - printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n", - get_system_type(), fpgaRevision, *CacheControlRegister); -} - - -/****************************************************************************/ - - - /* - * Setup for the SMSC FDC37C93xAPM - */ +/* + * Setup for the SMSC FDC37C93xAPM + */ static int __init smsc_superio_setup(void) { @@ -413,8 +356,52 @@ return 0; } +static void __init microdev_setup(char **cmdline_p) +{ + int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul); + const int fpgaRevision = *fpgaRevisionRegister; + int * const CacheControlRegister = (int*)CCR; -/* This is grotty, but, because kernel is always referenced on the link line - * before any devices, this is safe. + device_initcall(microdev_devices_setup); + device_initcall(smsc_superio_setup); + + printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n", + get_system_type(), fpgaRevision, *CacheControlRegister); +} + +/* + * The Machine Vector */ -__initcall(smsc_superio_setup); +struct sh_machine_vector mv_sh4202_microdev __initmv = { + .mv_name = "SH4-202 MicroDev", + .mv_setup = microdev_setup, + .mv_nr_irqs = 72, /* QQQ need to check this - use the MACRO */ + + .mv_inb = microdev_inb, + .mv_inw = microdev_inw, + .mv_inl = microdev_inl, + .mv_outb = microdev_outb, + .mv_outw = microdev_outw, + .mv_outl = microdev_outl, + + .mv_inb_p = microdev_inb_p, + .mv_inw_p = microdev_inw_p, + .mv_inl_p = microdev_inl_p, + .mv_outb_p = microdev_outb_p, + .mv_outw_p = microdev_outw_p, + .mv_outl_p = microdev_outl_p, + + .mv_insb = microdev_insb, + .mv_insw = microdev_insw, + .mv_insl = microdev_insl, + .mv_outsb = microdev_outsb, + .mv_outsw = microdev_outsw, + .mv_outsl = microdev_outsl, + + .mv_init_irq = init_microdev_irq, + +#ifdef CONFIG_HEARTBEAT + .mv_heartbeat = microdev_heartbeat, +#endif +}; +ALIAS_MV(sh4202_microdev) |
