diff options
| author | John Crispin <john@openwrt.org> | 2015-02-13 07:38:27 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-02-13 07:38:27 +0000 |
| commit | 9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f (patch) | |
| tree | d195a3dab5e103006253d85283b3bd4b21708e09 /target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch | |
| parent | 2dbcf5e91f4f9db57d618d801674c3792d4504e7 (diff) | |
| download | upstream-9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f.tar.gz upstream-9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f.tar.bz2 upstream-9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f.zip | |
brcm2708: refresh patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 44433
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch')
| -rw-r--r--[-rwxr-xr-x] | target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch b/target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch index 9eca2db39c..8969c30b0c 100755..100644 --- a/target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch +++ b/target/linux/brcm2708/patches-3.18/0052-spi-bcm2708-add-device-tree-support.patch @@ -31,8 +31,6 @@ bcm2708: Remove the prohibition on mixing SPIDEV and DT drivers/spi/spi-bcm2708.c | 8 ++++++++ 5 files changed, 75 insertions(+), 4 deletions(-) -diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts -index e319c8e..30107fb 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -5,4 +5,36 @@ @@ -72,8 +70,6 @@ index e319c8e..30107fb 100644 + spi-max-frequency = <500000>; + }; }; -diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi -index b2920c8..e90bf4c 100644 --- a/arch/arm/boot/dts/bcm2708.dtsi +++ b/arch/arm/boot/dts/bcm2708.dtsi @@ -38,11 +38,29 @@ @@ -106,11 +102,9 @@ index b2920c8..e90bf4c 100644 + }; }; }; -diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c -index 0e5bd43..a2069f8 100644 --- a/arch/arm/mach-bcm2708/bcm2708.c +++ b/arch/arm/mach-bcm2708/bcm2708.c -@@ -486,6 +486,7 @@ static struct platform_device bcm2708_alsa_devices[] = { +@@ -486,6 +486,7 @@ static struct platform_device bcm2708_al }, }; @@ -118,7 +112,7 @@ index 0e5bd43..a2069f8 100644 static struct resource bcm2708_spi_resources[] = { { .start = SPI0_BASE, -@@ -509,6 +510,7 @@ static struct platform_device bcm2708_spi_device = { +@@ -509,6 +510,7 @@ static struct platform_device bcm2708_sp .dma_mask = &bcm2708_spi_dmamask, .coherent_dma_mask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON)}, }; @@ -126,7 +120,7 @@ index 0e5bd43..a2069f8 100644 #ifdef CONFIG_BCM2708_SPIDEV static struct spi_board_info bcm2708_spi_devices[] = { -@@ -670,6 +672,16 @@ int __init bcm_register_device(struct platform_device *pdev) +@@ -670,6 +672,16 @@ int __init bcm_register_device(struct pl return ret; } @@ -164,8 +158,6 @@ index 0e5bd43..a2069f8 100644 #endif } -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 71b4741..a5238ab 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -77,7 +77,7 @@ config SPI_ATMEL @@ -177,11 +169,9 @@ index 71b4741..a5238ab 100644 help This selects a driver for the Broadcom BCM2835 SPI master. -diff --git a/drivers/spi/spi-bcm2708.c b/drivers/spi/spi-bcm2708.c -index 349d21f..041b5e2 100644 --- a/drivers/spi/spi-bcm2708.c +++ b/drivers/spi/spi-bcm2708.c -@@ -512,6 +512,7 @@ static int bcm2708_spi_probe(struct platform_device *pdev) +@@ -512,6 +512,7 @@ static int bcm2708_spi_probe(struct plat master->setup = bcm2708_spi_setup; master->transfer = bcm2708_spi_transfer; master->cleanup = bcm2708_spi_cleanup; @@ -189,7 +179,7 @@ index 349d21f..041b5e2 100644 platform_set_drvdata(pdev, master); bs = spi_master_get_devdata(master); -@@ -596,10 +597,17 @@ static int bcm2708_spi_remove(struct platform_device *pdev) +@@ -596,10 +597,17 @@ static int bcm2708_spi_remove(struct pla return 0; } @@ -207,6 +197,3 @@ index 349d21f..041b5e2 100644 }, .probe = bcm2708_spi_probe, .remove = bcm2708_spi_remove, --- -1.8.3.2 - |