diff options
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/ezkit.c')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index dc0dd9b2bcef..c66f3801274f 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -99,8 +99,8 @@ static struct platform_device bfin_isp1760_device = { | |||
99 | #include <mach/bf54x-lq043.h> | 99 | #include <mach/bf54x-lq043.h> |
100 | 100 | ||
101 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 101 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
102 | .width = 480, | 102 | .width = 95, |
103 | .height = 272, | 103 | .height = 54, |
104 | .xres = {480, 480, 480}, | 104 | .xres = {480, 480, 480}, |
105 | .yres = {272, 272, 272}, | 105 | .yres = {272, 272, 272}, |
106 | .bpp = {24, 24, 24}, | 106 | .bpp = {24, 24, 24}, |
@@ -702,7 +702,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
702 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 702 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
703 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 703 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
704 | { | 704 | { |
705 | .modalias = "ad1836-spi", | 705 | .modalias = "ad1836", |
706 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 706 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
707 | .bus_num = 1, | 707 | .bus_num = 1, |
708 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 708 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
@@ -783,7 +783,7 @@ static struct resource bfin_spi1_resource[] = { | |||
783 | 783 | ||
784 | /* SPI controller data */ | 784 | /* SPI controller data */ |
785 | static struct bfin5xx_spi_master bf54x_spi_master_info0 = { | 785 | static struct bfin5xx_spi_master bf54x_spi_master_info0 = { |
786 | .num_chipselect = 8, | 786 | .num_chipselect = 3, |
787 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 787 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
788 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, | 788 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, |
789 | }; | 789 | }; |
@@ -799,7 +799,7 @@ static struct platform_device bf54x_spi_master0 = { | |||
799 | }; | 799 | }; |
800 | 800 | ||
801 | static struct bfin5xx_spi_master bf54x_spi_master_info1 = { | 801 | static struct bfin5xx_spi_master bf54x_spi_master_info1 = { |
802 | .num_chipselect = 8, | 802 | .num_chipselect = 3, |
803 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 803 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
804 | .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0}, | 804 | .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0}, |
805 | }; | 805 | }; |
@@ -869,7 +869,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { | |||
869 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 869 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
870 | }, | 870 | }, |
871 | #endif | 871 | #endif |
872 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 872 | #if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE) |
873 | { | 873 | { |
874 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 874 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
875 | .irq = 212, | 875 | .irq = 212, |