Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7267ac 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:
  Blackfin arch: use a less common define name in BF549
  Blackfin arch: Add missing definitions for BF561
  Blackfin arch: reclaim a few bytes from the end of our init section
  Blackfin arch: fix libata data struct member from irq_type to irq_flags
  Blackfin arch: Do not pollute name space used in linux-2.6.x/sound
  Blackfin arch: Fix bug set correct baud for spi mmc and enable SPI after DMA.
  Blackfin arch: update board defconfig files according to latest information from ADI datasheet
  Blackfin arch: ensure that speculative loads of bad pointers don't cause us to do bad things.
  Blackfin arch: Add missing definitions of BF54x
  Blackfin arch: Fix random crash issue found by Michael.
  Blackfin arch: fix bug: tell users if the kernel is recovering from a fault condition
  Blackfin arch: add support for checking/clearing overruns in generic purpose Timer API
  Blackfin arch: cleanup arch/blackfin/kernel/traps.c handling code.
  Blackfin arch: Apply Bluetchnix vendor patch provided by Harald Krapfenbauer
  Blackfin arch: fix bug BlueTechnix CM-BF537 board config uses wrong IRQ for net2272 driver
  Blackfin arch: fix bug: kernel prints out error message twice
  Blackfin arch: add NFC driver support in BF527-EZKIT board
  Blackfin arch: Added support for HV Sistemas H8606 board
parents 2d175d43 2ea4649b

arch/blackfin/Kconfig

+13 −2
Original line number Original line Diff line number Diff line
@@ -295,6 +295,12 @@ config PNAV10 
	help

	help

	  PNAV 1.0 board Support.

	  PNAV 1.0 board Support.





config H8606_HVSISTEMAS

        bool "HV Sistemas H8606"

        depends on (BF532)

        help

          HV Sistemas H8606 board support.



config GENERIC_BOARD

config GENERIC_BOARD

	bool "Custom"

	bool "Custom"

	depends on (BF537 || BF536 \

	depends on (BF537 || BF536 \
@@ -317,7 +323,8 @@ config MEM_MT48LC64M4A2FB_7E 
config MEM_MT48LC16M16A2TG_75

config MEM_MT48LC16M16A2TG_75

	bool

	bool

	depends on (BFIN533_EZKIT || BFIN561_EZKIT \

	depends on (BFIN533_EZKIT || BFIN561_EZKIT \

		|| BFIN533_BLUETECHNIX_CM || BFIN537_BLUETECHNIX_CM)

		|| BFIN533_BLUETECHNIX_CM || BFIN537_BLUETECHNIX_CM \

		|| H8606_HVSISTEMAS)

	default y

	default y





config MEM_MT48LC32M8A2_75

config MEM_MT48LC32M8A2_75
@@ -366,7 +373,7 @@ config CLKIN_HZ 
	int "Crystal Frequency in Hz"

	int "Crystal Frequency in Hz"

	default "11059200" if BFIN533_STAMP

	default "11059200" if BFIN533_STAMP

	default "27000000" if BFIN533_EZKIT

	default "27000000" if BFIN533_EZKIT

	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT)

	default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS)

	default "30000000" if BFIN561_EZKIT

	default "30000000" if BFIN561_EZKIT

	default "24576000" if PNAV10

	default "24576000" if PNAV10

	help

	help
@@ -404,6 +411,7 @@ config VCO_MULT 
	default "20" if BFIN537_BLUETECHNIX_CM

	default "20" if BFIN537_BLUETECHNIX_CM

	default "20" if BFIN561_BLUETECHNIX_CM

	default "20" if BFIN561_BLUETECHNIX_CM

	default "20" if BFIN561_EZKIT

	default "20" if BFIN561_EZKIT

	default "16" if H8606_HVSISTEMAS

	help

	help

	  This controls the frequency of the on-chip PLL. This can be between 1 and 64.

	  This controls the frequency of the on-chip PLL. This can be between 1 and 64.

	  PLL Frequency = (Crystal Frequency) * (this setting)

	  PLL Frequency = (Crystal Frequency) * (this setting)
