Blackfin update
Subsystems (5)
Hi Linus
Please pull from 'for-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git/ for-linus
to receive the following updates:
- Bug fixing, code cleanup, anomaly handling update and GPIO API update.
- Serial, SPI, EMAC and RTC driver updating.
arch/blackfin/Kconfig | 83 ++++- arch/blackfin/Makefile | 4 + arch/blackfin/kernel/bfin_gpio.c | 301 +++++++++++-- arch/blackfin/kernel/cplbinit.c | 4 +- arch/blackfin/kernel/dma-mapping.c | 3 +- arch/blackfin/kernel/irqchip.c | 9 + arch/blackfin/kernel/setup.c | 25 +- arch/blackfin/kernel/traps.c | 55 ++- arch/blackfin/kernel/vmlinux.lds.S | 16 +- arch/blackfin/lib/memcmp.S | 2 +- arch/blackfin/lib/memcpy.S | 2 +- arch/blackfin/lib/memmove.S | 4 +- arch/blackfin/mach-bf533/head.S | 24 +- arch/blackfin/mach-bf537/head.S | 32 +- arch/blackfin/mach-bf548/Kconfig | 4 +- arch/blackfin/mach-bf548/boards/ezkit.c | 30 ++ arch/blackfin/mach-bf548/gpio.c | 98 ++++- arch/blackfin/mach-bf548/head.S | 16 +- arch/blackfin/mach-bf561/head.S | 35 +- arch/blackfin/mach-common/cache.S | 8 +- arch/blackfin/mach-common/cacheinit.S | 9 +- arch/blackfin/mach-common/cplbmgr.S | 54 ++-- arch/blackfin/mach-common/dpmc.S | 52 ++-- arch/blackfin/mach-common/entry.S | 83 ++++- arch/blackfin/mach-common/interrupt.S | 6 +- arch/blackfin/mach-common/ints-priority-dc.c | 43 +- arch/blackfin/mach-common/ints-priority-sc.c | 56 ++- arch/blackfin/mach-common/lock.S | 20 +- arch/blackfin/oprofile/op_blackfin.h | 8 +- drivers/i2c/busses/Kconfig | 4 +- drivers/input/serio/Kconfig | 2 +- drivers/net/bfin_mac.c | 6 +- drivers/rtc/rtc-bfin.c | 2 +- drivers/serial/bfin_5xx.c | 14 +- drivers/spi/spi_bfin5xx.c | 202 ++++----- include/asm-blackfin/bfin-global.h | 1 + include/asm-blackfin/bfin5xx_spi.h | 6 + include/asm-blackfin/blackfin.h | 124 +++--- include/asm-blackfin/gpio.h | 31 ++ include/asm-blackfin/mach-bf533/anomaly.h | 467 ++++++++++---------- include/asm-blackfin/mach-bf533/bf533.h | 2 +- include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 11 +- include/asm-blackfin/mach-bf533/blackfin.h | 2 +- include/asm-blackfin/mach-bf533/cdefBF532.h | 10 +- include/asm-blackfin/mach-bf533/irq.h | 2 + include/asm-blackfin/mach-bf533/portmux.h | 2 +- include/asm-blackfin/mach-bf537/anomaly.h | 248 ++++++----- include/asm-blackfin/mach-bf537/bf537.h | 2 +- include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 23 +- include/asm-blackfin/mach-bf537/blackfin.h | 2 +- include/asm-blackfin/mach-bf537/cdefBF534.h | 4 +- include/asm-blackfin/mach-bf537/irq.h | 2 + include/asm-blackfin/mach-bf537/portmux.h | 35 ++- include/asm-blackfin/mach-bf548/anomaly.h | 130 +++--- include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 39 +- include/asm-blackfin/mach-bf548/blackfin.h | 2 +- include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 37 ++- include/asm-blackfin/mach-bf548/defBF54x_base.h | 17 + include/asm-blackfin/mach-bf548/gpio.h | 5 - include/asm-blackfin/mach-bf548/irq.h | 3 + include/asm-blackfin/mach-bf561/anomaly.h | 409 ++++++++++------- include/asm-blackfin/mach-bf561/bf561.h | 2 +- include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 11 +- include/asm-blackfin/mach-bf561/blackfin.h | 2 +- include/asm-blackfin/mach-bf561/cdefBF561.h | 15 +- include/asm-blackfin/mach-bf561/defBF561.h | 4 + include/asm-blackfin/mach-bf561/irq.h | 2 + include/asm-blackfin/mach-common/cdef_LPBlackfin.h | 4 +- include/asm-blackfin/mach-common/def_LPBlackfin.h | 132 +++--- include/asm-blackfin/portmux.h | 22 + include/asm-blackfin/system.h | 93 +++-- include/asm-blackfin/thread_info.h | 12 +- include/asm-blackfin/trace.h | 55 ++- 73 files changed, 2058 insertions(+), 1228 deletions(-)
Bernd Schmidt (3):
Blackfin arch: fix bug which unaligns the init thread's stack and causes the current macro to fail. Blackfin arch: Initialize the exception vectors early in the boot process
Blackfin arch: Load P0 before storing through it
Bryan Wu (5):
Blackfin arch: fix a compiling warning about dma-mapping Blackfin arch: bug fixing, add missing BF533_FAMILY GPIO_PFx definition Blackfin arch: add BF54x I2C/TWI TWI0 driver support Blackfin SPI driver: Initial supporting BF54x in SPI driver Blackfin SPI driver update:
Michael Hennerich (14):
Blackfin arch: store labels so we later know who allocated GPIO/Peripheral resources Blackfin arch: add peripheral resource allocation support
Blackfin arch: Add label to call new GPIO API
Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver
Blackfin arch: Finalize the generic gpio support - add gpio_to_irq and irq_to_gpio
Blackfin arch: Advertise GENERIC_GPIO and remove duplicated GENERIC_CALIBRATE_DELAY Blackfin arch: add error message when IRQ no available
Blackfin arch: Add PORT_J.High (needed for BF548-EZkit Touchscreen interrupts) - remove PORT_C.H Blackfin arch: add missing gpio error handling to make sure we roll back requests in case one fails Blackfin Ethernet MAC driver: fix bug Report returned -ENOMEM upwards (in case L1/uncached memory alloc fails) Blackfin serial driver: use new GPIO API
Blackfin SPI driver: Make BF54x SPI work and add support for portmux API
Blackfin SPI driver: use new GPIO API and add error handling
Input Serio: Blackfin doesnt support I8042 - make sure it doesnt get selected
Mike Frysinger (12):
Blackfin arch: cleanup and standardize anomaly.h file format -- no functional changes
Blackfin arch: setup aliases for some core Core A MMRs
Blackfin arch: use bfin_read_SWRST() now that BF561 provides it
Blackfin arch: add selections for BF544 and BF542
Blackfin arch: use HI/LO macros rather than masking the bit ranges ourselves
Blackfin arch: switch to using proper defines this time THREAD_SIZE and PAGE_SIZE instead of just PAGE_SIZE everywhere Blackfin arch: revise anomaly handling by basing things on the compiler not the kconfig defines Blackfin arch: scrub remaining ASSEMBLY usage since the switch to __ASSEMBLY__
Blackfin arch: update BF54x anomaly list
Blackfin arch: use the [CS]SYNC() macros which include anomaly workarounds rather than __builtin_bfin_[cs]sync() Blackfin arch: reorganize headers slightly so we can be sure things are defined early enough Blackfin On-Chip RTC driver update for supporting BF54x
Robin Getz (1):
Blackfin arch: Add ability to expend the hardware trace buffer
Sonic Zhang (1):
Blackfin arch: fix KGDB bug, dont forget last parameter.
arch/blackfin/Kconfig +82 -1
@@ -57,7 +57,7 @@ config GENERIC_TIME bool default n -config GENERIC_CALIBRATE_DELAY +config GENERIC_GPIO bool default y
@@ -973,8 +973,89 @@ config DEBUG_HUNT_FOR_ZERO Enabling this option will take up an extra entry in CPLB table. Otherwise, there is no extra overhead. +config DEBUG_BFIN_HWTRACE_ON + bool "Turn on Blackfin's Hardware Trace" + default y + help + All Blackfins include a Trace Unit which stores a history of the last + 16 changes in program flow taken by the program sequencer. The history + allows the user to recreate the program sequencer’s recent path. This + can be handy when an application dies - we print out the execution + path of how it got to the offending instruction. + + By turning this off, you may save a tiny amount of power. + +choice + prompt "Omit loop Tracing" + default DEBUG_BFIN_HWTRACE_COMPRESSION_OFF + depends on DEBUG_BFIN_HWTRACE_ON + help + The trace buffer can be configured to omit recording of changes in + program flow that match either the last entry or one of the last + two entries. Omitting one of these entries from the record prevents + the trace buffer from overflowing because of any sort of loop (for, do + while, etc) in the program. + + Because zero-overhead Hardware loops are not recorded in the trace buffer, + this feature can be used to prevent trace overflow from loops that + are nested four deep. + +config DEBUG_BFIN_HWTRACE_COMPRESSION_OFF + bool "Trace all Loops" + help + The trace buffer records all changes of flow + +config DEBUG_BFIN_HWTRACE_COMPRESSION_ONE + bool "Compress single-level loops" + help + The trace buffer does not record single loops - helpful if trace + is spinning on a while or do loop. + +config DEBUG_BFIN_HWTRACE_COMPRESSION_TWO + bool "Compress two-level loops" + help + The trace buffer does not record loops two levels deep. Helpful if + the trace is spinning in a nested loop + +endchoice + +config DEBUG_BFIN_HWTRACE_COMPRESSION + int + depends on DEBUG_BFIN_HWTRACE_ON + default 0 if DEBUG_BFIN_HWTRACE_COMPRESSION_OFF + default 1 if DEBUG_BFIN_HWTRACE_COMPRESSION_ONE + default 2 if DEBUG_BFIN_HWTRACE_COMPRESSION_TWO + + +config DEBUG_BFIN_HWTRACE_EXPAND + bool "Expand Trace Buffer greater than 16 entries" + depends on DEBUG_BFIN_HWTRACE_ON + default n + help + By selecting this option, every time the 16 hardware entries in + the Blackfin's HW Trace buffer are full, the kernel will move them + into a software buffer, for dumping when there is an issue. This + has a great impact on performance, (an interrupt every 16 change of + flows) and should normally be turned off, except in those nasty + debugging sessions + +config DEBUG_BFIN_HWTRACE_EXPAND_LEN + int "Size of Trace buffer (in power of 2k)" + range 0 4 + depends on DEBUG_BFIN_HWTRACE_EXPAND + default 1 + help + This sets the size of the software buffer that the trace information + is kept in. + 0 for (2^0) 1k, or 256 entries, + 1 for (2^1) 2k, or 512 entries, + 2 for (2^2) 4k, or 1024 entries, + 3 for (2^3) 8k, or 2048 entries, + 4 for (2^4) 16k, or 4096 entries + config DEBUG_BFIN_NO_KERN_HWTRACE bool "Trace user apps (turn off hwtrace in kernel)" + depends on DEBUG_BFIN_HWTRACE_ON default n help Some pieces of the kernel contain a lot of flow changes which can
arch/blackfin/Makefile +4 -0
@@ -24,6 +24,8 @@ machine-$(CONFIG_BF533) := bf533 machine-$(CONFIG_BF534) := bf537 machine-$(CONFIG_BF536) := bf537 machine-$(CONFIG_BF537) := bf537 +machine-$(CONFIG_BF542) := bf548 +machine-$(CONFIG_BF544) := bf548 machine-$(CONFIG_BF548) := bf548 machine-$(CONFIG_BF549) := bf548 machine-$(CONFIG_BF561) := bf561
@@ -36,6 +38,8 @@ cpu-$(CONFIG_BF533) := bf533 cpu-$(CONFIG_BF534) := bf534 cpu-$(CONFIG_BF536) := bf536 cpu-$(CONFIG_BF537) := bf537 +cpu-$(CONFIG_BF542) := bf542 +cpu-$(CONFIG_BF544) := bf544 cpu-$(CONFIG_BF548) := bf548 cpu-$(CONFIG_BF549) := bf549 cpu-$(CONFIG_BF561) := bf561
arch/blackfin/kernel/bfin_gpio.c +260 -41
453 lines not on this page · raw message
arch/blackfin/kernel/cplbinit.c +2 -2
@@ -230,8 +230,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en cplb_data[i].psize, cplb_data[i].i_conf); } else { -#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263)) - if (i == SDRAM_KERN) { +#if defined(CONFIG_BLKFIN_CACHE) + if (ANOMALY_05000263 && i == SDRAM_KERN) { fill_cplbtab(t, cplb_data[i].start, cplb_data[i].end,
arch/blackfin/kernel/dma-mapping.c +2 -1
@@ -160,7 +160,8 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (direction ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { - sg->dma_address =page_address (sg->page) + sg->offset; + sg->dma_address = (dma_addr_t)(page_address (sg->page) + + sg->offset); invalidate_dcache_range(sg_dma_address(sg), sg_dma_address(sg) +
arch/blackfin/kernel/irqchip.c +9 -0
@@ -34,6 +34,7 @@#include <linux/kallsyms.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <asm/trace.h> static unsigned long irq_err_count;static spinlock_t irq_controller_lock;
@@ -144,4 +145,12 @@ void __init init_IRQ(void) }init_arch_irq (); + +#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND +/* Now that evt_ivhw is set up, turn this on */ + trace_buff_offset =0 ; +bfin_write_TBUFCTL (BFIN_TRACE_ON ); +printk (KERN_INFO "Hardware Trace expanded to %ik\n" , +1 <<CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN ); +#endif }
arch/blackfin/kernel/setup.c +11 -14
@@ -179,14 +179,16 @@ void __init setup_arch(char **cmdline_p) cclk =get_cclk (); sclk =get_sclk (); -#if !defined(CONFIG_BFIN_KERNEL_CLOCK ) && defined(ANOMALY_05000273 ) -if (cclk == sclk) +#if !defined(CONFIG_BFIN_KERNEL_CLOCK ) +if (ANOMALY_05000273 && cclk == sclk)panic ("ANOMALY 05000273, SCLK can not be same as CCLK" );#endif -#if defined(ANOMALY_05000266 ) -bfin_read_IMDMA_D0_IRQ_STATUS (); -bfin_read_IMDMA_D1_IRQ_STATUS (); +#ifdef BF561_FAMILY +if (ANOMALY_05000266 ) { +bfin_read_IMDMA_D0_IRQ_STATUS (); +bfin_read_IMDMA_D1_IRQ_STATUS (); + }#endif #ifdef DEBUG_SERIAL_EARLY_INIT
@@ -260,7 +262,7 @@ void __init setup_arch(char **cmdline_p) && ((unsigned long *)mtd_phys)[1] == ROMSB_WORD1) mtd_size =PAGE_ALIGN (be32_to_cpu (((unsigned long *)mtd_phys)[2 ])); -# if (defined(CONFIG_BLKFIN_CACHE ) && defined(ANOMALY_05000263 )) +# if (defined(CONFIG_BLKFIN_CACHE ) &&ANOMALY_05000263 )/* Due to a Hardware Anomaly we need to limit the size of usable * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on * 05000263 - Hardware loop corrupted when taking an ICPLB exception
@@ -289,7 +291,7 @@ void __init setup_arch(char **cmdline_p) _ebss = memory_mtd_start;/* define _ebss for compatible */ #endif /* CONFIG_MTD_UCLINUX */ -#if (defined(CONFIG_BLKFIN_CACHE ) && defined(ANOMALY_05000263 )) +#if (defined(CONFIG_BLKFIN_CACHE ) &&ANOMALY_05000263 )/* Due to a Hardware Anomaly we need to limit the size of usable * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on * 05000263 - Hardware loop corrupted when taking an ICPLB exception
@@ -337,10 +339,8 @@ void __init setup_arch(char **cmdline_p)printk (KERN_INFO "Processor Speed: %lu MHz core clock and %lu Mhz System Clock\n" , cclk /1000000 , sclk /1000000 ); -#if defined(ANOMALY_05000273 ) -if ((cclk >>1 ) <= sclk) +if (ANOMALY_05000273 && (cclk >>1 ) <= sclk)printk ("\n\n\nANOMALY_05000273: CCLK must be >= 2*SCLK !!!\n\n\n" ); -#endif printk (KERN_INFO "Board Memory: %ldMB\n" , physical_mem_end >>20 );printk (KERN_INFO "Kernel Managed Memory: %ldMB\n" , _ramend >>20 );
@@ -402,11 +402,7 @@ void __init setup_arch(char **cmdline_p)if (l1_length >L1_DATA_A_LENGTH )panic ("L1 data memory overflow\n" ); -#ifdef BF561_FAMILY - _bfin_swrst =bfin_read_SICA_SWRST (); -#else _bfin_swrst =bfin_read_SWRST (); -#endif /* Copy atomic sequences to their fixed location, and sanity check that these locations are the ones that we advertise to userspace. */
@@ -429,6 +425,7 @@ void __init setup_arch(char **cmdline_p)BUG_ON ((char *)&atomic_xor32 - (char *)&fixed_code_start !=ATOMIC_XOR32 -FIXED_CODE_START ); +init_exception_vectors ();bf53x_cache_init (); }
arch/blackfin/kernel/traps.c +47 -8
101 lines not on this page · raw message
arch/blackfin/kernel/vmlinux.lds.S +10 -6
@@ -32,6 +32,7 @@ #include <asm-generic/vmlinux.lds.h> #include <asm/mem_map.h> #include <asm/page.h> +#include <asm/thread_info.h> OUTPUT_FORMAT("elf32-bfin") ENTRY(__start)
@@ -64,8 +65,12 @@ SECTIONS .data : { - . = ALIGN(PAGE_SIZE); + /* make sure the init_task is aligned to the + * kernel thread size so we can locate the kernel + * stack properly and quickly. + */ __sdata = .; + . = ALIGN(THREAD_SIZE); *(.data.init_task) DATA_DATA CONSTRUCTORS
@@ -73,14 +78,14 @@ SECTIONS . = ALIGN(32); *(.data.cacheline_aligned) - . = ALIGN(PAGE_SIZE); + . = ALIGN(THREAD_SIZE); __edata = .; } - . = ALIGN(PAGE_SIZE); ___init_begin = .; .init : { + . = ALIGN(PAGE_SIZE); __sinittext = .; *(.init.text) __einittext = .;
@@ -153,10 +158,9 @@ SECTIONS __ebss_b_l1 = .; } - . = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1); - ___init_end = ALIGN(PAGE_SIZE); + ___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1); - .bss ___init_end : + .bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) : { . = ALIGN(4); ___bss_start = .;
arch/blackfin/lib/memcmp.S +1 -1
@@ -61,7 +61,7 @@ ENTRY(_memcmp) LSETUP (.Lquad_loop_s, .Lquad_loop_e) LC0=P1; .Lquad_loop_s: -#ifdef ANOMALY_05000202 +#if ANOMALY_05000202 R0 = [P0++]; R1 = [I0++]; #else
arch/blackfin/lib/memcpy.S +1 -1
@@ -98,7 +98,7 @@ ENTRY(_memcpy) R0 = R1; I1 = P1; R3 = [I1++]; -#ifdef ANOMALY_05000202 +#if ANOMALY_05000202 .Lword_loops: [P0++] = R3; .Lword_loope:
arch/blackfin/lib/memmove.S +2 -2
@@ -70,7 +70,7 @@ ENTRY(_memmove) R1 = [I0++]; LSETUP (.Lquad_loops, .Lquad_loope) LC0=P1; -#ifdef ANOMALY_05000202 +#if ANOMALY_05000202 .Lquad_loops: [P0++] = R1; .Lquad_loope:
@@ -102,7 +102,7 @@ ENTRY(_memmove) R1 = B[P3--] (Z); CC = P2 == 0; IF CC JUMP .Lno_loop; -#ifdef ANOMALY_05000245 +#if ANOMALY_05000245 NOP; NOP; #endif
arch/blackfin/mach-bf533/head.S +12 -12
@@ -97,7 +97,7 @@ ENTRY(__start) M2 = r0; M3 = r0; - trace_buffer_start(p0,r0); + trace_buffer_init(p0,r0); P0 = R1; R0 = R1;
@@ -144,38 +144,38 @@ ENTRY(__start) ssync; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif
@@ -264,7 +264,7 @@ ENTRY(__start) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop; #endif rti;
@@ -417,8 +417,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-bf537/head.S +16 -16
@@ -95,43 +95,43 @@ ENTRY(__start) M2 = r0; M3 = r0; - trace_buffer_start(p0,r0); + trace_buffer_init(p0,r0); P0 = R1; R0 = R1; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif
@@ -141,12 +141,12 @@ ENTRY(__start) */ p0.h = hi(BFIN_PORT_MUX); p0.l = lo(BFIN_PORT_MUX); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 R0.L = W[P0]; /* Read */ SSYNC; #endif R0 = (PGDE_UART | PFTE_UART)(Z); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 W[P0] = R0.L; /* Write */ SSYNC; #endif
@@ -155,12 +155,12 @@ ENTRY(__start) p0.h = hi(PORTF_FER); p0.l = lo(PORTF_FER); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 R0.L = W[P0]; /* Read */ SSYNC; #endif R0 = 0x000F(Z); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 W[P0] = R0.L; /* Write */ SSYNC; #endif
@@ -274,7 +274,7 @@ ENTRY(__start) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop; #endif rti;
@@ -436,8 +436,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-bf548/Kconfig +2 -2
@@ -282,7 +282,7 @@ menu "Assignment" config PINTx_REASSIGN bool "Reprogram PINT Assignment" - default n + default y help The interrupt assignment registers controls the pin-to-interrupt assignment in a byte-wide manner. Each option allows you to select
@@ -303,7 +303,7 @@ config PINT1_ASSIGN config PINT2_ASSIGN hex "PINT2_ASSIGN" depends on PINTx_REASSIGN - default 0x00000101 + default 0x07000101 config PINT3_ASSIGN hex "PINT3_ASSIGN" depends on PINTx_REASSIGN
arch/blackfin/mach-bf548/boards/ezkit.c +30 -0
@@ -94,6 +94,26 @@ static struct platform_device bfin_uart_device = { };#endif +#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +/* all SPI peripherals info goes here */ +static struct spi_board_info bf54x_spi_board_info[]__initdata = { +}; + +/* SPI controller data */ +static struct bfin5xx_spi_master bf54x_spi_master_info = { + .num_chipselect =8 , + .enable_dma =1 ,/* master has the ability to do dma transfer */ +}; + +static struct platform_device bf54x_spi_master_device = { + .name ="bfin-spi-master" , + .id =1 ,/* Bus number */ + .dev = { + .platform_data = &bf54x_spi_master_info,/* Passed to driver */ + }, +}; +#endif /* spi master and devices */ + static struct platform_device *ezkit_devices[] __initdata = {#if defined(CONFIG_RTC_DRV_BFIN ) || defined(CONFIG_RTC_DRV_BFIN_MODULE ) &rtc_device,
@@ -102,12 +122,22 @@ static struct platform_device *ezkit_devices[] __initdata = {#if defined(CONFIG_SERIAL_BFIN ) || defined(CONFIG_SERIAL_BFIN_MODULE ) &bfin_uart_device,#endif + +#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) + &bf54x_spi_master_device, +#endif };static int __init stamp_init (void ) {printk (KERN_INFO "%s(): registering device resources\n" , __FUNCTION__);platform_add_devices (ezkit_devices,ARRAY_SIZE (ezkit_devices)); + +#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +spi_register_board_info (bf54x_spi_board_info, +ARRAY_SIZE (bf54x_spi_board_info)); +#endif +return 0 ; }
arch/blackfin/mach-bf548/gpio.c +81 -17
207 lines not on this page · raw message
arch/blackfin/mach-bf548/head.S +8 -8
@@ -92,13 +92,13 @@ ENTRY(__stext) M2 = r0; M3 = r0; - trace_buffer_start(p0,r0); + trace_buffer_init(p0,r0); P0 = R1; R0 = R1; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1;
@@ -106,8 +106,8 @@ ENTRY(__stext) SSYNC; /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1;
@@ -172,7 +172,7 @@ ENTRY(__stext) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined (ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop;
@@ -335,8 +335,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-bf561/head.S +17 -18
@@ -95,43 +95,42 @@ ENTRY(__start) M2 = r0; M3 = r0; - trace_buffer_start(p0,r0); + trace_buffer_init(p0,r0); P0 = R1; R0 = R1; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1; - /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif
@@ -220,7 +219,7 @@ ENTRY(__start) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop; #endif rti;
@@ -372,8 +371,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
@@ -440,15 +439,15 @@ ENTRY(_bfin_reset) SSYNC; /* make sure SYSCR is set to use BMODE */ - P0.h = hi(SICA_SYSCR); - P0.l = lo(SICA_SYSCR); - R0.l = 0x20; + P0.h = hi(SYSCR); + P0.l = lo(SYSCR); + R0.l = 0x20; /* on BF561, disable core b */ W[P0] = R0.l; SSYNC; /* issue a system soft reset */ - P1.h = hi(SICA_SWRST); - P1.l = lo(SICA_SWRST); + P1.h = hi(SWRST); + P1.l = lo(SWRST); R1.l = 0x0007; W[P1] = R1; SSYNC;
arch/blackfin/mach-common/cache.S +4 -4
@@ -79,8 +79,8 @@ ENTRY(_icache_invalidate) ENTRY(_invalidate_entire_icache) [--SP] = ( R7:5); - P0.L = (IMEM_CONTROL & 0xFFFF); - P0.H = (IMEM_CONTROL >> 16); + P0.L = LO(IMEM_CONTROL); + P0.H = HI(IMEM_CONTROL); R7 = [P0]; /* Clear the IMC bit , All valid bits in the instruction
@@ -197,8 +197,8 @@ ENTRY(_invalidate_entire_dcache) ENTRY(_dcache_invalidate) [--SP] = ( R7:6); - P0.L = (DMEM_CONTROL & 0xFFFF); - P0.H = (DMEM_CONTROL >> 16); + P0.L = LO(DMEM_CONTROL); + P0.H = HI(DMEM_CONTROL); R7 = [P0]; /* Clear the DMC[1:0] bits, All valid bits in the data
arch/blackfin/mach-common/cacheinit.S +6 -3
@@ -38,13 +38,13 @@ .text -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 #if defined(CONFIG_BLKFIN_CACHE) ENTRY(_bfin_write_IMEM_CONTROL) /* Enable Instruction Cache */ - P0.l = (IMEM_CONTROL & 0xFFFF); - P0.h = (IMEM_CONTROL >> 16); + P0.l = LO(IMEM_CONTROL); + P0.h = HI(IMEM_CONTROL); /* Anomaly 05000125 */ CLI R1;
@@ -60,6 +60,9 @@ ENDPROC(_bfin_write_IMEM_CONTROL) #if defined(CONFIG_BLKFIN_DCACHE) ENTRY(_bfin_write_DMEM_CONTROL) + P0.l = (DMEM_CONTROL & 0xFFFF); + P0.h = (DMEM_CONTROL >> 16); + CLI R1; SSYNC; /* SSYNC required before writing to DMEM_CONTROL. */ .align 8;
arch/blackfin/mach-common/cplbmgr.S +27 -27
123 lines not on this page · raw message
arch/blackfin/mach-common/dpmc.S +26 -26
99 lines not on this page · raw message
arch/blackfin/mach-common/entry.S +78 -5
126 lines not on this page · raw message
arch/blackfin/mach-common/interrupt.S +3 -3
@@ -140,7 +140,7 @@ __common_int_entry: fp = 0; #endif -#if defined (ANOMALY_05000283) || defined (ANOMALY_05000315) +#if ANOMALY_05000283 || ANOMALY_05000315 cc = r7 == r7; p5.h = 0xffc0; p5.l = 0x0014;
@@ -163,7 +163,7 @@ ENTRY(_evt_ivhw) #ifdef CONFIG_FRAME_POINTER fp = 0; #endif -#ifdef ANOMALY_05000283 +#if ANOMALY_05000283 cc = r7 == r7; p5.h = 0xffc0; p5.l = 0x0014;
@@ -207,7 +207,7 @@ ENTRY(_evt_evt2) #ifdef CONFIG_FRAME_POINTER fp = 0; #endif -#ifdef ANOMALY_05000283 +#if ANOMALY_05000283 cc = r7 == r7; p5.h = 0xffc0; p5.l = 0x0014;
arch/blackfin/mach-common/ints-priority-dc.c +24 -19
70 lines not on this page · raw message
arch/blackfin/mach-common/ints-priority-sc.c +32 -24
99 lines not on this page · raw message
arch/blackfin/mach-common/lock.S +10 -10
@@ -43,12 +43,12 @@ ENTRY(_cache_grab_lock) [--SP]=( R7:0,P5:0 ); - P1.H = (IMEM_CONTROL >> 16); - P1.L = (IMEM_CONTROL & 0xFFFF); - P5.H = (ICPLB_ADDR0 >> 16); - P5.L = (ICPLB_ADDR0 & 0xFFFF); - P4.H = (ICPLB_DATA0 >> 16); - P4.L = (ICPLB_DATA0 & 0xFFFF); + P1.H = HI(IMEM_CONTROL); + P1.L = LO(IMEM_CONTROL); + P5.H = HI(ICPLB_ADDR0); + P5.L = LO(ICPLB_ADDR0); + P4.H = HI(ICPLB_DATA0); + P4.L = LO(ICPLB_DATA0); R7 = R0; /* If the code of interest already resides in the cache
@@ -167,8 +167,8 @@ ENTRY(_cache_lock) [--SP]=( R7:0,P5:0 ); - P1.H = (IMEM_CONTROL >> 16); - P1.L = (IMEM_CONTROL & 0xFFFF); + P1.H = HI(IMEM_CONTROL); + P1.L = LO(IMEM_CONTROL); /* Disable the Interrupts*/ CLI R3;
@@ -195,8 +195,8 @@ ENDPROC(_cache_lock) */ ENTRY(_read_iloc) - P1.H = (IMEM_CONTROL >> 16); - P1.L = (IMEM_CONTROL & 0xFFFF); + P1.H = HI(IMEM_CONTROL); + P1.L = LO(IMEM_CONTROL); R1 = 0xF; R0 = [P1]; R0 = R0 >> 3;
arch/blackfin/oprofile/op_blackfin.h +4 -4
@@ -68,7 +68,7 @@ static inline unsigned int ctr_read(void)unsigned int tmp; tmp =bfin_read_PFCTL (); -__builtin_bfin_csync (); +CSYNC ();return tmp; }
@@ -76,21 +76,21 @@ static inline unsigned int ctr_read(void)static inline void ctr_write (unsigned int val) {bfin_write_PFCTL (val); -__builtin_bfin_csync (); +CSYNC (); }static inline void count_read (unsigned int *count) { count[0 ] =bfin_read_PFCNTR0 (); count[1 ] =bfin_read_PFCNTR1 (); -__builtin_bfin_csync (); +CSYNC (); }static inline void count_write (unsigned int *count) {bfin_write_PFCNTR0 (count[0 ]);bfin_write_PFCNTR1 (count[1 ]); -__builtin_bfin_csync (); +CSYNC (); }extern int pm_overflow_handler (int irq,struct pt_regs *regs);
drivers/i2c/busses/Kconfig +2 -2
@@ -92,9 +92,9 @@ config I2C_AU1550 config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" - depends on BF534 || BF536 || BF537 + depends on BF534 || BF536 || BF537 || BF54x help - This is the TWI I2C device driver for Blackfin 534/536/537. + This is the TWI I2C device driver for Blackfin 534/536/537/54x. This driver can also be built as a module. If so, the module will be called i2c-bfin-twi.
drivers/input/serio/Kconfig +1 -1
@@ -21,7 +21,7 @@ if SERIO config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y - depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K + depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BFIN ---help--- i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices,
drivers/net/bfin_mac.c +5 -1
@@ -798,6 +798,7 @@ static void bf537mac_shutdown(struct net_device *dev)*/ static int bf537mac_open (struct net_device *dev) { +int retval;pr_debug ("%s: %s\n" , dev->name, __FUNCTION__);/*
@@ -811,7 +812,10 @@ static int bf537mac_open(struct net_device *dev) }/* initial rx and tx list */ -desc_list_init (); + retval =desc_list_init (); + +if (retval) +return retval;bf537mac_setphy (dev);setup_system_regs (dev);
drivers/rtc/rtc-bfin.c +1 -1
@@ -1,6 +1,6 @@/* * Blackfin On-Chip Real Time Clock Driver -* Supports BF531/BF532/BF533/BF534/BF536/BF537 +* Supports BF53[123]/BF53[467]/BF54[2489] * * Copyright 2004-2007 Analog Devices Inc. *
drivers/serial/bfin_5xx.c +7 -7
@@ -173,12 +173,12 @@ void kgdb_put_debug_char(int chr) uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT ];while (!(UART_GET_LSR (uart) &THRE )) { -__builtin_bfin_ssync (); +SSYNC (); }UART_PUT_LCR (uart,UART_GET_LCR (uart)&(~DLAB )); -__builtin_bfin_ssync (); +SSYNC ();UART_PUT_CHAR (uart, (unsigned char )chr); -__builtin_bfin_ssync (); +SSYNC (); }int kgdb_get_debug_char (void )
@@ -192,12 +192,12 @@ int kgdb_get_debug_char(void) uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT ];while (!(UART_GET_LSR (uart) &DR )) { -__builtin_bfin_ssync (); +SSYNC (); }UART_PUT_LCR (uart,UART_GET_LCR (uart)&(~DLAB )); -__builtin_bfin_ssync (); +SSYNC (); chr =UART_GET_CHAR (uart); -__builtin_bfin_ssync (); +SSYNC ();return chr; }
@@ -1203,7 +1203,7 @@ static int __init bfin_serial_init(void) IRQF_DISABLED, "BFIN_UART_RX", uart);pr_info ("Request irq for kgdb uart port\n" );UART_PUT_IER (uart,UART_GET_IER (uart) |ERBFI ); -__builtin_bfin_ssync (); +SSYNC (); t.c_cflag =CS8 |B57600 ; t.c_iflag =0 ; t.c_oflag =0 ;
drivers/spi/spi_bfin5xx.c +99 -103
470 lines not on this page · raw message
include/asm-blackfin/bfin-global.h +1 -0
@@ -61,6 +61,7 @@ extern void bfin_dcache_init(void);extern int read_iloc (void );extern int bfin_console_init (void ); extern asmlinkage void lower_to_irq14(void); +extern void init_exception_vectors (void );extern void init_dma (void );extern void program_IAR (void );extern void evt14_softirq (void );
include/asm-blackfin/bfin5xx_spi.h +6 -0
@@ -150,6 +150,12 @@#define CFG_SPI_CS6VALUE 6#define CFG_SPI_CS7VALUE 7 +#if defined(CONFIG_BF54x) +#define CH_SPI CH_SPI0 +#define bfin_read_SPI_STAT bfin_read_SPI0_STAT +#endif + +/* device.platform_data for SSP controller devices */ struct bfin5xx_spi_master {u16 num_chipselect;
include/asm-blackfin/blackfin.h +60 -64
161 lines not on this page · raw message
include/asm-blackfin/gpio.h +31 -0
@@ -144,6 +144,24 @@#ifdef BF533_FAMILY #define MAX_BLACKFIN_GPIOS 16 + +#define GPIO_PF0 0 +#define GPIO_PF1 1 +#define GPIO_PF2 2 +#define GPIO_PF3 3 +#define GPIO_PF4 4 +#define GPIO_PF5 5 +#define GPIO_PF6 6 +#define GPIO_PF7 7 +#define GPIO_PF8 8 +#define GPIO_PF9 9 +#define GPIO_PF10 10 +#define GPIO_PF11 11 +#define GPIO_PF12 12 +#define GPIO_PF13 13 +#define GPIO_PF14 14 +#define GPIO_PF15 15 +#endif #ifdef BF537_FAMILY
@@ -421,6 +439,19 @@ unsigned short gpio_get_value(unsigned short gpio);void gpio_direction_input (unsigned short gpio);void gpio_direction_output (unsigned short gpio); +#include <asm-generic/gpio.h> /* cansleep wrappers */ +#include <asm/irq.h> + +static inline int gpio_to_irq (unsigned gpio) +{ +return (gpio +GPIO_IRQ_BASE ); +} + +static inline int irq_to_gpio (unsigned irq) +{ +return (irq -GPIO_IRQ_BASE ); +} +#endif /* __ASSEMBLY__ */ #endif /* __ARCH_BLACKFIN_GPIO_H__ */
include/asm-blackfin/mach-bf533/anomaly.h +239 -228
143 lines not on this page · raw message
include/asm-blackfin/mach-bf533/bf533.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +9 -2
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf533/blackfin.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf533/cdefBF532.h +4 -6
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf533/portmux.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf537/anomaly.h +126 -122
248 lines not on this page · raw message
include/asm-blackfin/mach-bf537/bf537.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +14 -9
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf537/blackfin.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf537/cdefBF534.h +3 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf537/portmux.h +34 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf548/anomaly.h +63 -67
130 lines not on this page · raw message
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +19 -20
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf548/blackfin.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf548/cdefBF54x_base.h +36 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf548/defBF54x_base.h +17 -0
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf561/anomaly.h +240 -169
409 lines not on this page · raw message
include/asm-blackfin/mach-bf561/bf561.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +9 -2
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf561/blackfin.h +1 -1
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf561/cdefBF561.h +9 -6
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-bf561/defBF561.h +4 -0
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-common/cdef_LPBlackfin.h +2 -2
Lines of this file are not shown. View the raw message.
include/asm-blackfin/mach-common/def_LPBlackfin.h +64 -68
132 lines not on this page · raw message
include/asm-blackfin/system.h +51 -42
93 lines not on this page · raw message
include/asm-blackfin/trace.h +46 -9
55 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 2 lines · Bryan Wu
Please pull from 'for-linus' branch of
This really is too big for post-rc1.
I realize that this is all blackfin-only, and that it doesn't matter from a practical standpoint, but I want you guys to learn to follow the merge window, and the only way I can do that is by enforcing it.
Linus
Quoted 5 lines · Linus Torvalds
Quoted 2 lines · Bryan Wu
Please pull from 'for-linus' branch of
Quoted 7 lines
This really is too big for post-rc1.
I realize that this is all blackfin-only, and that it doesn't matter from a practical standpoint, but I want you guys to learn to follow the merge window, and the only way I can do that is by enforcing it.
Linus
Exactly. In the 2.6.23-rc1 merge window, I am trying to submit blackfin driver patches and other new stuffs. So put those bug fixing and some small updates in this series.
I will review the series again, submit critical bug fixing in rc2 and maybe split rest of them into following -rc.
Thanks Jeff, after using you script, I generate this big email. It's beautiful but I missed merge window.
Thanks a lot
Best Regards,
- Bryan Wu
A message that is not in the archive (sent off-list or not yet received): 1185382018.1050.152.camel@localhost
Hi Joe, please reply to all of this email, because some developers need to consider your review.
Hi Michael, how do you think of Joe's idea as below.
Thanks,
Best Regards,
- Bryan Wu
Quoted 76 lines · Joe Perches
arch/blackfin/kernel/bfin_gpio.c inline int check_gpio(unsigned short gpio)
Quoted 6 lines · Bryan Wu
arch/blackfin/kernel/bfin_gpio.c +0
-0@@ -143,22 +148,100 @@ inline int check_gpio(unsigned short gpio)[]
Quoted 12 lines
arch/blackfin/kernel/bfin_gpio.c +12
-0+#ifdef BF537_FAMILY + +#define PMUX_LUT_RES 0 +#define PMUX_LUT_OFFSET 1 +#define PMUX_LUT_ENTRIES 41 +#define PMUX_LUT_SIZE 2 + +static unsigned short port_mux_lut[PMUX_LUT_ENTRIES ][PMUX_LUT_SIZE ] = { + {P_PPI0_D13 ,11 }, {P_PPI0_D14 ,11 }, {P_PPI0_D15 ,11 }, + {P_SPORT1_TFS ,11 }, {P_SPORT1_TSCLK ,11 }, {P_SPORT1_DTPRI ,11 }, + {P_PPI0_D10 ,10 }, {P_PPI0_D11 ,10 }, {P_PPI0_D12 ,10 }, + {P_SPORT1_RSCLK, 10}, {P_SPORT1_RFS, 10}, {P_SPORT1_DRPRI, 10},arch/blackfin/kernel/bfin_gpio.c inline int check_gpio(unsigned short gpio) · line 216
Quoted 10 lines
arch/blackfin/kernel/bfin_gpio.c +10
-0+ {P_PPI0_D8, 9}, {P_PPI0_D9, 9}, {P_SPORT1_DRSEC, 9}, + {P_SPORT1_DTSEC, 9}, {P_TMR2, 8}, {P_PPI0_FS3, 8}, {P_TMR3, 7}, + {P_SPI0_SSEL4, 7}, {P_TMR4, 6}, {P_SPI0_SSEL5, 6}, {P_TMR5, 5}, + {P_SPI0_SSEL6, 5}, {P_UART1_RX, 4}, {P_UART1_TX, 4}, {P_TMR6, 4}, + {P_TMR7, 4}, {P_UART0_RX, 3}, {P_UART0_TX, 3}, {P_DMAR0, 3}, + {P_DMAR1, 3}, {P_SPORT0_DTSEC, 1}, {P_SPORT0_DRSEC, 1}, + {P_CAN0_RX, 1}, {P_CAN0_TX, 1}, {P_SPI0_SSEL7, 1}, + {P_SPORT0_TFS, 0}, {P_SPORT0_DTPRI, 0}, {P_SPI0_SSEL2, 0}, + {P_SPI0_SSEL3, 0} +};Wouldn't this be better as a struct?
struct PMUX_LUT { unsigned short res; unsigned short offset; }struct PMUX_LUT port_mux_lut = { {.res = P_PPI0_D13, .offset = 11}, {.res = P_PPi0_D14, .offset = 11}, etc? };arch/blackfin/kernel/bfin_gpio.c inline int check_gpio(unsigned short gpio) · line 220
Quoted 5 lines
arch/blackfin/kernel/bfin_gpio.c +4
-0+ +static void portmux_setup (unsigned short per,unsigned short function) +{ +u16 y, muxreg, offset;Shouldn't y be int?
arch/blackfin/kernel/bfin_gpio.c static void default_gpio(unsigned short gpio) · line 266
Quoted 11 lines
arch/blackfin/kernel/bfin_gpio.c +1
-5@@ -179,22 +262,15 @@ static void default_gpio(unsigned short gpio)static int __init bfin_gpio_init (void ) { -int i; - -printk (KERN_INFO "Blackfin GPIO Controller\n" ); -for (i =0 ; i <MAX_BLACKFIN_GPIOS ; i +=GPIO_BANKSIZE ) - reserved_map[gpio_bank (i)] =0 ; + str_ident =kzalloc (RESOURCE_LABEL_SIZE *256 ,GFP_KERNEL );256?
perhaps better to use
kcalloc(RESOURCE_LABEL_SIZE, 256, GFP_KERNEL)and referencestr_identas an array of char* instead of the multiplies inset_label,get_labelandcmp_label?arch/blackfin/kernel/bfin_gpio.c static void default_gpio(unsigned short gpio) · line 268
Quoted 2 lines
arch/blackfin/kernel/bfin_gpio.c +2
-0+if (!str_ident) +return -ENOMEM ;cheers, Joe