diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:08:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:08:43 -0400 |
commit | 54cebc68c81eacac41a21bdfe99dc889d3882c60 (patch) | |
tree | da1d3872c6ddf208768e784bd1ea09054a81462d /arch/blackfin/mach-bf537/boards/stamp.c | |
parent | fffdedef691a0f6fa7ca1fc0a2a508cbb49def69 (diff) | |
parent | 71de1f8a6365ea65346881e526132563d93696d1 (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: (60 commits)
Blackfin arch: make sure we include the fix for SPORT hysteresis when reprogramming clocks
Blackfin arch: Fix bogus str_ident check in gpio code
Blackfin arch: AD7879 Touchscreen driver
Blackfin arch: introducing bfin_addr_dcachable
Blackfin arch: fix a typo in comments
Blackfin arch: Remove useless head file
Blackfin arch: make sure L2 start and length are always defined (fixes building on BF542)
Blackfin arch: use the Blackfin on-chip ROM to do software reset when possible
Blackfin arch: update anomaly headers to match the latest sheet
Blackfin arch: bfin_reset() is an internal reboot function ... everyone should go through machine_restart()
Blackfin arch: print out error/warning if you are running on the incorrect CPU type
Blackfin arch: remove non-bf54x ifdef logic since this file is only compiled on bf54x parts
Blackfin arch: update board defconfigs
Blackfin arch: Add optional verbose debug
Blackfin arch: emulate a TTY over the EMUDAT/JTAG interface
Blackfin arch: have is_user_addr_valid() check for overflows (like when address is -1)
Blackfin arch: ptrace - fix off-by-one check on end of memory regions
Blackfin arch: Enable framebuffer support for the BF526-EZkit TFT LCD display
Blackfin arch: flash memory map and dm9000 resources updating
Blackfin arch: early prink code still use uart core console functions to parse and set configure option string
...
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/stamp.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 85 |
1 files changed, 84 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 8482d22321f3..dc5a30849c15 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -51,7 +51,6 @@ | |||
51 | #include <asm/reboot.h> | 51 | #include <asm/reboot.h> |
52 | #include <asm/portmux.h> | 52 | #include <asm/portmux.h> |
53 | #include <asm/dpmc.h> | 53 | #include <asm/dpmc.h> |
54 | #include <linux/spi/ad7877.h> | ||
55 | 54 | ||
56 | /* | 55 | /* |
57 | * Name the Board for the /proc/cpuinfo | 56 | * Name the Board for the /proc/cpuinfo |
@@ -555,6 +554,7 @@ static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | |||
555 | #endif | 554 | #endif |
556 | 555 | ||
557 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 556 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
557 | #include <linux/spi/ad7877.h> | ||
558 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | 558 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { |
559 | .enable_dma = 0, | 559 | .enable_dma = 0, |
560 | .bits_per_word = 16, | 560 | .bits_per_word = 16, |
@@ -575,6 +575,28 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { | |||
575 | }; | 575 | }; |
576 | #endif | 576 | #endif |
577 | 577 | ||
578 | #if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE) | ||
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 = { | ||
586 | .model = 7879, /* Model = AD7879 */ | ||
587 | .x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */ | ||
588 | .pressure_max = 10000, | ||
589 | .pressure_min = 0, | ||
590 | .first_conversion_delay = 3, /* wait 512us before do a first conversion */ | ||
591 | .acquisition_time = 1, /* 4us acquisition time per sample */ | ||
592 | .median = 2, /* do 8 measurements */ | ||
593 | .averaging = 1, /* take the average of 4 middle samples */ | ||
594 | .pen_down_acc_interval = 255, /* 9.4 ms */ | ||
595 | .gpio_output = 1, /* configure AUX/VBAT/GPIO as GPIO output */ | ||
596 | .gpio_default = 1, /* During initialization set GPIO = HIGH */ | ||
597 | }; | ||
598 | #endif | ||
599 | |||
578 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | 600 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) |
579 | static struct bfin5xx_spi_chip spidev_chip_info = { | 601 | static struct bfin5xx_spi_chip spidev_chip_info = { |
580 | .enable_dma = 0, | 602 | .enable_dma = 0, |
@@ -582,6 +604,13 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
582 | }; | 604 | }; |
583 | #endif | 605 | #endif |
584 | 606 | ||
607 | #if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) | ||
608 | static struct bfin5xx_spi_chip lq035q1_spi_chip_info = { | ||
609 | .enable_dma = 0, | ||
610 | .bits_per_word = 8, | ||
611 | }; | ||
612 | #endif | ||
613 | |||
585 | #if defined(CONFIG_MTD_DATAFLASH) \ | 614 | #if defined(CONFIG_MTD_DATAFLASH) \ |
586 | || defined(CONFIG_MTD_DATAFLASH_MODULE) | 615 | || defined(CONFIG_MTD_DATAFLASH_MODULE) |
587 | 616 | ||
@@ -721,6 +750,18 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
721 | .controller_data = &spi_ad7877_chip_info, | 750 | .controller_data = &spi_ad7877_chip_info, |
722 | }, | 751 | }, |
723 | #endif | 752 | #endif |
753 | #if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE) | ||
754 | { | ||
755 | .modalias = "ad7879", | ||
756 | .platform_data = &bfin_ad7879_ts_info, | ||
757 | .irq = IRQ_PF7, | ||
758 | .max_speed_hz = 5000000, /* max spi clock (SCK) speed in HZ */ | ||
759 | .bus_num = 0, | ||
760 | .chip_select = 1, | ||
761 | .controller_data = &spi_ad7879_chip_info, | ||
762 | .mode = SPI_CPHA | SPI_CPOL, | ||
763 | }, | ||
764 | #endif | ||
724 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | 765 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) |
725 | { | 766 | { |
726 | .modalias = "spidev", | 767 | .modalias = "spidev", |
@@ -730,6 +771,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
730 | .controller_data = &spidev_chip_info, | 771 | .controller_data = &spidev_chip_info, |
731 | }, | 772 | }, |
732 | #endif | 773 | #endif |
774 | #if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) | ||
775 | { | ||
776 | .modalias = "bfin-lq035q1-spi", | ||
777 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | ||
778 | .bus_num = 0, | ||
779 | .chip_select = 2, | ||
780 | .controller_data = &lq035q1_spi_chip_info, | ||
781 | .mode = SPI_CPHA | SPI_CPOL, | ||
782 | }, | ||
783 | #endif | ||
733 | }; | 784 | }; |
734 | 785 | ||
735 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 786 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
@@ -777,6 +828,34 @@ static struct platform_device bfin_fb_adv7393_device = { | |||
777 | }; | 828 | }; |
778 | #endif | 829 | #endif |
779 | 830 | ||
831 | #if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) | ||
832 | #include <asm/bfin-lq035q1.h> | ||
833 | |||
834 | static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = { | ||
835 | .mode = LQ035_NORM | LQ035_RGB | LQ035_RL | LQ035_TB, | ||
836 | .use_bl = 0, /* let something else control the LCD Blacklight */ | ||
837 | .gpio_bl = GPIO_PF7, | ||
838 | }; | ||
839 | |||
840 | static struct resource bfin_lq035q1_resources[] = { | ||
841 | { | ||
842 | .start = IRQ_PPI_ERROR, | ||
843 | .end = IRQ_PPI_ERROR, | ||
844 | .flags = IORESOURCE_IRQ, | ||
845 | }, | ||
846 | }; | ||
847 | |||
848 | static struct platform_device bfin_lq035q1_device = { | ||
849 | .name = "bfin-lq035q1", | ||
850 | .id = -1, | ||
851 | .num_resources = ARRAY_SIZE(bfin_lq035q1_resources), | ||
852 | .resource = bfin_lq035q1_resources, | ||
853 | .dev = { | ||
854 | .platform_data = &bfin_lq035q1_data, | ||
855 | }, | ||
856 | }; | ||
857 | #endif | ||
858 | |||
780 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) | 859 | #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) |
781 | static struct resource bfin_uart_resources[] = { | 860 | static struct resource bfin_uart_resources[] = { |
782 | #ifdef CONFIG_SERIAL_BFIN_UART0 | 861 | #ifdef CONFIG_SERIAL_BFIN_UART0 |
@@ -997,6 +1076,10 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
997 | &bfin_fb_device, | 1076 | &bfin_fb_device, |
998 | #endif | 1077 | #endif |
999 | 1078 | ||
1079 | #if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) | ||
1080 | &bfin_lq035q1_device, | ||
1081 | #endif | ||
1082 | |||
1000 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) | 1083 | #if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) |
1001 | &bfin_fb_adv7393_device, | 1084 | &bfin_fb_adv7393_device, |
1002 | #endif | 1085 | #endif |