diff options
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch')
| -rw-r--r--[-rwxr-xr-x] | target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch | 63 |
1 files changed, 24 insertions, 39 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch b/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch index 803e6743e6..c986c840fb 100755..100644 --- a/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch +++ b/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch @@ -18,8 +18,6 @@ support code with each new device. sound/soc/bcm/bcm2835-i2s.c | 1 + 6 files changed, 80 insertions(+), 64 deletions(-) -diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c -index 5f6a1fa..2c6a29d 100644 --- a/arch/arm/mach-bcm2708/bcm2708.c +++ b/arch/arm/mach-bcm2708/bcm2708.c @@ -35,6 +35,7 @@ @@ -39,7 +37,7 @@ index 5f6a1fa..2c6a29d 100644 static void __init bcm2708_init_led(void); void __init bcm2708_init_irq(void) -@@ -514,7 +517,6 @@ static struct platform_device bcm2708_alsa_devices[] = { +@@ -514,7 +517,6 @@ static struct platform_device bcm2708_al }, }; @@ -47,7 +45,7 @@ index 5f6a1fa..2c6a29d 100644 static struct resource bcm2708_spi_resources[] = { { .start = SPI0_BASE, -@@ -538,7 +540,6 @@ static struct platform_device bcm2708_spi_device = { +@@ -538,7 +540,6 @@ static struct platform_device bcm2708_sp .dma_mask = &bcm2708_spi_dmamask, .coherent_dma_mask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON)}, }; @@ -55,7 +53,7 @@ index 5f6a1fa..2c6a29d 100644 #ifdef CONFIG_BCM2708_SPIDEV static struct spi_board_info bcm2708_spi_devices[] = { -@@ -560,7 +561,6 @@ static struct spi_board_info bcm2708_spi_devices[] = { +@@ -560,7 +561,6 @@ static struct spi_board_info bcm2708_spi }; #endif @@ -63,7 +61,7 @@ index 5f6a1fa..2c6a29d 100644 static struct resource bcm2708_bsc0_resources[] = { { .start = BSC0_BASE, -@@ -599,7 +599,6 @@ static struct platform_device bcm2708_bsc1_device = { +@@ -599,7 +599,6 @@ static struct platform_device bcm2708_bs .num_resources = ARRAY_SIZE(bcm2708_bsc1_resources), .resource = bcm2708_bsc1_resources, }; @@ -71,7 +69,7 @@ index 5f6a1fa..2c6a29d 100644 static struct platform_device bcm2835_hwmon_device = { .name = "bcm2835_hwmon", -@@ -609,7 +608,7 @@ static struct platform_device bcm2835_thermal_device = { +@@ -609,7 +608,7 @@ static struct platform_device bcm2835_th .name = "bcm2835_thermal", }; @@ -80,7 +78,7 @@ index 5f6a1fa..2c6a29d 100644 static struct resource bcm2708_i2s_resources[] = { { .start = I2S_BASE, -@@ -731,14 +730,14 @@ int __init bcm_register_device(struct platform_device *pdev) +@@ -731,14 +730,14 @@ int __init bcm_register_device(struct pl } /* @@ -186,7 +184,7 @@ index 5f6a1fa..2c6a29d 100644 #endif -@@ -1041,9 +1041,9 @@ static struct platform_device bcm2708_led_device = { +@@ -1041,9 +1041,9 @@ static struct platform_device bcm2708_le static void __init bcm2708_init_led(void) { @@ -199,8 +197,6 @@ index 5f6a1fa..2c6a29d 100644 } #else static inline void bcm2708_init_led(void) -diff --git a/drivers/dma/bcm2708-dmaengine.c b/drivers/dma/bcm2708-dmaengine.c -index 10463db..3f9be02 100644 --- a/drivers/dma/bcm2708-dmaengine.c +++ b/drivers/dma/bcm2708-dmaengine.c @@ -42,7 +42,7 @@ @@ -212,7 +208,7 @@ index 10463db..3f9be02 100644 /* dma manager */ #include <mach/dma.h> -@@ -721,7 +721,7 @@ static int bcm2835_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, +@@ -721,7 +721,7 @@ static int bcm2835_dma_control(struct dm } } @@ -221,7 +217,7 @@ index 10463db..3f9be02 100644 static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq) { struct bcm2835_chan *c; -@@ -784,7 +784,7 @@ static const struct of_device_id bcm2835_dma_of_match[] = { +@@ -784,7 +784,7 @@ static const struct of_device_id bcm2835 }; MODULE_DEVICE_TABLE(of, bcm2835_dma_of_match); @@ -230,7 +226,7 @@ index 10463db..3f9be02 100644 static struct dma_chan *bcm2835_dma_xlate(struct of_phandle_args *spec, struct of_dma *ofdma) { -@@ -817,7 +817,7 @@ static int bcm2835_dma_device_slave_caps(struct dma_chan *dchan, +@@ -817,7 +817,7 @@ static int bcm2835_dma_device_slave_caps static int bcm2835_dma_probe(struct platform_device *pdev) { struct bcm2835_dmadev *od; @@ -239,7 +235,7 @@ index 10463db..3f9be02 100644 struct resource *res; void __iomem *base; uint32_t chans_available; -@@ -830,10 +830,10 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -830,10 +830,10 @@ static int bcm2835_dma_probe(struct plat if (!pdev->dev.dma_mask) pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; @@ -252,7 +248,7 @@ index 10463db..3f9be02 100644 rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); if (rc) -@@ -987,7 +987,7 @@ static int bcm2835_dma_remove(struct platform_device *pdev) +@@ -987,7 +987,7 @@ static int bcm2835_dma_remove(struct pla return 0; } @@ -261,8 +257,6 @@ index 10463db..3f9be02 100644 static struct platform_driver bcm2835_dma_driver = { -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index cefba7c..34d6167 100644 --- a/drivers/mmc/host/bcm2835-mmc.c +++ b/drivers/mmc/host/bcm2835-mmc.c @@ -42,7 +42,7 @@ @@ -274,7 +268,7 @@ index cefba7c..34d6167 100644 #define BCM2835_CLOCK_FREQ 250000000 #endif -@@ -662,7 +662,7 @@ void bcm2835_mmc_send_command(struct bcm2835_host *host, struct mmc_command *cmd +@@ -662,7 +662,7 @@ void bcm2835_mmc_send_command(struct bcm } timeout = jiffies; @@ -283,7 +277,7 @@ index cefba7c..34d6167 100644 if (!cmd->data && cmd->busy_timeout > 9000) timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ; else -@@ -962,7 +962,7 @@ static irqreturn_t bcm2835_mmc_irq(int irq, void *dev_id) +@@ -962,7 +962,7 @@ static irqreturn_t bcm2835_mmc_irq(int i struct bcm2835_host *host = dev_id; u32 intmask, mask, unexpected = 0; int max_loops = 16; @@ -292,7 +286,7 @@ index cefba7c..34d6167 100644 int cardint = 0; #endif -@@ -993,7 +993,7 @@ static irqreturn_t bcm2835_mmc_irq(int irq, void *dev_id) +@@ -993,7 +993,7 @@ static irqreturn_t bcm2835_mmc_irq(int i mmc_hostname(host->mmc)); if (intmask & SDHCI_INT_CARD_INT) { @@ -319,7 +313,7 @@ index cefba7c..34d6167 100644 static irqreturn_t bcm2835_mmc_thread_irq(int irq, void *dev_id) { struct bcm2835_host *host = dev_id; -@@ -1288,7 +1288,7 @@ int bcm2835_mmc_add_host(struct bcm2835_host *host) +@@ -1288,7 +1288,7 @@ int bcm2835_mmc_add_host(struct bcm2835_ /* SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK */ host->timeout_clk = mmc->f_max / 1000; @@ -328,7 +322,7 @@ index cefba7c..34d6167 100644 mmc->max_busy_timeout = (1 << 27) / host->timeout_clk; #endif /* host controller capabilities */ -@@ -1345,7 +1345,7 @@ int bcm2835_mmc_add_host(struct bcm2835_host *host) +@@ -1345,7 +1345,7 @@ int bcm2835_mmc_add_host(struct bcm2835_ init_waitqueue_head(&host->buf_ready_int); bcm2835_mmc_init(host, 0); @@ -346,7 +340,7 @@ index cefba7c..34d6167 100644 struct device_node *node = dev->of_node; struct clk *clk; #endif -@@ -1383,7 +1383,7 @@ static int bcm2835_mmc_probe(struct platform_device *pdev) +@@ -1383,7 +1383,7 @@ static int bcm2835_mmc_probe(struct plat int ret; struct mmc_host *mmc; @@ -355,7 +349,7 @@ index cefba7c..34d6167 100644 dma_cap_mask_t mask; #endif -@@ -1408,7 +1408,7 @@ static int bcm2835_mmc_probe(struct platform_device *pdev) +@@ -1408,7 +1408,7 @@ static int bcm2835_mmc_probe(struct plat host->phys_addr = iomem->start + BCM2835_VCMMU_SHIFT; @@ -364,7 +358,7 @@ index cefba7c..34d6167 100644 #ifndef FORCE_PIO dma_cap_zero(mask); /* we don't care about the channel, any would work */ -@@ -1458,7 +1458,7 @@ static int bcm2835_mmc_probe(struct platform_device *pdev) +@@ -1458,7 +1458,7 @@ static int bcm2835_mmc_probe(struct plat } @@ -373,11 +367,9 @@ index cefba7c..34d6167 100644 mmc->caps |= MMC_CAP_4_BIT_DATA; #else mmc_of_parse(mmc); -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index d134710..2e2b6d0 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1083,8 +1083,12 @@ static struct debugfs_blob_wrapper flat_dt_blob; +@@ -1086,8 +1086,12 @@ static struct debugfs_blob_wrapper flat_ static int __init of_flat_dt_debugfs_export_fdt(void) { @@ -391,11 +383,9 @@ index d134710..2e2b6d0 100644 if (!d) return -ENOENT; -diff --git a/sound/soc/bcm/bcm2708-i2s.c b/sound/soc/bcm/bcm2708-i2s.c -index 0b5322a..a3b65dc 100644 --- a/sound/soc/bcm/bcm2708-i2s.c +++ b/sound/soc/bcm/bcm2708-i2s.c -@@ -493,15 +493,19 @@ static int bcm2708_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -493,15 +493,19 @@ static int bcm2708_i2s_hw_params(struct divf = dividend & BCM2708_CLK_DIVF_MASK; } @@ -424,7 +414,7 @@ index 0b5322a..a3b65dc 100644 /* Setup the frame format */ format = BCM2708_I2S_CHEN; -@@ -981,12 +985,19 @@ static int bcm2708_i2s_remove(struct platform_device *pdev) +@@ -981,12 +985,19 @@ static int bcm2708_i2s_remove(struct pla return 0; } @@ -444,11 +434,9 @@ index 0b5322a..a3b65dc 100644 }, }; -diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c -index 2685fe4..e2c61d1 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c -@@ -861,6 +861,7 @@ static const struct of_device_id bcm2835_i2s_of_match[] = { +@@ -861,6 +861,7 @@ static const struct of_device_id bcm2835 { .compatible = "brcm,bcm2835-i2s", }, {}, }; @@ -456,6 +444,3 @@ index 2685fe4..e2c61d1 100644 static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, --- -1.8.3.2 - |