Commit 04a94bab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (24 commits)
  [Blackfin] arch: import defines for BF547 -- it is just like the BF548, but no CAN
  [Blackfin] arch: fix build fails only include header files when enabled
  [Blackfin] arch: declare default INSTALL_PATH for Blackfin ports
  [Blackfin] arch: Encourage users to use the spidev character driver: Provide platform support
  [Blackfin] arch: Enable UART2 and UART3 for bf548
  [Blackfin] arch: Enable NET2272 on BF561-EZkit - remove request_mem_region
  [Blackfin] arch:Fix BUG [#3876] pfbutton test for BTN3 on bf533 don't show complete info
  [Blackfin] arch: remove duplicated definitions of the line discipline numbers N_* in asm-blackfin/termios.h
  [Blackfin] arch: fix building with mtd uclinux by putting the mtd_phys option into the function it actually gets used in
  [Blackfin] arch: simpler header and update dates
  [Blackfin] arch: move the init sections to the end of memory
  [Blackfin] arch: change the trace buffer control start/stop logic in the exception handlers
  [Blackfin] arch: fix typo in printk message
  [Blackfin] arch: this is an ezkit, not a stamp, so fixup the init function name
  [Blackfin] arch: add slightly better help text for CPLB_INFO
  [Blackfin] arch: Fix BUG - Enable ISP1362 driver to work ok with BF561
  [Blackfin] arch: Fix header file information
  [Blackfin] arch: Add Support for ISP1362
  [Blackfin] arch: add support for cmdline partitioning to the BF533-STAMP flash map driver and enable it as a module by default
  [Blackfin] arch: hook up set_irq_wake in Blackfin's irq code
  ...
parents 765cdb6c 920e526f

arch/blackfin/Kconfig

+29 −20
Original line number Diff line number Diff line
@@ -904,29 +904,38 @@ config ARCH_SUSPEND_POSSIBLE 
	depends on !SMP



choice

	prompt "Select PM Wakeup Event Source"

	default PM_WAKEUP_GPIO_BY_SIC_IWR

	prompt "Default Power Saving Mode"

	depends on PM

	help

	  If you have a GPIO already configured as input with the corresponding PORTx_MASK

	  bit set - "Specify Wakeup Event by SIC_IWR value"

	default PM_BFIN_SLEEP_DEEPER

config  PM_BFIN_SLEEP_DEEPER

	bool "Sleep Deeper"

	help

	  Sleep "Deeper" Mode (High Power Savings) - This mode reduces dynamic

	  power dissipation by disabling the clock to the processor core (CCLK).

	  Furthermore, Standby sets the internal power supply voltage (VDDINT)

	  to 0.85 V to provide the greatest power savings, while preserving the

	  processor state.

	  The PLL and system clock (SCLK) continue to operate at a very low

	  frequency of about 3.3 MHz. To preserve data integrity in the SDRAM,

	  the SDRAM is put into Self Refresh Mode. Typically an external event

	  such as GPIO interrupt or RTC activity wakes up the processor.

	  Various Peripherals such as UART, SPORT, PPI may not function as

	  normal during Sleep Deeper, due to the reduced SCLK frequency.

	  When in the sleep mode, system DMA access to L1 memory is not supported.



config  PM_BFIN_SLEEP

	bool "Sleep"

	help

	  Sleep Mode (High Power Savings) - The sleep mode reduces power

	  dissipation by disabling the clock to the processor core (CCLK).

	  The PLL and system clock (SCLK), however, continue to operate in

	  this mode. Typically an external event or RTC activity will wake

	  up the processor. When in the sleep mode,

	  system DMA access to L1 memory is not supported.

endchoice



config PM_WAKEUP_GPIO_BY_SIC_IWR

	bool "Specify Wakeup Event by SIC_IWR value"

config PM_WAKEUP_BY_GPIO

	bool "Cause Wakeup Event by GPIO"

config PM_WAKEUP_GPIO_API

	bool "Configure Wakeup Event by PM GPIO API"



endchoice



config PM_WAKEUP_SIC_IWR

	hex "Wakeup Events (SIC_IWR)"

	depends on PM_WAKEUP_GPIO_BY_SIC_IWR

	default 0x8 if (BF537 || BF536 || BF534)

	default 0x80 if (BF533 || BF532 || BF531)

	default 0x80 if (BF54x)

	default 0x80 if (BF52x)



config PM_WAKEUP_GPIO_NUMBER

	int "Wakeup GPIO number"

arch/blackfin/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ config DUAL_CORE_TEST_MODULE 
config CPLB_INFO

	bool "Display the CPLB information"

	help

	  Display the CPLB information.

	  Display the CPLB information via /proc/cplbinfo.



config ACCESS_CHECK

	bool "Check the user pointer address"

arch/blackfin/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ archclean: 
	$(Q)$(MAKE) $(clean)=$(boot)





INSTALL_PATH ?= /tftpboot

boot := arch/$(ARCH)/boot

BOOT_TARGETS = vmImage

PHONY += $(BOOT_TARGETS) install

arch/blackfin/configs/BF533-STAMP_defconfig

+10 −6
Original line number Diff line number Diff line
@@ -216,8 +216,6 @@ CONFIG_MEM_SIZE=128 
CONFIG_MEM_ADD_WIDTH=11

CONFIG_ENET_FLASH_PIN=0

CONFIG_BOOT_LOAD=0x1000





CONFIG_BFIN_SCRATCH_REG_RETN=y

# CONFIG_BFIN_SCRATCH_REG_RETE is not set

# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
@@ -483,7 +481,7 @@ CONFIG_MTD=y 
# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y



#

# User Modules And Translation Layers
@@ -500,8 +498,8 @@ CONFIG_MTD_BLOCK=y 
#

# RAM/ROM/Flash chip drivers

#

# CONFIG_MTD_CFI is not set

CONFIG_MTD_JEDECPROBE=m

CONFIG_MTD_CFI=m

# CONFIG_MTD_JEDECPROBE is not set

CONFIG_MTD_GEN_PROBE=m

# CONFIG_MTD_CFI_ADV_OPTIONS is not set

CONFIG_MTD_MAP_BANK_WIDTH_1=y
@@ -515,8 +513,9 @@ 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 is not set

CONFIG_MTD_CFI_AMDSTD=m

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=m

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=m

# CONFIG_MTD_ABSENT is not set
@@ -526,6 +525,11 @@ CONFIG_MTD_ROM=m 
#

CONFIG_MTD_COMPLEX_MAPPINGS=y

# CONFIG_MTD_PHYSMAP is not set

CONFIG_MTD_BF5xx=m

CONFIG_BFIN_FLASH_BANK_0=0x7BB0

CONFIG_BFIN_FLASH_BANK_1=0x7BB0

CONFIG_BFIN_FLASH_BANK_2=0x7BB0

CONFIG_BFIN_FLASH_BANK_3=0x7BB0

# CONFIG_MTD_UCLINUX is not set

# CONFIG_MTD_PLATRAM is not set

arch/blackfin/kernel/bfin_dma_5xx.c

+10 −0
Original line number Diff line number Diff line
@@ -104,6 +104,16 @@ int request_dma(unsigned int channel, char *device_id) 


	mutex_unlock(&(dma_ch[channel].dmalock));



#ifdef CONFIG_BF54x

	if (channel >= CH_UART2_RX && channel <= CH_UART3_TX &&

		strncmp(device_id, "BFIN_UART", 9) == 0)

		dma_ch[channel].regs->peripheral_map |=

			(channel - CH_UART2_RX + 0xC);

	else

		dma_ch[channel].regs->peripheral_map |=

			(channel - CH_UART2_RX + 0x6);

#endif



	dma_ch[channel].device_id = device_id;

	dma_ch[channel].irq_callback = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE