Skip to content

L
linux
Commit 604a2785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
  Blackfin arch: sram: use 'unsigned long' for irqflags
  Blackfin arch: let PCI depend on BROKEN
  Blackfin arch: move include/asm-blackfin header files to arch/blackfin
  Blackfin arch: fix bug - MPU crashes under stress
  Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
  Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
  Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
parents 66833d5f d310fb4b
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 197 deletions
arch/blackfin/Kconfig
View file @ 604a2785
......@@ -855,6 +855,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
config PCI
bool "PCI support"
depends on BROKEN
help
Support for PCI bus.
......
arch/blackfin/Makefile
View file @ 604a2785
......@@ -98,36 +98,20 @@ libs-y += arch/$(ARCH)/lib/
drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/
machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y))
KBUILD_CFLAGS += -Iarch/$(ARCH)/include/
KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include
# Update machine arch symlinks if something which affects
# them changed. We use .mach to indicate when they were updated
# last, otherwise make uses the target directory mtime.
show_mach_symlink = :
quiet_show_mach_symlink = echo ' SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach'
silent_show_mach_symlink = :
include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf
@$($(quiet)show_mach_symlink)
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-$(ARCH)
$(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach
else
$(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach
endif
@touch $@
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
CLEAN_FILES += \
include/asm-$(ARCH)/asm-offsets.h \
arch/$(ARCH)/include/asm/asm-offsets.h \
arch/$(ARCH)/kernel/asm-offsets.s \
include/asm-$(ARCH)/mach \
include/asm-$(ARCH)/.mach
archprepare: include/asm-blackfin/.mach
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
INSTALL_PATH ?= /tftpboot
boot := arch/$(ARCH)/boot
BOOT_TARGETS = vmImage
......
include/asm-blackfin/blackfin.h → arch/blackfin/include/asm/blackfin.h
View file @ 604a2785
......@@ -11,7 +11,7 @@
#define HI(con32) (((con32) >> 16) & 0xFFFF)
#define hi(con32) (((con32) >> 16) & 0xFFFF)
#include <asm/mach/anomaly.h>
#include <mach/anomaly.h>
#ifndef __ASSEMBLY__
......@@ -86,7 +86,7 @@ static inline void CSYNC(void)
#endif /* __ASSEMBLY__ */
#include <asm/mach/blackfin.h>
#include <mach/blackfin.h>
#include <asm/bfin-global.h>
#endif /* _BLACKFIN_H_ */
include/asm-blackfin/mach-common/cdef_LPBlackfin.h → arch/blackfin/include/asm/cdef_LPBlackfin.h
View file @ 604a2785
......@@ -33,7 +33,7 @@
#warning cdef_LPBlackfin.h should only be included for 532 compatible chips.
#endif
*/
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/*Cache & SRAM Memory*/
#define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS)
......
include/asm-blackfin/cplb.h → arch/blackfin/include/asm/cplb.h
View file @ 604a2785
......@@ -31,7 +31,7 @@
#define _CPLB_H
#include <asm/blackfin.h>
#include <asm/mach/anomaly.h>
#include <mach/anomaly.h>
#define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO)
#define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK)
......
include/asm-blackfin/mach-common/def_LPBlackfin.h → arch/blackfin/include/asm/def_LPBlackfin.h
View file @ 604a2785
......@@ -31,7 +31,7 @@
#ifndef _DEF_LPBLACKFIN_H
#define _DEF_LPBLACKFIN_H
#include <asm/mach/anomaly.h>
#include <mach/anomaly.h>
#define MK_BMSK_(x) (1<<x)
......
include/asm-blackfin/delay.h → arch/blackfin/include/asm/delay.h
View file @ 604a2785
......@@ -9,7 +9,7 @@
#ifndef __ASM_DELAY_H__
#define __ASM_DELAY_H__
#include <asm/mach/anomaly.h>
#include <mach/anomaly.h>
static inline void __delay(unsigned long loops)
{
......
include/asm-blackfin/dma.h → arch/blackfin/include/asm/dma.h
View file @ 604a2785
......@@ -35,7 +35,7 @@
#include <asm/signal.h>
#include <linux/kernel.h>
#include <asm/mach/dma.h>
#include <mach/dma.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
#include <asm/blackfin.h>
......
include/asm-blackfin/gpio.h → arch/blackfin/include/asm/gpio.h
View file @ 604a2785
......@@ -224,7 +224,7 @@
#endif
#ifdef BF548_FAMILY
#include <asm-blackfin/mach-bf548/gpio.h>
#include <mach/gpio.h>
#endif
#ifdef BF561_FAMILY
......
include/asm-blackfin/irq.h → arch/blackfin/include/asm/irq.h
View file @ 604a2785
......@@ -17,7 +17,7 @@
#ifndef _BFIN_IRQ_H_
#define _BFIN_IRQ_H_
#include <asm/mach/irq.h>
#include <mach/irq.h>
#include <asm/ptrace.h>
/*******************************************************************************
......@@ -34,7 +34,7 @@
* interrupts apart (just the TX/RX for the various devices)
*******************************************************************************/
/* SYS_IRQS and NR_IRQS are defined in <asm/mach-bf5xx/irq.h>*/
/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/
/*
* Machine specific interrupt sources.
......
include/asm-blackfin/mem_map.h → arch/blackfin/include/asm/mem_map.h
View file @ 604a2785
......@@ -7,6 +7,6 @@
#ifndef _MEM_MAP_H_
#define _MEM_MAP_H_
#include <asm/mach/mem_map.h>
#include <mach/mem_map.h>
#endif /* _MEM_MAP_H_ */
include/asm-blackfin/mmu_context.h → arch/blackfin/include/asm/mmu_context.h
View file @ 604a2785
......@@ -173,8 +173,10 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr,
static inline void update_protections(struct mm_struct *mm)
{
if (mm->context.page_rwx_mask == current_rwx_mask) {
flush_switched_cplbs();
set_mask_dcplbs(mm->context.page_rwx_mask);
}
}
#endif
......
include/asm-blackfin/pgtable.h → arch/blackfin/include/asm/pgtable.h
View file @ 604a2785
......@@ -4,7 +4,7 @@
#include <asm-generic/4level-fixup.h>
#include <asm/page.h>
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
typedef pte_t *pte_addr_t;
/*
......
include/asm-blackfin/portmux.h → arch/blackfin/include/asm/portmux.h
View file @ 604a2785
......@@ -21,7 +21,7 @@ int peripheral_request_list(const unsigned short per[], const char *label);
void peripheral_free_list(const unsigned short per[]);
#include <asm/gpio.h>
#include <asm/mach/portmux.h>
#include <mach/portmux.h>
#ifndef P_SPORT2_TFS
#define P_SPORT2_TFS P_UNDEF
......
include/asm-blackfin/system.h → arch/blackfin/include/asm/system.h
View file @ 604a2785
......@@ -36,7 +36,7 @@
#include <linux/linkage.h>
#include <linux/compiler.h>
#include <asm/mach/anomaly.h>
#include <mach/anomaly.h>
/*
* Interrupt configuring macros.
......
arch/blackfin/kernel/entry.S
View file @ 604a2785
......@@ -32,7 +32,7 @@
#include <asm/errno.h>
#include <asm/asm-offsets.h>
#include <asm/mach-common/context.S>
#include <asm/context.S>
#ifdef CONFIG_EXCPT_IRQ_SYSC_L1
.section .l1.text
......
arch/blackfin/mach-bf527/head.S
View file @ 604a2785
......@@ -31,8 +31,8 @@
#include <linux/init.h>
#include <asm/blackfin.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
#include <asm/mach-common/clocks.h>
#include <asm/mach/mem_init.h>
#include <asm/clocks.h>
#include <mach/mem_init.h>
#endif
.section .l1.text
......
include/asm-blackfin/mach-bf527/cdefBF522.h → arch/blackfin/mach-bf527/include/mach/cdefBF522.h
View file @ 604a2785
......@@ -36,7 +36,7 @@
#include "defBF522.h"
/* include core specific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */
......
include/asm-blackfin/mach-bf527/cdefBF525.h → arch/blackfin/mach-bf527/include/mach/cdefBF525.h
View file @ 604a2785
......@@ -36,7 +36,7 @@
#include "defBF525.h"
/* include core specific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */
......
include/asm-blackfin/mach-bf527/cdefBF527.h → arch/blackfin/mach-bf527/include/mach/cdefBF527.h
View file @ 604a2785
......@@ -36,7 +36,7 @@
#include "defBF527.h"
/* include core specific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */
......
include/asm-blackfin/mach-bf527/cdefBF52x_base.h → arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
View file @ 604a2785
......@@ -37,7 +37,7 @@
#include "defBF52x_base.h"
/* Include core specific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* ==== begin from cdefBF534.h ==== */
......
include/asm-blackfin/mach-bf527/defBF522.h → arch/blackfin/mach-bf527/include/mach/defBF522.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF522_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */
......
include/asm-blackfin/mach-bf527/defBF525.h → arch/blackfin/mach-bf527/include/mach/defBF525.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF525_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */
......
include/asm-blackfin/mach-bf527/defBF527.h → arch/blackfin/mach-bf527/include/mach/defBF527.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF527_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */
......
include/asm-blackfin/mach-bf527/defBF52x_base.h → arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
View file @ 604a2785
......@@ -635,17 +635,8 @@
#define SET_SSEL(x) ((x)&0xF) /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */
/* VR_CTL Masks */
#define FREQ 0x0003 /* Switching Oscillator Frequency For Regulator */
#define FREQ 0x3000 /* Switching Oscillator Frequency For Regulator */
#define HIBERNATE 0x0000 /* Powerdown/Bypass On-Board Regulation */
#define FREQ_333 0x0001 /* Switching Frequency Is 333 kHz */
#define FREQ_667 0x0002 /* Switching Frequency Is 667 kHz */
#define FREQ_1000 0x0003 /* Switching Frequency Is 1 MHz */
#define GAIN 0x000C /* Voltage Level Gain */
#define GAIN_5 0x0000 /* GAIN = 5 */
#define GAIN_10 0x0004 /* GAIN = 10 */
#define GAIN_20 0x0008 /* GAIN = 20 */
#define GAIN_50 0x000C /* GAIN = 50 */
#define VLEV 0x00F0 /* Internal Voltage Level */
#define VLEV_085 0x0060 /* VLEV = 0.85 V (-5% - +10% Accuracy) */
......@@ -660,7 +651,7 @@
#define VLEV_130 0x00F0 /* VLEV = 1.30 V (-5% - +10% Accuracy) */
#define WAKE 0x0100 /* Enable RTC/Reset Wakeup From Hibernate */
#define CANWE 0x0200 /* Enable CAN Wakeup From Hibernate */
#define USBWE 0x0200 /* Enable USB Wakeup From Hibernate */
#define PHYWE 0x0400 /* Enable PHY Wakeup From Hibernate */
#define CLKBUFOE 0x4000 /* CLKIN Buffer Output Enable */
#define PHYCLKOE CLKBUFOE /* Alternative legacy name for the above */
......
arch/blackfin/mach-bf533/head.S
View file @ 604a2785
......@@ -31,8 +31,8 @@
#include <linux/init.h>
#include <asm/blackfin.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
#include <asm/mach-common/clocks.h>
#include <asm/mach/mem_init.h>
#include <asm/clocks.h>
#include <mach/mem_init.h>
#endif
.section .l1.text
......
include/asm-blackfin/mach-bf533/cdefBF532.h → arch/blackfin/mach-bf533/include/mach/cdefBF532.h
View file @ 604a2785
......@@ -37,7 +37,7 @@
#include "defBF532.h"
/*include core specific register pointer definitions*/
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
#include <asm/system.h>
......
include/asm-blackfin/mach-bf533/defBF532.h → arch/blackfin/mach-bf533/include/mach/defBF532.h
View file @ 604a2785
......@@ -48,7 +48,7 @@
#define _DEF_BF532_H
/* include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/*********************************************************************************** */
/* System MMR Register Map */
......
arch/blackfin/mach-bf537/boards/stamp.c
View file @ 604a2785
......@@ -584,6 +584,30 @@ static struct bfin5xx_spi_chip spidev_chip_info = {
#if defined(CONFIG_MTD_DATAFLASH) \
|| defined(CONFIG_MTD_DATAFLASH_MODULE)
static struct mtd_partition bfin_spi_dataflash_partitions[] = {
{
.name = "bootloader(spi)",
.size = 0x00040000,
.offset = 0,
.mask_flags = MTD_CAP_ROM
}, {
.name = "linux kernel(spi)",
.size = 0xe0000,
.offset = MTDPART_OFS_APPEND,
}, {
.name = "file system(spi)",
.size = MTDPART_SIZ_FULL,
.offset = MTDPART_OFS_APPEND,
}
};
static struct flash_platform_data bfin_spi_dataflash_data = {
.name = "SPI Dataflash",
.parts = bfin_spi_dataflash_partitions,
.nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions),
};
/* DataFlash chip */
static struct bfin5xx_spi_chip data_flash_chip_info = {
.enable_dma = 0, /* use dma transfer with this chip*/
......@@ -609,9 +633,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
|| defined(CONFIG_MTD_DATAFLASH_MODULE)
{ /* DataFlash chip */
.modalias = "mtd_dataflash",
.max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
.max_speed_hz = 33250000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, /* Framework bus number */
.chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
.platform_data = &bfin_spi_dataflash_data,
.controller_data = &data_flash_chip_info,
.mode = SPI_MODE_3,
},
......
arch/blackfin/mach-bf537/head.S
View file @ 604a2785
......@@ -31,8 +31,8 @@
#include <linux/init.h>
#include <asm/blackfin.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
#include <asm/mach-common/clocks.h>
#include <asm/mach/mem_init.h>
#include <asm/clocks.h>
#include <mach/mem_init.h>
#endif
.section .l1.text
......
include/asm-blackfin/mach-bf537/cdefBF534.h → arch/blackfin/mach-bf537/include/mach/cdefBF534.h
View file @ 604a2785
......@@ -38,7 +38,7 @@
#include "defBF534.h"
/* Include core specific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
#include <asm/system.h>
......
include/asm-blackfin/mach-bf537/defBF534.h → arch/blackfin/mach-bf537/include/mach/defBF534.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF534_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/************************************************************************************
** System MMR Register Map
......
include/asm-blackfin/mach-bf537/defBF537.h → arch/blackfin/mach-bf537/include/mach/defBF537.h
View file @ 604a2785
......@@ -33,7 +33,7 @@
#define _DEF_BF537_H
/* Include all Core registers and bit definitions*/
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* Include all MMR and bit defines common to BF534 */
#include "defBF534.h"
......
arch/blackfin/mach-bf548/boards/cm_bf548.c
View file @ 604a2785
......@@ -45,7 +45,7 @@
#include <asm/gpio.h>
#include <asm/nand.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x_keys.h>
#include <mach/bf54x_keys.h>
#include <asm/dpmc.h>
#include <linux/input.h>
#include <linux/spi/ad7877.h>
......@@ -61,7 +61,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548";
#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
#include <asm/mach/bf54x-lq043.h>
#include <mach/bf54x-lq043.h>
static struct bfin_bf54xfb_mach_info bf54x_lq043_data = {
.width = 480,
......
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ 604a2785
......@@ -48,7 +48,7 @@
#include <asm/nand.h>
#include <asm/dpmc.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x_keys.h>
#include <mach/bf54x_keys.h>
#include <linux/input.h>
#include <linux/spi/ad7877.h>
......@@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init);
#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
#include <asm/mach/bf54x-lq043.h>
#include <mach/bf54x-lq043.h>
static struct bfin_bf54xfb_mach_info bf54x_lq043_data = {
.width = 480,
......
arch/blackfin/mach-bf548/head.S
View file @ 604a2785
......@@ -31,8 +31,8 @@
#include <linux/init.h>
#include <asm/blackfin.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
#include <asm/mach-common/clocks.h>
#include <asm/mach/mem_init.h>
#include <asm/clocks.h>
#include <mach/mem_init.h>
#endif
.section .l1.text
......
include/asm-blackfin/mach-bf548/cdefBF542.h → arch/blackfin/mach-bf548/include/mach/cdefBF542.h
View file @ 604a2785
......@@ -35,7 +35,7 @@
#include "defBF542.h"
/* include core sbfin_read_()ecific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */
......
include/asm-blackfin/mach-bf548/cdefBF544.h → arch/blackfin/mach-bf548/include/mach/cdefBF544.h
View file @ 604a2785
......@@ -35,7 +35,7 @@
#include "defBF544.h"
/* include core sbfin_read_()ecific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */
......
include/asm-blackfin/mach-bf548/cdefBF547.h → arch/blackfin/mach-bf548/include/mach/cdefBF547.h
View file @ 604a2785
......@@ -35,7 +35,7 @@
#include "defBF548.h"
/* include core sbfin_read_()ecific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
......
include/asm-blackfin/mach-bf548/cdefBF548.h → arch/blackfin/mach-bf548/include/mach/cdefBF548.h
View file @ 604a2785
......@@ -35,7 +35,7 @@
#include "defBF548.h"
/* include core sbfin_read_()ecific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
......
include/asm-blackfin/mach-bf548/cdefBF549.h → arch/blackfin/mach-bf548/include/mach/cdefBF549.h
View file @ 604a2785
......@@ -35,7 +35,7 @@
#include "defBF549.h"
/* include core sbfin_read_()ecific register pointer definitions */
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */
......
include/asm-blackfin/mach-bf548/defBF542.h → arch/blackfin/mach-bf548/include/mach/defBF542.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF542_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */
......
include/asm-blackfin/mach-bf548/defBF544.h → arch/blackfin/mach-bf548/include/mach/defBF544.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF544_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */
......
include/asm-blackfin/mach-bf548/defBF547.h → arch/blackfin/mach-bf548/include/mach/defBF547.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF548_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
......
include/asm-blackfin/mach-bf548/defBF548.h → arch/blackfin/mach-bf548/include/mach/defBF548.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF548_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
......
include/asm-blackfin/mach-bf548/defBF549.h → arch/blackfin/mach-bf548/include/mach/defBF549.h
View file @ 604a2785
......@@ -32,7 +32,7 @@
#define _DEF_BF549_H
/* Include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */
......
arch/blackfin/mach-bf561/head.S
View file @ 604a2785
......@@ -31,8 +31,8 @@
#include <linux/init.h>
#include <asm/blackfin.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
#include <asm/mach-common/clocks.h>
#include <asm/mach/mem_init.h>
#include <asm/clocks.h>
#include <mach/mem_init.h>
#endif
.section .l1.text
......
include/asm-blackfin/mach-bf561/cdefBF561.h → arch/blackfin/mach-bf561/include/mach/cdefBF561.h
View file @ 604a2785
......@@ -37,7 +37,7 @@
#include "defBF561.h"
/*include core specific register pointer definitions*/
#include <asm/mach-common/cdef_LPBlackfin.h>
#include <asm/cdef_LPBlackfin.h>
#include <asm/system.h>
......
include/asm-blackfin/mach-bf561/defBF561.h → arch/blackfin/mach-bf561/include/mach/defBF561.h
View file @ 604a2785
......@@ -37,7 +37,7 @@
#endif
*/
/* include all Core registers and bit definitions */
#include <asm/mach-common/def_LPBlackfin.h>
#include <asm/def_LPBlackfin.h>
/*********************************************************************************** */
/* System MMR Register Map */
......
arch/blackfin/mach-common/arch_checks.c
View file @ 604a2785
......@@ -28,8 +28,8 @@
*/
#include <asm/fixed_code.h>
#include <asm/mach/anomaly.h>
#include <asm/mach-common/clocks.h>
#include <mach/anomaly.h>
#include <asm/clocks.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
......
arch/blackfin/mach-common/dpmc_modes.S
View file @ 604a2785
......@@ -6,7 +6,7 @@
#include <linux/linkage.h>
#include <asm/blackfin.h>
#include <asm/mach/irq.h>
#include <mach/irq.h>
#include <asm/dpmc.h>
.section .l1.text
......
arch/blackfin/mach-common/entry.S
View file @ 604a2785
......@@ -43,7 +43,7 @@
#include <asm/asm-offsets.h>
#include <asm/trace.h>
#include <asm/mach-common/context.S>
#include <asm/context.S>
#if defined(CONFIG_BFIN_SCRATCH_REG_RETN)
# define EX_SCRATCH_REG RETN
......
arch/blackfin/mach-common/interrupt.S
View file @ 604a2785
......@@ -29,7 +29,7 @@
*/
#include <asm/blackfin.h>
#include <asm/mach/irq.h>
#include <mach/irq.h>
#include <linux/linkage.h>
#include <asm/entry.h>
#include <asm/asm-offsets.h>
......@@ -37,7 +37,7 @@
#include <asm/traps.h>
#include <asm/thread_info.h>
#include <asm/mach-common/context.S>
#include <asm/context.S>
.extern _ret_from_exception
......
arch/blackfin/mach-common/ints-priority.c
View file @ 604a2785
......@@ -216,7 +216,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
wakeup |= KPADWE;
break;
#endif
#ifdef IRQ_CNT
#ifdef CONFIG_BF54x
case IRQ_CNT:
wakeup |= ROTWE;
break;
......@@ -983,7 +983,7 @@ int __init init_arch_irq(void)
local_irq_disable();
#if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF537)
#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))
/* Clear EMAC Interrupt Status bits so we can demux it later */
bfin_write_EMAC_SYSTAT(-1);
#endif
......
arch/blackfin/mm/blackfin_sram.c
View file @ 604a2785
......@@ -335,7 +335,7 @@ static int _sram_free(const void *addr,
plast->size += pavail->size;
kmem_cache_free(sram_piece_cache, pavail);
} else {
pavail->next = plast;
pavail->next = plast->next;
plast->next = pavail;
plast = pavail;
}
......@@ -379,7 +379,7 @@ EXPORT_SYMBOL(sram_free);
void *l1_data_A_sram_alloc(size_t size)
{
unsigned flags;
unsigned long flags;
void *addr = NULL;
/* add mutex operation */
......@@ -402,7 +402,7 @@ EXPORT_SYMBOL(l1_data_A_sram_alloc);
int l1_data_A_sram_free(const void *addr)
{
unsigned flags;
unsigned long flags;
int ret;
/* add mutex operation */
......@@ -425,7 +425,7 @@ EXPORT_SYMBOL(l1_data_A_sram_free);
void *l1_data_B_sram_alloc(size_t size)
{
#if L1_DATA_B_LENGTH != 0
unsigned flags;
unsigned long flags;
void *addr;
/* add mutex operation */
......@@ -450,7 +450,7 @@ EXPORT_SYMBOL(l1_data_B_sram_alloc);
int l1_data_B_sram_free(const void *addr)
{
#if L1_DATA_B_LENGTH != 0
unsigned flags;
unsigned long flags;
int ret;
/* add mutex operation */
......@@ -504,7 +504,7 @@ EXPORT_SYMBOL(l1_data_sram_free);
void *l1_inst_sram_alloc(size_t size)
{
#if L1_CODE_LENGTH != 0
unsigned flags;
unsigned long flags;
void *addr;
/* add mutex operation */
......@@ -529,7 +529,7 @@ EXPORT_SYMBOL(l1_inst_sram_alloc);
int l1_inst_sram_free(const void *addr)
{
#if L1_CODE_LENGTH != 0
unsigned flags;
unsigned long flags;
int ret;
/* add mutex operation */
......@@ -551,7 +551,7 @@ EXPORT_SYMBOL(l1_inst_sram_free);
/* L1 Scratchpad memory allocate function */
void *l1sram_alloc(size_t size)
{
unsigned flags;
unsigned long flags;
void *addr;
/* add mutex operation */
......@@ -569,7 +569,7 @@ void *l1sram_alloc(size_t size)
/* L1 Scratchpad memory allocate function */
void *l1sram_alloc_max(size_t *psize)
{
unsigned flags;
unsigned long flags;
void *addr;
/* add mutex operation */
......@@ -587,7 +587,7 @@ void *l1sram_alloc_max(size_t *psize)
/* L1 Scratchpad memory free function */
int l1sram_free(const void *addr)
{
unsigned flags;
unsigned long flags;
int ret;
/* add mutex operation */
......@@ -605,7 +605,7 @@ int l1sram_free(const void *addr)
void *l2_sram_alloc(size_t size)
{
#if L2_LENGTH != 0
unsigned flags;
unsigned long flags;
void *addr;
/* add mutex operation */
......@@ -641,7 +641,7 @@ EXPORT_SYMBOL(l2_sram_zalloc);
int l2_sram_free(const void *addr)
{
#if L2_LENGTH != 0
unsigned flags;
unsigned long flags;
int ret;
/* add mutex operation */
......
drivers/input/keyboard/bf54x-keys.c
View file @ 604a2785
......@@ -43,7 +43,7 @@
#include <linux/input.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x_keys.h>
#include <mach/bf54x_keys.h>
#define DRV_NAME "bf54x-keys"
#define TIME_SCALE 100 /* 100 ns */
......
drivers/serial/bfin_5xx.c
View file @ 604a2785
......@@ -28,7 +28,7 @@
#endif
#include <asm/gpio.h>
#include <asm/mach/bfin_serial_5xx.h>
#include <mach/bfin_serial_5xx.h>
#ifdef CONFIG_SERIAL_BFIN_DMA
#include <linux/dma-mapping.h>
......
drivers/video/bf54x-lq043fb.c
View file @ 604a2785
......@@ -58,7 +58,7 @@
#include <asm/gpio.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x-lq043.h>
#include <mach/bf54x-lq043.h>
#define NO_BL_SUPPORT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7