diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:45:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:45:08 -0400 |
commit | 1b821bfb034c5db5af62b463e3001243905179ba (patch) | |
tree | a5c1090f41716a6912742c9bc960dc2d3ae82899 /arch/blackfin/mach-bf537 | |
parent | a45fbc33137b11e479ea8b7d478a1d7e6488971b (diff) | |
parent | 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f (diff) |
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: make sure cycles is marked as volatile so gcc doesnt reorder on us
Blackfin arch: disable CONFIG_HW_RANDOM and CONFIG_DAB in defconfig files
Blackfin arch: update cache flush prototypes with argument names to make them less mysterious
Blackfin arch: move bfin_addr_dcachable() and friends into the cacheflush header where it belongs
Blackfin arch: use the new bfin_addr_dcachable() function
Blackfin arch: fix bug - build kernel failed at head.S when reprogram clock on all platforms
Blackfin arch: unify/cleanup cache code
Blackfin arch: update AD7879 platform resources in board file
Blackfin arch: Zero out bss region in L1/L2 memory.
Blackfin arch: add read/write IO accessor functions to Blackfin
Blackfin arch: fix bug - some serial header files set RTS to an input when they should all be outputs
Diffstat (limited to 'arch/blackfin/mach-bf537')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 25 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/head.S | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index dc5a30849c15..8d394393201f 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -577,11 +577,6 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { | |||
577 | 577 | ||
578 | #if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE) | 578 | #if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE) |
579 | #include <linux/spi/ad7879.h> | 579 | #include <linux/spi/ad7879.h> |
580 | static struct bfin5xx_spi_chip spi_ad7879_chip_info = { | ||
581 | .enable_dma = 0, | ||
582 | .bits_per_word = 16, | ||
583 | }; | ||
584 | |||
585 | static const struct ad7879_platform_data bfin_ad7879_ts_info = { | 580 | static const struct ad7879_platform_data bfin_ad7879_ts_info = { |
586 | .model = 7879, /* Model = AD7879 */ | 581 | .model = 7879, /* Model = AD7879 */ |
587 | .x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */ | 582 | .x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */ |
@@ -597,6 +592,13 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { | |||
597 | }; | 592 | }; |
598 | #endif | 593 | #endif |
599 | 594 | ||
595 | #if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE) | ||
596 | static struct bfin5xx_spi_chip spi_ad7879_chip_info = { | ||
597 | .enable_dma = 0, | ||
598 | .bits_per_word = 16, | ||
599 | }; | ||
600 | #endif | ||
601 | |||
600 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | 602 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) |
601 | static struct bfin5xx_spi_chip spidev_chip_info = { | 603 | static struct bfin5xx_spi_chip spidev_chip_info = { |
602 | .enable_dma = 0, | 604 | .enable_dma = 0, |
@@ -750,7 +752,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
750 | .controller_data = &spi_ad7877_chip_info, | 752 | .controller_data = &spi_ad7877_chip_info, |
751 | }, | 753 | }, |
752 | #endif | 754 | #endif |
753 | #if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE) | 755 | #if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE) |
754 | { | 756 | { |
755 | .modalias = "ad7879", | 757 | .modalias = "ad7879", |
756 | .platform_data = &bfin_ad7879_ts_info, | 758 | .platform_data = &bfin_ad7879_ts_info, |
@@ -935,7 +937,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
935 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) | 937 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) |
936 | { | 938 | { |
937 | I2C_BOARD_INFO("ad7142_joystick", 0x2C), | 939 | I2C_BOARD_INFO("ad7142_joystick", 0x2C), |
938 | .irq = 55, | 940 | .irq = IRQ_PF5, |
939 | }, | 941 | }, |
940 | #endif | 942 | #endif |
941 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 943 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
@@ -946,7 +948,14 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
946 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 948 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) |
947 | { | 949 | { |
948 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 950 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
949 | .irq = 72, | 951 | .irq = IRQ_PG6, |
952 | }, | ||
953 | #endif | ||
954 | #if defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE) | ||
955 | { | ||
956 | I2C_BOARD_INFO("ad7879", 0x2F), | ||
957 | .irq = IRQ_PG5, | ||
958 | .platform_data = (void *)&bfin_ad7879_ts_info, | ||
950 | }, | 959 | }, |
951 | #endif | 960 | #endif |
952 | }; | 961 | }; |
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S index 559a7eef7a38..f5c94bf80e3b 100644 --- a/arch/blackfin/mach-bf537/head.S +++ b/arch/blackfin/mach-bf537/head.S | |||
@@ -88,7 +88,7 @@ ENTRY(_start_dma_code) | |||
88 | r1 = r1 << 8; /* Shift it over */ | 88 | r1 = r1 << 8; /* Shift it over */ |
89 | r0 = r1 | r0; /* add them all together */ | 89 | r0 = r1 | r0; /* add them all together */ |
90 | #ifdef ANOMALY_05000265 | 90 | #ifdef ANOMALY_05000265 |
91 | r0 = BITSET(r0, 15); /* Add 250 mV of hysteresis to SPORT input pins */ | 91 | BITSET(r0, 15); /* Add 250 mV of hysteresis to SPORT input pins */ |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | p0.h = hi(PLL_CTL); | 94 | p0.h = hi(PLL_CTL); |