blackfin: bf533-stamp: fix ad1836 name
PATCH 1/11 blackfin: bf533-stamp: fix ad1836 name
The ASoC codec name is "ad1836" and not "ad183x" as the change to rename things ultimately did not get merged.
--- arch/blackfin/mach-bf533/boards/stamp.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
arch/blackfin/mach-bf533/boards/stamp.c +3 -2
@@ -219,9 +219,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { },#endif -#if defined(CONFIG_SND_BF5XX_SOC_AD183X ) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE ) +#if defined(CONFIG_SND_BF5XX_SOC_AD1836 ) || \ + defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE ) { - .modalias = "ad183x", + .modalias = "ad1836", .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .bus_num = 0, .chip_select = 4,
Signature · 1 line
1.7.0.4
PATCH 2/11 blackfin: bf533-stamp: add missed patches for new asoc driver
ASoC drivers changed between 2.6.37 and 3.0, but we didn't apply these changes in bf533 board file.
So apply missed patches for asoc since 2.6.37 together.
--- arch/blackfin/mach-bf533/boards/stamp.c | 168 +++++++++++++++++++++++++++++-- 1 files changed, 160 insertions(+), 8 deletions(-)
arch/blackfin/mach-bf533/boards/stamp.c +160 -8
@@ -541,27 +541,150 @@ static struct platform_device bfin_dpmc = { }, }; +#if defined(CONFIG_SND_BF5XX_I2S ) || defined(CONFIG_SND_BF5XX_I2S_MODULE ) || \ + defined(CONFIG_SND_BF5XX_TDM ) || defined(CONFIG_SND_BF5XX_TDM_MODULE ) \ + || defined(CONFIG_SND_BF5XX_AC97 ) || \ + defined(CONFIG_SND_BF5XX_AC97_MODULE ) + +#include <asm/bfin_sport.h> + +#define SPORT_REQ (x) \ + [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \ + P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0} + +static const u16 bfin_snd_pin[][7 ] = { +SPORT_REQ (0 ), +SPORT_REQ (1 ), +}; + +static struct bfin_snd_platform_data bfin_snd_data[] = { + { + .pin_req = &bfin_snd_pin[0 ][0 ], + }, + { + .pin_req = &bfin_snd_pin[1 ][0 ], + }, +}; + +#define BFIN_SND_RES (x) \ + [x] = { \ + { \ + .start = SPORT##x##_TCR1, \ + .end = SPORT##x##_TCR1, \ + .flags = IORESOURCE_MEM \ + }, \ + { \ + .start = CH_SPORT##x##_RX, \ + .end = CH_SPORT##x##_RX, \ + .flags = IORESOURCE_DMA, \ + }, \ + { \ + .start = CH_SPORT##x##_TX, \ + .end = CH_SPORT##x##_TX, \ + .flags = IORESOURCE_DMA, \ + }, \ + { \ + .start = IRQ_SPORT##x##_ERROR, \ + .end = IRQ_SPORT##x##_ERROR, \ + .flags = IORESOURCE_IRQ, \ + } \ + } + +static struct resource bfin_snd_resources[][4 ] = { +BFIN_SND_RES (0 ), +BFIN_SND_RES (1 ), +}; +#endif +#if defined(CONFIG_SND_BF5XX_I2S ) || defined(CONFIG_SND_BF5XX_I2S_MODULE ) +static struct platform_device bfin_i2s_pcm = { + .name ="bfin-i2s-pcm-audio" , + .id =-1 , +}; +#endif + +#if defined(CONFIG_SND_BF5XX_TDM ) || defined(CONFIG_SND_BF5XX_TDM_MODULE ) +static struct platform_device bfin_tdm_pcm = { + .name ="bfin-tdm-pcm-audio" , + .id =-1 , +}; +#endif + +#if defined(CONFIG_SND_BF5XX_AC97 ) || defined(CONFIG_SND_BF5XX_AC97_MODULE ) +static struct platform_device bfin_ac97_pcm = { + .name ="bfin-ac97-pcm-audio" , + .id =-1 , +}; +#endif + +#if defined(CONFIG_SND_BF5XX_SOC_AD73311 ) || \ + defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE ) +static const unsigned ad73311_gpio[] = { +GPIO_PF4 , +}; + +static struct platform_device bfin_ad73311_machine = { + .name ="bfin-snd-ad73311" , + .id =1 , + .dev = { + .platform_data = (void *)ad73311_gpio, + }, +}; +#endif + +#if defined(CONFIG_SND_SOC_AD73311 ) || defined(CONFIG_SND_SOC_AD73311_MODULE ) +static struct platform_device bfin_ad73311_codec_device = { + .name ="ad73311" , + .id =-1 , +}; +#endif + +#if defined(CONFIG_SND_SOC_AD74111 ) || defined(CONFIG_SND_SOC_AD74111_MODULE ) +static struct platform_device bfin_ad74111_codec_device = { + .name ="ad74111" , + .id =-1 , +}; +#endif + +#if defined(CONFIG_SND_BF5XX_SOC_I2S ) || \ + defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE )static struct platform_device bfin_i2s = { .name ="bfin-i2s" , .id =CONFIG_SND_BF5XX_SPORT_NUM , -/* TODO: add platform data here */ + .num_resources = +ARRAY_SIZE (bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM ]), + .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM ], + .dev = { + .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM ], + }, };#endif -#if defined(CONFIG_SND_BF5XX_TDM ) || defined(CONFIG_SND_BF5XX_TDM_MODULE ) +#if defined(CONFIG_SND_BF5XX_SOC_TDM ) || \ + defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE )static struct platform_device bfin_tdm = { .name ="bfin-tdm" , .id =CONFIG_SND_BF5XX_SPORT_NUM , -/* TODO: add platform data here */ + .num_resources = +ARRAY_SIZE (bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM ]), + .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM ], + .dev = { + .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM ], + }, };#endif -#if defined(CONFIG_SND_BF5XX_AC97 ) || defined(CONFIG_SND_BF5XX_AC97_MODULE ) +#if defined(CONFIG_SND_BF5XX_SOC_AC97 ) || \ + defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE )static struct platform_device bfin_ac97 = { .name ="bfin-ac97" , .id =CONFIG_SND_BF5XX_SPORT_NUM , -/* TODO: add platform data here */ + .num_resources = +ARRAY_SIZE (bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM ]), + .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM ], + .dev = { + .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM ], + }, };#endif
@@ -597,7 +720,8 @@ static struct platform_device *stamp_devices[] __initdata = {#endif #endif -#if defined(CONFIG_SERIAL_BFIN_SPORT ) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE ) +#if defined(CONFIG_SERIAL_BFIN_SPORT ) || \ + defined(CONFIG_SERIAL_BFIN_SPORT_MODULE )#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART &bfin_sport0_uart_device,#endif
@@ -619,14 +743,42 @@ static struct platform_device *stamp_devices[] __initdata = {#endif #if defined(CONFIG_SND_BF5XX_I2S ) || defined(CONFIG_SND_BF5XX_I2S_MODULE ) - &bfin_i2s, + &bfin_i2s_pcm,#endif #if defined(CONFIG_SND_BF5XX_TDM ) || defined(CONFIG_SND_BF5XX_TDM_MODULE ) - &bfin_tdm, + &bfin_tdm_pcm,#endif #if defined(CONFIG_SND_BF5XX_AC97 ) || defined(CONFIG_SND_BF5XX_AC97_MODULE ) + &bfin_ac97_pcm, +#endif + +#if defined(CONFIG_SND_BF5XX_SOC_AD73311 ) || \ + defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE ) + &bfin_ad73311_machine, +#endif + +#if defined(CONFIG_SND_SOC_AD73311 ) || defined(CONFIG_SND_SOC_AD73311_MODULE ) + &bfin_ad73311_codec_device, +#endif + +#if defined(CONFIG_SND_SOC_AD74111 ) || defined(CONFIG_SND_SOC_AD74111_MODULE ) + &bfin_ad74111_codec_device, +#endif + +#if defined(CONFIG_SND_BF5XX_SOC_I2S ) || \ + defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE ) + &bfin_i2s, +#endif + +#if defined(CONFIG_SND_BF5XX_SOC_TDM ) || \ + defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE ) + &bfin_tdm, +#endif + +#if defined(CONFIG_SND_BF5XX_SOC_AC97 ) || \ + defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE ) &bfin_ac97,#endif };
Signature · 1 line
1.7.0.4
PATCH 3/11 blackfin: smp: add suspend and wakeup irq flags
In reply to Bob LiuAdd IRQF_NO_SUSPEND | IRQF_FORCE_RESUME to irq flags, supplement irq should not be disabled when system do suspend.
--- arch/blackfin/mach-bf561/smp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/blackfin/mach-bf561/smp.c +2 -1
@@ -114,7 +114,8 @@ void __init platform_request_ipi(int irq, void *handler)int ret;const char *name = (irq ==IRQ_SUPPLE_0 ) ? supple0 : supple1; - ret =request_irq (irq, handler,IRQF_PERCPU , name, handler); + ret =request_irq (irq, handler,IRQF_PERCPU |IRQF_NO_SUSPEND | +IRQF_FORCE_RESUME , name, handler);if (ret)panic ("Cannot request %s for IPI service" , name); }
Signature · 1 line
1.7.0.4
PATCH 4/11 blackfin: smp: cleanup smp code
In reply to Bob Liumove idle task point to percpu blackfin_cpudata and add smp_timer_broadcast interface.
enable SUPPLE_1_WAKEUP and add BFIN_IPI_TIMER ipi support.
--- arch/blackfin/include/asm/cpu.h | 3 ++ arch/blackfin/include/asm/smp.h | 5 ++- arch/blackfin/kernel/time-ts.c | 26 +++++++++++++- arch/blackfin/mach-bf561/include/mach/pll.h | 4 ++- arch/blackfin/mach-bf561/smp.c | 2 +- arch/blackfin/mach-common/smp.c | 53 +++++++++++++++++++++------ 6 files changed, 77 insertions(+), 16 deletions(-)
arch/blackfin/include/asm/cpu.h +3 -0
@@ -14,6 +14,9 @@ struct blackfin_cpudata {struct cpu cpu;unsigned int imemctl;unsigned int dmemctl; +#ifdef CONFIG_SMP +struct task_struct *idle; +#endif }; DECLARE_PER_CPU(struct blackfin_cpudata, cpu_data);
arch/blackfin/include/asm/smp.h +4 -1
@@ -37,7 +37,7 @@ extern unsigned long dcache_invld_count[NR_CPUS];#endif void smp_icache_flush_range_others (unsigned long start, -unsigned long end); +unsigned long end);#ifdef CONFIG_HOTPLUG_CPU void coreb_die (void );void cpu_die (void );
@@ -46,4 +46,7 @@ int __cpu_disable(void);int __cpu_die (unsigned int cpu);#endif +void smp_timer_broadcast (const struct cpumask *mask); + +#endif /* !__ASM_BLACKFIN_SMP_H */
arch/blackfin/kernel/time-ts.c +25 -1
@@ -219,7 +219,7 @@ static void __init bfin_gptmr0_clockevent_init(struct clock_event_device *evt)#if defined(CONFIG_TICKSOURCE_CORETMR )/* per-cpu local core timer */ -static DEFINE_PER_CPU(struct clock_event_device, coretmr_events); +DEFINE_PER_CPU(struct clock_event_device, coretmr_events);static int bfin_coretmr_set_next_event (unsigned long cycles,struct clock_event_device *evt)
@@ -281,6 +281,25 @@ void bfin_coretmr_init(void)#ifdef CONFIG_CORE_TIMER_IRQ_L1 __attribute__((l1_text)) #endif + +static void broadcast_timer_set_mode (enum clock_event_mode mode, +struct clock_event_device *evt) +{ +} + +static void __cpuinit broadcast_timer_setup (struct clock_event_device *evt) +{ + evt->name ="dummy_timer" ; + evt->features =CLOCK_EVT_FEAT_ONESHOT | +CLOCK_EVT_FEAT_PERIODIC | +CLOCK_EVT_FEAT_DUMMY ; + evt->rating =400 ; + evt->mult =1 ; + evt->set_mode = broadcast_timer_set_mode; + +clockevents_register_device (evt); +} +irqreturn_t bfin_coretmr_interrupt (int irq,void *dev_id) {int cpu =smp_processor_id ();
@@ -306,6 +325,11 @@ void bfin_coretmr_clockevent_init(void)unsigned int cpu =smp_processor_id ();struct clock_event_device *evt = &per_cpu (coretmr_events, cpu); +#ifdef CONFIG_SMP + evt->broadcast = smp_timer_broadcast; +#endif + + evt->name ="bfin_core_timer" ; evt->rating =350 ; evt->irq =-1 ;
arch/blackfin/mach-bf561/include/mach/pll.h +3 -1
@@ -16,6 +16,7 @@#include <mach/irq.h> #define SUPPLE_0_WAKEUP ((IRQ_SUPPLE_0 - (IRQ_CORETMR + 1)) % 32) +#define SUPPLE_1_WAKEUP ((IRQ_SUPPLE_1 - (IRQ_CORETMR + 1)) % 32)static inline void bfin_iwr_restore (unsigned long iwr0,unsigned long iwr1,unsigned long iwr2)
@@ -42,7 +43,8 @@ bfin_iwr_save(unsigned long niwr0, unsigned long niwr1, unsigned long niwr2,static inline void bfin_iwr_set_sup0 (unsigned long *iwr0,unsigned long *iwr1,unsigned long *iwr2) { -bfin_iwr_save (0 ,IWR_ENABLE (SUPPLE_0_WAKEUP ),0 , iwr0, iwr1, iwr2); +bfin_iwr_save (0 ,IWR_ENABLE (SUPPLE_0_WAKEUP ) | +IWR_ENABLE (SUPPLE_1_WAKEUP ),0 , iwr0, iwr1, iwr2); }#endif
arch/blackfin/mach-bf561/smp.c +1 -1
@@ -84,7 +84,7 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idleif ((bfin_read_SYSCR () &COREB_SRAM_INIT ) ==0 ) {/* CoreB already running, sending ipi to wakeup it */ -platform_send_ipi_cpu (cpu,IRQ_SUPPLE_0 ); +smp_send_reschedule (cpu); }else {/* Kick CoreB, which should start execution from CORE_SRAM_BASE. */ bfin_write_SYSCR (bfin_read_SYSCR () & ~COREB_SRAM_INIT );
arch/blackfin/mach-common/smp.c +41 -12
105 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 5/11 blackfin: config: update def config for all boards
In reply to Bob LiuFrom: Scott Jiang <[email protected]>
Config name for spi controller driver has been modified in previous commit, so update default config accordingly.
--- arch/blackfin/configs/BF518F-EZBRD_defconfig | 2 +- arch/blackfin/configs/BF526-EZBRD_defconfig | 2 +- arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | 2 +- arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 2 +- arch/blackfin/configs/BF527-EZKIT_defconfig | 2 +- arch/blackfin/configs/BF533-EZKIT_defconfig | 2 +- arch/blackfin/configs/BF533-STAMP_defconfig | 2 +- arch/blackfin/configs/BF537-STAMP_defconfig | 2 +- arch/blackfin/configs/BF538-EZKIT_defconfig | 2 +- arch/blackfin/configs/BF548-EZKIT_defconfig | 2 +- arch/blackfin/configs/BF561-ACVILON_defconfig | 2 +- arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 2 +- arch/blackfin/configs/BF561-EZKIT_defconfig | 2 +- arch/blackfin/configs/BlackStamp_defconfig | 2 +- arch/blackfin/configs/CM-BF527_defconfig | 2 +- arch/blackfin/configs/CM-BF533_defconfig | 2 +- arch/blackfin/configs/CM-BF537E_defconfig | 2 +- arch/blackfin/configs/CM-BF537U_defconfig | 2 +- arch/blackfin/configs/CM-BF548_defconfig | 2 +- arch/blackfin/configs/CM-BF561_defconfig | 2 +- arch/blackfin/configs/DNP5370_defconfig | 2 +- arch/blackfin/configs/H8606_defconfig | 2 +- arch/blackfin/configs/IP0X_defconfig | 2 +- arch/blackfin/configs/PNAV-10_defconfig | 2 +- arch/blackfin/configs/SRV1_defconfig | 2 +- arch/blackfin/configs/TCM-BF518_defconfig | 2 +- arch/blackfin/configs/TCM-BF537_defconfig | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-)
arch/blackfin/configs/BF518F-EZBRD_defconfig +1 -1
@@ -80,7 +80,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF526-EZBRD_defconfig +1 -1
@@ -97,7 +97,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_WATCHDOG=y
arch/blackfin/configs/BF527-AD7160-EVAL_defconfig +1 -1
@@ -68,7 +68,7 @@ CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=400 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF527-EZKIT-V2_defconfig +1 -1
@@ -105,7 +105,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF527-EZKIT_defconfig +1 -1
@@ -99,7 +99,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF533-EZKIT_defconfig +1 -1
@@ -81,7 +81,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF533-STAMP_defconfig +1 -1
@@ -84,7 +84,7 @@ CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_GPIO=m CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF537-STAMP_defconfig +1 -1
@@ -94,7 +94,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_BLACKFIN_TWI=m CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF538-EZKIT_defconfig +1 -1
@@ -101,7 +101,7 @@ CONFIG_I2C=m CONFIG_I2C_BLACKFIN_TWI=m CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF548-EZKIT_defconfig +1 -1
@@ -113,7 +113,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF561-ACVILON_defconfig +1 -1
@@ -85,7 +85,7 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_PCA_PLATFORM=y CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_SPI_SPIDEV=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y
arch/blackfin/configs/BF561-EZKIT-SMP_defconfig +1 -1
@@ -84,7 +84,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BF561-EZKIT_defconfig +1 -1
@@ -86,7 +86,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/BlackStamp_defconfig +1 -1
@@ -80,7 +80,7 @@ CONFIG_I2C=m CONFIG_I2C_CHARDEV=m CONFIG_I2C_GPIO=m CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_SPI_SPIDEV=m # CONFIG_HWMON is not set CONFIG_WATCHDOG=y
arch/blackfin/configs/CM-BF527_defconfig +1 -1
@@ -88,7 +88,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_BLACKFIN_TWI=m CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_WATCHDOG=y
arch/blackfin/configs/CM-BF533_defconfig +1 -1
@@ -57,7 +57,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y # CONFIG_HWMON is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y
arch/blackfin/configs/CM-BF537E_defconfig +1 -1
@@ -78,7 +78,7 @@ CONFIG_SERIAL_BFIN_UART1=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_USB_GADGET=m
arch/blackfin/configs/CM-BF537U_defconfig +1 -1
@@ -72,7 +72,7 @@ CONFIG_SERIAL_BFIN_UART1=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_USB_GADGET=y
arch/blackfin/configs/CM-BF548_defconfig +1 -1
@@ -89,7 +89,7 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_BFIN_WDT=y
arch/blackfin/configs/CM-BF561_defconfig +1 -1
@@ -78,7 +78,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_USB_GADGET=m
arch/blackfin/configs/DNP5370_defconfig +1 -1
@@ -78,7 +78,7 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_SPI_SPIDEV=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y
arch/blackfin/configs/H8606_defconfig +1 -1
@@ -68,7 +68,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_SPI_SPIDEV=y CONFIG_WATCHDOG=y CONFIG_SOUND=m
arch/blackfin/configs/IP0X_defconfig +1 -1
@@ -70,7 +70,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_HW_RANDOM=y CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_USB=y
arch/blackfin/configs/PNAV-10_defconfig +1 -1
@@ -84,7 +84,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_BACKLIGHT_LCD_SUPPORT=y
arch/blackfin/configs/SRV1_defconfig +1 -1
@@ -71,7 +71,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_HWMON=m CONFIG_WATCHDOG=y CONFIG_BFIN_WDT=y
arch/blackfin/configs/TCM-BF518_defconfig +1 -1
@@ -92,7 +92,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_BLACKFIN_TWI=y CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set
arch/blackfin/configs/TCM-BF537_defconfig +1 -1
@@ -70,7 +70,7 @@ CONFIG_SERIAL_BFIN_UART1=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_SPI=y -CONFIG_SPI_BFIN=y +CONFIG_SPI_BFIN5XX=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_BFIN_WDT=y
Signature · 1 line
1.7.0.4
PATCH 6/11 blackfin: config: update macro SPI_BFIN in board file
In reply to Bob LiuFrom: Sonic Zhang <[email protected]>
Macro name for spi controller driver has been modified, so update default board file accordingly.
--- arch/blackfin/mach-bf518/boards/ezbrd.c | 8 ++++---- arch/blackfin/mach-bf518/boards/tcm-bf518.c | 4 ++-- arch/blackfin/mach-bf527/boards/ad7160eval.c | 4 ++-- arch/blackfin/mach-bf527/boards/cm_bf527.c | 4 ++-- arch/blackfin/mach-bf527/boards/ezbrd.c | 4 ++-- arch/blackfin/mach-bf527/boards/ezkit.c | 4 ++-- arch/blackfin/mach-bf527/boards/tll6527m.c | 4 ++-- arch/blackfin/mach-bf533/boards/H8606.c | 6 +++--- arch/blackfin/mach-bf533/boards/blackstamp.c | 4 ++-- arch/blackfin/mach-bf533/boards/cm_bf533.c | 6 +++--- arch/blackfin/mach-bf533/boards/ezkit.c | 4 ++-- arch/blackfin/mach-bf533/boards/ip0x.c | 4 ++-- arch/blackfin/mach-bf533/boards/stamp.c | 4 ++-- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 6 +++--- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 6 +++--- arch/blackfin/mach-bf537/boards/dnp5370.c | 4 ++-- arch/blackfin/mach-bf537/boards/minotaur.c | 6 +++--- arch/blackfin/mach-bf537/boards/pnav10.c | 6 +++--- arch/blackfin/mach-bf537/boards/stamp.c | 4 ++-- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 6 +++--- arch/blackfin/mach-bf538/boards/ezkit.c | 6 +++--- arch/blackfin/mach-bf548/boards/cm_bf548.c | 6 +++--- arch/blackfin/mach-bf548/boards/ezkit.c | 4 ++-- arch/blackfin/mach-bf561/boards/acvilon.c | 4 ++-- arch/blackfin/mach-bf561/boards/cm_bf561.c | 6 +++--- arch/blackfin/mach-bf561/boards/ezkit.c | 4 ++-- 26 files changed, 64 insertions(+), 64 deletions(-)
arch/blackfin/mach-bf518/boards/ezbrd.c +4 -4
@@ -61,7 +61,7 @@ static struct physmap_flash_data ezbrd_flash_data = {static struct resource ezbrd_flash_resource = { .start =0x20000000 , -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) .end =0x202fffff , #else .end = 0x203fffff,
@@ -292,7 +292,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { };/* SPI controller data */ -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI (0) */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = 6,
@@ -715,7 +715,7 @@ static struct platform_device *stamp_devices[] __initdata = {#endif #endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device, &bfin_spi1_device,#endif
@@ -777,7 +777,7 @@ static int __init ezbrd_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));/* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */ peripheral_request (P_AMS2 ,"ParaFlash" ); -#if !defined(CONFIG_SPI_BFIN ) && !defined(CONFIG_SPI_BFIN_MODULE ) +#if !defined(CONFIG_SPI_BFIN5XX ) && !defined(CONFIG_SPI_BFIN5XX_MODULE )peripheral_request (P_AMS3 ,"ParaFlash" );#endif return 0 ;
arch/blackfin/mach-bf518/boards/tcm-bf518.c +2 -2
@@ -228,7 +228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { };/* SPI controller data */ -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI (0) */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = 6,
@@ -635,7 +635,7 @@ static struct platform_device *tcm_devices[] __initdata = { &bfin_mac_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device, &bfin_spi1_device,#endif
arch/blackfin/mach-bf527/boards/ad7160eval.c +2 -2
@@ -334,7 +334,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI controller data */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
@@ -744,7 +744,7 @@ static struct platform_device *stamp_devices[] __initdata = { &bfin_mac_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf527/boards/cm_bf527.c +2 -2
@@ -444,7 +444,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI controller data */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = 8,
@@ -893,7 +893,7 @@ static struct platform_device *cmbf527_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf527/boards/ezbrd.c +2 -2
@@ -371,7 +371,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI controller data */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = 8,
@@ -776,7 +776,7 @@ static struct platform_device *stamp_devices[] __initdata = { &bfin_mac_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf527/boards/ezkit.c +2 -2
@@ -664,7 +664,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI controller data */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = 8,
@@ -1189,7 +1189,7 @@ static struct platform_device *stamp_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf527/boards/tll6527m.c +2 -2
@@ -448,7 +448,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI controller data */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = EXP_GPIO_SPISEL_BASE + 8 + MAX_CTRL_CS,
@@ -831,7 +831,7 @@ static struct platform_device *tll6527m_devices[] __initdata = { &bfin_mac_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf533/boards/H8606.c +3 -3
@@ -125,7 +125,7 @@ static struct platform_device net2272_bfin_device = { };#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) || defined(CONFIG_MTD_M25P80_MODULE )
@@ -398,7 +398,7 @@ static struct platform_device *h8606_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -428,7 +428,7 @@ static int __init H8606_init(void)printk (KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n" );printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (h8606_devices,ARRAY_SIZE (h8606_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif return 0 ;
arch/blackfin/mach-bf533/boards/blackstamp.c +2 -2
@@ -146,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) /* SPI (0) */ static struct resource bfin_spi0_resource[] = { [0] = {
@@ -422,7 +422,7 @@ static struct platform_device *stamp_devices[] __initdata = {#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf533/boards/cm_bf533.c +3 -3
@@ -29,7 +29,7 @@*/ const char bfin_board_name[] ="Bluetechnix CM BF533" ; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) || defined(CONFIG_MTD_M25P80_MODULE ) static struct mtd_partition bfin_spi_flash_partitions[] = {
@@ -536,7 +536,7 @@ static struct platform_device *cm_bf533_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -549,7 +549,7 @@ static int __init cm_bf533_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf533_devices,ARRAY_SIZE (cm_bf533_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif return 0 ;
arch/blackfin/mach-bf533/boards/ezkit.c +2 -2
@@ -245,7 +245,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) /* SPI (0) */ static struct resource bfin_spi0_resource[] = { [0] = {
@@ -484,7 +484,7 @@ static struct platform_device *ezkit_devices[] __initdata = { &smc91x_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf533/boards/ip0x.c +2 -2
@@ -104,7 +104,7 @@ static struct platform_device dm9000_device2 = {#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MMC_SPI ) || defined(CONFIG_MMC_SPI_MODULE )
@@ -270,7 +270,7 @@ static struct platform_device *ip0x_devices[] __initdata = {#endif #endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &spi_bfin_master_device,#endif
arch/blackfin/mach-bf533/boards/stamp.c +2 -2
@@ -252,7 +252,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) /* SPI (0) */ static struct resource bfin_spi0_resource[] = { [0] = {
@@ -704,7 +704,7 @@ static struct platform_device *stamp_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf537/boards/cm_bf537e.c +3 -3
@@ -31,7 +31,7 @@*/ const char bfin_board_name[] ="Bluetechnix CM BF537E" ; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) || defined(CONFIG_MTD_M25P80_MODULE )
@@ -735,7 +735,7 @@ static struct platform_device *cm_bf537e_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -770,7 +770,7 @@ static int __init cm_bf537e_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf537e_devices,ARRAY_SIZE (cm_bf537e_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif
arch/blackfin/mach-bf537/boards/cm_bf537u.c +3 -3
@@ -32,7 +32,7 @@*/ const char bfin_board_name[] ="Bluetechnix CM BF537U" ; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) || defined(CONFIG_MTD_M25P80_MODULE )
@@ -700,7 +700,7 @@ static struct platform_device *cm_bf537u_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -747,7 +747,7 @@ static int __init cm_bf537u_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf537u_devices,ARRAY_SIZE (cm_bf537u_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif
arch/blackfin/mach-bf537/boards/dnp5370.c +2 -2
@@ -125,7 +125,7 @@ static struct platform_device asmb_flash_device = { };#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )#if defined(CONFIG_MMC_SPI ) || defined(CONFIG_MMC_SPI_MODULE )
@@ -370,7 +370,7 @@ static struct platform_device *dnp5370_devices[] __initdata = { &bfin_mac_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &spi_bfin_master_device,#endif
arch/blackfin/mach-bf537/boards/minotaur.c +3 -3
@@ -121,7 +121,7 @@ static struct platform_device net2272_bfin_device = { };#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) \
@@ -496,7 +496,7 @@ static struct platform_device *minotaur_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -537,7 +537,7 @@ static int __init minotaur_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (minotaur_devices,ARRAY_SIZE (minotaur_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif
arch/blackfin/mach-bf537/boards/pnav10.c +3 -3
@@ -154,7 +154,7 @@ static struct platform_device net2272_bfin_device = { };#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) \
@@ -477,7 +477,7 @@ static struct platform_device *stamp_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -508,7 +508,7 @@ static int __init pnav_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (stamp_devices,ARRAY_SIZE (stamp_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif
arch/blackfin/mach-bf537/boards/stamp.c +2 -2
@@ -1420,7 +1420,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {#endif }; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* SPI controller data */ static struct bfin5xx_spi_master bfin_spi0_info = { .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
@@ -2716,7 +2716,7 @@ static struct platform_device *stamp_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
arch/blackfin/mach-bf537/boards/tcm_bf537.c +3 -3
@@ -32,7 +32,7 @@*/ const char bfin_board_name[] ="Bluetechnix TCM BF537" ; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) || defined(CONFIG_MTD_M25P80_MODULE )
@@ -702,7 +702,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -737,7 +737,7 @@ static int __init tcm_bf537_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf537_devices,ARRAY_SIZE (cm_bf537_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif
arch/blackfin/mach-bf538/boards/ezkit.c +3 -3
@@ -490,7 +490,7 @@ static struct platform_device smc91x_device = { };#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) \ || defined(CONFIG_MTD_M25P80_MODULE )
@@ -874,7 +874,7 @@ static struct platform_device *cm_bf538_devices[] __initdata = {#endif #endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bf538_spi_master0, &bf538_spi_master1, &bf538_spi_master2,
@@ -938,7 +938,7 @@ static int __init ezkit_init(void)printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf538_devices,ARRAY_SIZE (cm_bf538_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bf538_spi_board_info,ARRAY_SIZE (bf538_spi_board_info));#endif
arch/blackfin/mach-bf548/boards/cm_bf548.c +3 -3
@@ -854,7 +854,7 @@ static struct platform_device para_flash_device = { };#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) \ || defined(CONFIG_MTD_M25P80_MODULE )
@@ -1175,7 +1175,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = { &bf54x_sdh_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bf54x_spi_master0, &bf54x_spi_master1,#endif
@@ -1210,7 +1210,7 @@ static int __init cm_bf548_init(void)printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf548_devices,ARRAY_SIZE (cm_bf548_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bf54x_spi_board_info,ARRAY_SIZE (bf54x_spi_board_info));#endif
arch/blackfin/mach-bf548/boards/ezkit.c +2 -2
@@ -1110,7 +1110,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { },#endif }; -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) /* SPI (0) */ static struct resource bfin_spi0_resource[] = { [0] = {
@@ -1502,7 +1502,7 @@ static struct platform_device *ezkit_devices[] __initdata = { &bf54x_sdh_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bf54x_spi_master0, &bf54x_spi_master1,#endif
arch/blackfin/mach-bf561/boards/acvilon.c +2 -2
@@ -372,7 +372,7 @@ static struct bfin5xx_spi_chip data_flash_chip_info = { };#endif -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) /* SPI (0) */ static struct resource bfin_spi0_resource[] = { [0] = {
@@ -475,7 +475,7 @@ static struct platform_device bfin_dpmc = {static struct platform_device *acvilon_devices[]__initdata = { &bfin_dpmc, -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) &bfin_spi0_device, #endif
arch/blackfin/mach-bf561/boards/cm_bf561.c +3 -3
@@ -29,7 +29,7 @@*/ const char bfin_board_name[] ="Bluetechnix CM BF561" ; -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )/* all SPI peripherals info goes here */ #if defined(CONFIG_MTD_M25P80 ) || defined(CONFIG_MTD_M25P80_MODULE )
@@ -488,7 +488,7 @@ static struct platform_device *cm_bf561_devices[] __initdata = { &net2272_bfin_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
@@ -523,7 +523,7 @@ static int __init cm_bf561_init(void) {printk (KERN_INFO "%s(): registering device resources\n" , __func__);platform_add_devices (cm_bf561_devices,ARRAY_SIZE (cm_bf561_devices)); -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE )spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#endif
arch/blackfin/mach-bf561/boards/ezkit.c +2 -2
@@ -291,7 +291,7 @@ static struct platform_device ezkit_flash_device = { };#endif -#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) +#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) /* SPI (0) */ static struct resource bfin_spi0_resource[] = { [0] = {
@@ -462,7 +462,7 @@ static struct platform_device *ezkit_devices[] __initdata = { &bfin_isp1760_device,#endif -#if defined(CONFIG_SPI_BFIN ) || defined(CONFIG_SPI_BFIN_MODULE ) +#if defined(CONFIG_SPI_BFIN5XX ) || defined(CONFIG_SPI_BFIN5XX_MODULE ) &bfin_spi0_device,#endif
Signature · 1 line
1.7.0.4
PATCH 7/11 blackfin: smp: fix msg queue overflow issue
In reply to Bob LiuFrom: Steven Miao <[email protected]>
disable preemption when icache flush and use wait mode cross call, hold the msg queue lock while handle cross function call to avoid overflow
--- arch/blackfin/mach-common/smp.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
arch/blackfin/mach-common/smp.c +3 -5
@@ -193,14 +193,10 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance)scheduler_ipi ();break ;case BFIN_IPI_CALL_FUNC : -spin_unlock_irqrestore (&msg_queue->lock, flags);ipi_call_function (cpu, msg); -spin_lock_irqsave (&msg_queue->lock, flags);break ;case BFIN_IPI_CPU_STOP : -spin_unlock_irqrestore (&msg_queue->lock, flags);ipi_cpu_stop (cpu); -spin_lock_irqsave (&msg_queue->lock, flags);break ;default : printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%lx\n",
@@ -482,8 +478,10 @@ void smp_icache_flush_range_others(unsigned long start, unsigned long end) smp_flush_data.start = start; smp_flush_data.end = end; -if (smp_call_function (&ipi_flush_icache, &smp_flush_data,0 )) +preempt_disable (); +if (smp_call_function (&ipi_flush_icache, &smp_flush_data,1 ))printk (KERN_WARNING "SMP: failed to run I-cache flush request on other CPUs\n" ); +preempt_enable (); }EXPORT_SYMBOL_GPL (smp_icache_flush_range_others);
Signature · 1 line
1.7.0.4
PATCH 8/11 bf54x: get mem size: missing break in switch
In reply to Bob LiuFrom: Steven Miao <[email protected]>
--- arch/blackfin/kernel/setup.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)
arch/blackfin/kernel/setup.c +12 -4
@@ -828,10 +828,18 @@ static inline int __init get_mem_size(void)u32 ddrctl =bfin_read_EBIU_DDRCTL1 ();int ret =0 ;switch (ddrctl &0xc0000 ) { -case DEVSZ_64 : ret =64 /8 ; -case DEVSZ_128 : ret =128 /8 ; -case DEVSZ_256 : ret =256 /8 ; -case DEVSZ_512 : ret =512 /8 ; +case DEVSZ_64 : + ret =64 /8 ; +break ; +case DEVSZ_128 : + ret =128 /8 ; +break ; +case DEVSZ_256 : + ret =256 /8 ; +break ; +case DEVSZ_512 : + ret =512 /8 ; +break ; }switch (ddrctl &0x30000 ) {case DEVWD_4 : ret *=2 ;
Signature · 1 line
1.7.0.4
PATCH 9/11 serial: bfin-uart: remove unused field for hardware flow control.
In reply to Bob LiuFrom: Sonic Zhang <[email protected]>
--- arch/blackfin/include/asm/bfin_serial.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
arch/blackfin/include/asm/bfin_serial.h +0 -3
@@ -51,9 +51,6 @@ struct bfin_serial_port {#elif ANOMALY_05000363 unsigned int anomaly_threshold;#endif -#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS -int scts; -#endif #if defined(CONFIG_SERIAL_BFIN_CTSRTS ) || \ defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS )int cts_pin;
Signature · 1 line
1.7.0.4
PATCH 10/11 bf537: spi sport driver can support any gpio as its cs pin
In reply to Bob LiuFrom: Scott Jiang <[email protected]>
--- arch/blackfin/mach-bf537/boards/stamp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/blackfin/mach-bf537/boards/stamp.c +2 -2
@@ -1462,7 +1462,7 @@ static struct platform_device bfin_spi0_device = {/* SPORT SPI controller data */ static struct bfin5xx_spi_master bfin_sport_spi0_info = { - .num_chipselect =1 ,/* master only supports one device */ + .num_chipselect =MAX_BLACKFIN_GPIOS , .enable_dma =0 ,/* master don't support DMA */ .pin_req = {P_SPORT0_DTPRI ,P_SPORT0_TSCLK ,P_SPORT0_DRPRI ,P_SPORT0_RSCLK ,P_SPORT0_TFS ,P_SPORT0_RFS ,0 },
@@ -1492,7 +1492,7 @@ static struct platform_device bfin_sport_spi0_device = { };static struct bfin5xx_spi_master bfin_sport_spi1_info = { - .num_chipselect =1 ,/* master only supports one device */ + .num_chipselect =MAX_BLACKFIN_GPIOS , .enable_dma =0 ,/* master don't support DMA */ .pin_req = {P_SPORT1_DTPRI ,P_SPORT1_TSCLK ,P_SPORT1_DRPRI ,P_SPORT1_RSCLK ,P_SPORT1_TFS ,P_SPORT1_RFS ,0 },
Signature · 1 line
1.7.0.4
PATCH 11/11 blackfin: mac: dsa: add vlan mask in board file
In reply to Bob LiuFrom: Steven Miao <[email protected]>
Else push file through ftp/rcp will fail.
--- arch/blackfin/mach-bf518/boards/ezbrd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/blackfin/mach-bf518/boards/ezbrd.c +2 -0
@@ -122,6 +122,8 @@ static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) .phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */ #endif + .vlan1_mask = 1, + .vlan2_mask = 2, }; static struct platform_device bfin_mii_bus = {
Signature · 1 line
1.7.0.4