diff --git a/patches/defconfig b/patches/defconfig
index 8a56eab565fb92a0fca1e28ad8be09458bc7beef..e917ff224fee569648d72220b12a5683cd56d1fa 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1621,6 +1621,7 @@ CONFIG_BMP085_I2C=m
CONFIG_BMP085_SPI=m
CONFIG_USB_SWITCH_FSA9480=m
CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
# CONFIG_C2PORT is not set
#
@@ -2374,6 +2375,7 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_BITBANG=y
# CONFIG_SPI_GPIO is not set
CONFIG_SPI_IMX=y
+# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_OMAP24XX=y
# CONFIG_SPI_PL022 is not set
@@ -3482,6 +3484,7 @@ CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
# CONFIG_LCD_LMS283GF05 is not set
# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
# CONFIG_LCD_ILI9320 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
@@ -4439,6 +4442,7 @@ CONFIG_COMMON_CLK=y
#
CONFIG_COMMON_CLK_DEBUG=y
CONFIG_COMMON_CLK_VERSATILE=y
+# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_CLK_TWL6040=y
CONFIG_HWSPINLOCK=y
@@ -4989,6 +4993,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
CONFIG_KPROBE_EVENT=y
CONFIG_PROBE_EVENTS=y
# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RBTREE_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -5243,6 +5248,7 @@ CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=y
diff --git a/patches/edma/0008-spi-omap2-mcspi-convert-to-dma_request_slave_channel.patch b/patches/edma/0008-spi-omap2-mcspi-convert-to-dma_request_slave_channel.patch
index b6fc2eedd3386991313e098e08923da062da6cd2..8456800ed25595a2d3438ca1438dba463b53b038 100644
--- a/patches/edma/0008-spi-omap2-mcspi-convert-to-dma_request_slave_channel.patch
+++ b/patches/edma/0008-spi-omap2-mcspi-convert-to-dma_request_slave_channel.patch
@@ -14,11 +14,11 @@ filter.
Signed-off-by: Matt Porter <mporter@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
- drivers/spi/spi-omap2-mcspi.c | 27 ++++++++++++++++++++-------
- 1 file changed, 20 insertions(+), 7 deletions(-)
+ drivers/spi/spi-omap2-mcspi.c | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
-index 893c3d7..38d0915 100644
+index 86d2158..28a6a7e 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -102,6 +102,9 @@ struct omap2_mcspi_dma {
@@ -31,21 +31,17 @@ index 893c3d7..38d0915 100644
};
/* use PIO for small transfers, avoiding DMA setup/teardown overhead and
-@@ -822,14 +825,23 @@ static int omap2_mcspi_request_dma(struct spi_device *spi)
+@@ -830,12 +833,18 @@ static int omap2_mcspi_request_dma(struct spi_device *spi)
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
sig = mcspi_dma->dma_rx_sync_dev;
- mcspi_dma->dma_rx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
-+
+ mcspi_dma->dma_rx =
+ dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
+ &sig, &master->dev,
+ mcspi_dma->dma_rx_ch_name);
-+
- if (!mcspi_dma->dma_rx) {
- dev_err(&spi->dev, "no RX DMA engine channel for McSPI\n");
- return -EAGAIN;
- }
+ if (!mcspi_dma->dma_rx)
+ goto no_dma;
sig = mcspi_dma->dma_tx_sync_dev;
- mcspi_dma->dma_tx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
@@ -53,11 +49,10 @@ index 893c3d7..38d0915 100644
+ dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
+ &sig, &master->dev,
+ mcspi_dma->dma_tx_ch_name);
-+
if (!mcspi_dma->dma_tx) {
- dev_err(&spi->dev, "no TX DMA engine channel for McSPI\n");
dma_release_channel(mcspi_dma->dma_rx);
-@@ -1240,12 +1252,13 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
+ mcspi_dma->dma_rx = NULL;
+@@ -1256,12 +1265,13 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
goto free_master;
for (i = 0; i < master->num_chipselect; i++) {
@@ -74,7 +69,7 @@ index 893c3d7..38d0915 100644
if (!dma_res) {
dev_dbg(&pdev->dev, "cannot get DMA RX channel\n");
status = -ENODEV;
-@@ -1253,9 +1266,9 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
+@@ -1269,9 +1279,9 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
}
mcspi->dma_channels[i].dma_rx_sync_dev = dma_res->start;
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index f5b73d6309595e15922179bd39607e4d0ab87d26..762e7d5428fbd7425b513b8280196363e247dcfa 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1012,6 +1012,7 @@ CONFIG_SENSORS_TSL2550=m
# CONFIG_BMP085_SPI is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
# CONFIG_C2PORT is not set
#
@@ -1511,6 +1512,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_ALTERA is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_OMAP24XX=y
# CONFIG_SPI_PL022 is not set
@@ -1977,6 +1979,7 @@ CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_LCD_L4F00242T03 is not set
# CONFIG_LCD_LMS283GF05 is not set
# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
# CONFIG_LCD_ILI9320 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
@@ -2491,6 +2494,7 @@ CONFIG_COMMON_CLK=y
#
# CONFIG_COMMON_CLK_DEBUG is not set
CONFIG_COMMON_CLK_VERSATILE=y
+# CONFIG_COMMON_CLK_SI5351 is not set
#
# Hardware Spinlock drivers
@@ -2822,6 +2826,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
CONFIG_KPROBE_EVENT=y
CONFIG_PROBE_EVENTS=y
# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RBTREE_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_DYNAMIC_DEBUG is not set
diff --git a/version.sh b/version.sh
index c00afef0729e99fd450643483caaaf706c113fb0..e19cf47aab84fa0039680a72b15fe4f595b80ea5 100644
--- a/version.sh
+++ b/version.sh
@@ -19,10 +19,10 @@ config="omap2plus_defconfig"
#Kernel/Build
KERNEL_REL=3.9
KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-d0.1
+BUILD=armv7-d0.2
#v3.X-rcX + upto SHA
-KERNEL_SHA="ec25e246b94a3233ab064994ef05a170bdba0e7c"
+KERNEL_SHA="56847d857cb0c3ee78c22ce776a26f88d9ffd4d4"
#git branch
#BRANCH="v3.10.x"