@@ -440,6 +448,7 @@ config SCLK_DIV 
	default 4 if BFIN537_BLUETECHNIX_CM

	default 4 if BFIN537_BLUETECHNIX_CM

	default 4 if BFIN561_BLUETECHNIX_CM

	default 4 if BFIN561_BLUETECHNIX_CM

	default 5 if BFIN561_EZKIT

	default 5 if BFIN561_EZKIT

	default 3 if H8606_HVSISTEMAS

	help

	help

	  This sets the frequency of the system clock (including SDRAM or DDR).

	  This sets the frequency of the system clock (including SDRAM or DDR).

	  This can be between 1 and 15

	  This can be between 1 and 15
@@ -492,11 +501,13 @@ config MEM_SIZE 
	default  64 if BFIN561_EZKIT

	default  64 if BFIN561_EZKIT

	default 128 if BFIN533_STAMP

	default 128 if BFIN533_STAMP

	default  64 if PNAV10

	default  64 if PNAV10

	default  32 if H8606_HVSISTEMAS





config MEM_ADD_WIDTH

config MEM_ADD_WIDTH

	int "SDRAM Memory Address Width"

	int "SDRAM Memory Address Width"

	default  9 if BFIN533_EZKIT

	default  9 if BFIN533_EZKIT

	default  9 if BFIN561_EZKIT

	default  9 if BFIN561_EZKIT

	default  9 if H8606_HVSISTEMAS

	default 10 if BFIN527_EZKIT

	default 10 if BFIN527_EZKIT

	default 10 if BFIN537_STAMP

	default 10 if BFIN537_STAMP

	default 11 if BFIN533_STAMP

	default 11 if BFIN533_STAMP

arch/blackfin/configs/BF527-EZKIT_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -244,7 +244,7 @@ CONFIG_CLKIN_HZ=25000000 
# CONFIG_BFIN_KERNEL_CLOCK is not set

# CONFIG_BFIN_KERNEL_CLOCK is not set

CONFIG_MAX_VCO_HZ=600000000

CONFIG_MAX_VCO_HZ=600000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MAX_SCLK_HZ=133000000

CONFIG_MAX_SCLK_HZ=133333333

CONFIG_MIN_SCLK_HZ=27000000

CONFIG_MIN_SCLK_HZ=27000000





#

#

arch/blackfin/configs/BF533-EZKIT_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ CONFIG_CLKIN_HZ=27000000 
# CONFIG_BFIN_KERNEL_CLOCK is not set

# CONFIG_BFIN_KERNEL_CLOCK is not set

CONFIG_MAX_VCO_HZ=750000000

CONFIG_MAX_VCO_HZ=750000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MAX_SCLK_HZ=133000000

CONFIG_MAX_SCLK_HZ=133333333

CONFIG_MIN_SCLK_HZ=27000000

CONFIG_MIN_SCLK_HZ=27000000





#

#

arch/blackfin/configs/BF533-STAMP_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ CONFIG_CLKIN_HZ=11059200 
# CONFIG_BFIN_KERNEL_CLOCK is not set

# CONFIG_BFIN_KERNEL_CLOCK is not set

CONFIG_MAX_VCO_HZ=750000000

CONFIG_MAX_VCO_HZ=750000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MAX_SCLK_HZ=133000000

CONFIG_MAX_SCLK_HZ=133333333

CONFIG_MIN_SCLK_HZ=27000000

CONFIG_MIN_SCLK_HZ=27000000





#

#

arch/blackfin/configs/BF537-STAMP_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -206,7 +206,7 @@ CONFIG_CLKIN_HZ=25000000 
# CONFIG_BFIN_KERNEL_CLOCK is not set

# CONFIG_BFIN_KERNEL_CLOCK is not set

CONFIG_MAX_VCO_HZ=600000000

CONFIG_MAX_VCO_HZ=600000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MIN_VCO_HZ=50000000

CONFIG_MAX_SCLK_HZ=133000000

CONFIG_MAX_SCLK_HZ=133333333

CONFIG_MIN_SCLK_HZ=27000000

CONFIG_MIN_SCLK_HZ=27000000





#

#