[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-42-ge2d9a61
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-42-ge2d9a61
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-09-22 17:28:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e2d9a61cff4c51b9ca01eb78568f8469355d6584 (commit)
via 4fe96b6fa49ff1a2e5c9b398fb89c7b8fa0d38d1 (commit)
via 632342ee272ab39db05fb49bfa394f51af3087c7 (commit)
via 5ee5c5bf6ec8b64aeaddb883f63a309d9418c41b (commit)
from b0632bf57d4774fbc6a7d642cb0fa6616d5fc96f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e2d9a61cff4c51b9ca01eb78568f8469355d6584
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Sep 22 19:27:32 2012 +0200
[LINUX][3.6] adapt patches 0410, 0411, 0413 from 3.5
commit 4fe96b6fa49ff1a2e5c9b398fb89c7b8fa0d38d1
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Sep 22 19:26:49 2012 +0200
[LINUX][3.6] import patches 0406, 0407, 0408, 0409, 0412, 0414, 0415, 0416, 0417 from 3.5
commit 632342ee272ab39db05fb49bfa394f51af3087c7
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Sep 22 19:24:41 2012 +0200
[LINUX][3.6] suppress useless patch 0405
commit 5ee5c5bf6ec8b64aeaddb883f63a309d9418c41b
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Sep 22 19:24:09 2012 +0200
[LINUX][3.6] 0404 source cleanup
-----------------------------------------------------------------------
Summary of changes:
...04-armadeus-mx28_Initialize_fec_phy_clock.patch | 30 +++----
...0405-armadeus-mx28_rename_gpmi_nand_clock.patch | 18 ----
...406-armadeus-mx28-add_SPI_support_kconfig.patch | 0
...P_register_definitions_into_separate_file.patch | 0
...x28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch | 0
...mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch | 0
...Pull_out_parts_shared_between_MMC_and_SPI.patch | 87 +++++++++-----------
..._out_the_SSP_clock_configuration_function.patch | 35 ++++----
...ix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch | 0
...pi_Pull_out_common_DMA_parts_from_MXS_MMC.patch | 54 ++++++------
...-mx28-spi_Add_DMA_support_into_SPI_driver.patch | 0
...spi_Add_SSP_SPI_device_tree_documentation.patch | 0
...ronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch | 0
.../0417-pengutronix-mx28-Add_SPI_ressources.patch | 0
14 files changed, 96 insertions(+), 128 deletions(-)
delete mode 100644 patches/linux/3.6/0405-armadeus-mx28_rename_gpmi_nand_clock.patch
copy patches/linux/{3.5 => 3.6}/0406-armadeus-mx28-add_SPI_support_kconfig.patch (100%)
copy patches/linux/{3.5 => 3.6}/0407-pengutronix-mx28-Move_SSP_register_definitions_into_separate_file.patch (100%)
copy patches/linux/{3.5 => 3.6}/0408-pengutronix-mx28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch (100%)
copy patches/linux/{3.5 => 3.6}/0409-pengutronix-mx28-mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch (100%)
copy patches/linux/{3.5 => 3.6}/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch (80%)
copy patches/linux/{3.5 => 3.6}/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch (84%)
copy patches/linux/{3.5 => 3.6}/0412-pengutronix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch (100%)
copy patches/linux/{3.5 => 3.6}/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch (83%)
copy patches/linux/{3.5 => 3.6}/0414-pengutronix-mx28-spi_Add_DMA_support_into_SPI_driver.patch (100%)
copy patches/linux/{3.5 => 3.6}/0415-pengutronix-mx28-spi_Add_SSP_SPI_device_tree_documentation.patch (100%)
copy patches/linux/{3.5 => 3.6}/0416-pengutronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch (100%)
copy patches/linux/{3.5 => 3.6}/0417-pengutronix-mx28-Add_SPI_ressources.patch (100%)
diff --git a/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch b/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch
index 3958f4e..735e99d 100644
--- a/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch
+++ b/patches/linux/3.6/0404-armadeus-mx28_Initialize_fec_phy_clock.patch
@@ -3,32 +3,28 @@ Fec phy clock needs to be enabled to have the interface working.
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.5/arch/arm/mach-mxs/mach-mxs.c
+Index: linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
===================================================================
---- linux-3.5.orig/arch/arm/mach-mxs/mach-mxs.c
-+++ linux-3.5/arch/arm/mach-mxs/mach-mxs.c
-@@ -81,11 +81,24 @@ static void __init imx28_evk_init(void)
- clk_prepare_enable(clk);
+--- linux-3.6-rc6.orig/arch/arm/mach-mxs/mach-mxs.c
++++ linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
+@@ -270,6 +270,11 @@ static void __init apx4devkit_init(void)
+ mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;
}
+static void __init apf28_init(void)
+{
-+ struct clk *clk;
-+
-+ /* Enable fec phy clock */
-+ clk = clk_get_sys("enet_out", NULL);
-+ if (!IS_ERR(clk))
-+ clk_prepare_enable(clk);
++ enable_clk_enet_out();
+}
+
static void __init mxs_machine_init(void)
{
if (of_machine_is_compatible("fsl,imx28-evk"))
- imx28_evk_init();
-
-+ if (of_machine_is_compatible("armadeus,imx28-apf28"))
+@@ -280,6 +285,8 @@ static void __init mxs_machine_init(void
+ m28evk_init();
+ else if (of_machine_is_compatible("bluegiga,apx4devkit"))
+ apx4devkit_init();
++ else if (of_machine_is_compatible("armadeus,imx28-apf28"))
+ apf28_init();
-+
+
of_platform_populate(NULL, of_default_bus_match_table,
- NULL, NULL);
- }
+ mxs_auxdata_lookup, NULL);
diff --git a/patches/linux/3.6/0405-armadeus-mx28_rename_gpmi_nand_clock.patch b/patches/linux/3.6/0405-armadeus-mx28_rename_gpmi_nand_clock.patch
deleted file mode 100644
index d3220aa..0000000
--- a/patches/linux/3.6/0405-armadeus-mx28_rename_gpmi_nand_clock.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Renames gpmi-nand clock dev_id according to the driver.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-
-Index: linux-3.5/drivers/clk/mxs/clk-imx28.c
-===================================================================
---- linux-3.5.orig/drivers/clk/mxs/clk-imx28.c
-+++ linux-3.5/drivers/clk/mxs/clk-imx28.c
-@@ -174,7 +174,7 @@ static struct clk_lookup lcdif_lookups[]
-
- static struct clk_lookup gpmi_lookups[] = {
- { .dev_id = "imx28-gpmi-nand", },
-- { .dev_id = "8000c000.gpmi", },
-+ { .dev_id = "8000c000.gpmi-nand", },
- };
-
- static struct clk_lookup fec_lookups[] = {
diff --git a/patches/linux/3.5/0406-armadeus-mx28-add_SPI_support_kconfig.patch b/patches/linux/3.6/0406-armadeus-mx28-add_SPI_support_kconfig.patch
similarity index 100%
copy from patches/linux/3.5/0406-armadeus-mx28-add_SPI_support_kconfig.patch
copy to patches/linux/3.6/0406-armadeus-mx28-add_SPI_support_kconfig.patch
diff --git a/patches/linux/3.5/0407-pengutronix-mx28-Move_SSP_register_definitions_into_separate_file.patch b/patches/linux/3.6/0407-pengutronix-mx28-Move_SSP_register_definitions_into_separate_file.patch
similarity index 100%
copy from patches/linux/3.5/0407-pengutronix-mx28-Move_SSP_register_definitions_into_separate_file.patch
copy to patches/linux/3.6/0407-pengutronix-mx28-Move_SSP_register_definitions_into_separate_file.patch
diff --git a/patches/linux/3.5/0408-pengutronix-mx28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch b/patches/linux/3.6/0408-pengutronix-mx28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch
similarity index 100%
copy from patches/linux/3.5/0408-pengutronix-mx28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch
copy to patches/linux/3.6/0408-pengutronix-mx28-mmc_spi_Rename_IMX2x_MMC_to_IMX2x_SSP.patch
diff --git a/patches/linux/3.5/0409-pengutronix-mx28-mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch b/patches/linux/3.6/0409-pengutronix-mx28-mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch
similarity index 100%
copy from patches/linux/3.5/0409-pengutronix-mx28-mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch
copy to patches/linux/3.6/0409-pengutronix-mx28-mmc_spi_Add_necessary_bits_into_mxs-spi-h.patch
diff --git a/patches/linux/3.5/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch b/patches/linux/3.6/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch
similarity index 80%
copy from patches/linux/3.5/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch
copy to patches/linux/3.6/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch
index 0ce2f71..6d0bf4e 100644
--- a/patches/linux/3.5/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch
+++ b/patches/linux/3.6/0410-pengutronix-mx28-mmc_spi_Pull_out_parts_shared_between_MMC_and_SPI.patch
@@ -16,10 +16,10 @@ CC: Shawn Guo <sha...@li...>
include/linux/spi/mxs-spi.h | 8 ++++
2 files changed, 67 insertions(+), 48 deletions(-)
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index e80c2b6..7b85e03 100644
---- a/drivers/mmc/host/mxs-mmc.c
-+++ b/drivers/mmc/host/mxs-mmc.c
+Index: linux-3.6-rc6/drivers/mmc/host/mxs-mmc.c
+===================================================================
+--- linux-3.6-rc6.orig/drivers/mmc/host/mxs-mmc.c
++++ linux-3.6-rc6/drivers/mmc/host/mxs-mmc.c
@@ -62,23 +62,20 @@
#define MXS_MMC_DETECT_TIMEOUT (HZ/2)
@@ -46,7 +46,7 @@ index e80c2b6..7b85e03 100644
unsigned char bus_width;
spinlock_t lock;
int sdio_irq_en;
-@@ -98,16 +95,18 @@ static int mxs_mmc_get_ro(struct mmc_host *mmc)
+@@ -105,16 +102,18 @@ static int mxs_mmc_get_ro(struct mmc_hos
static int mxs_mmc_get_cd(struct mmc_host *mmc)
{
struct mxs_mmc_host *host = mmc_priv(mmc);
@@ -67,7 +67,7 @@ index e80c2b6..7b85e03 100644
ctrl0 = BM_SSP_CTRL0_IGNORE_CRC;
ctrl1 = BF_SSP(0x3, CTRL1_SSP_MODE) |
-@@ -123,15 +122,15 @@ static void mxs_mmc_reset(struct mxs_mmc_host *host)
+@@ -130,15 +129,15 @@ static void mxs_mmc_reset(struct mxs_mmc
writel(BF_SSP(0xffff, TIMING_TIMEOUT) |
BF_SSP(2, TIMING_CLOCK_DIVIDE) |
BF_SSP(0, TIMING_CLOCK_RATE),
@@ -86,7 +86,7 @@ index e80c2b6..7b85e03 100644
}
static void mxs_mmc_start_cmd(struct mxs_mmc_host *host,
-@@ -142,15 +141,16 @@ static void mxs_mmc_request_done(struct mxs_mmc_host *host)
+@@ -149,15 +148,16 @@ static void mxs_mmc_request_done(struct
struct mmc_command *cmd = host->cmd;
struct mmc_data *data = host->data;
struct mmc_request *mrq = host->mrq;
@@ -108,7 +108,7 @@ index e80c2b6..7b85e03 100644
}
}
-@@ -189,13 +189,14 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
+@@ -196,13 +196,14 @@ static irqreturn_t mxs_mmc_irq_handler(i
struct mxs_mmc_host *host = dev_id;
struct mmc_command *cmd = host->cmd;
struct mmc_data *data = host->data;
@@ -123,9 +123,9 @@ index e80c2b6..7b85e03 100644
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
- if ((stat & BM_SSP_CTRL1_SDIO_IRQ) && (stat & BM_SSP_CTRL1_SDIO_IRQ_EN))
- mmc_signal_sdio_irq(host->mmc);
-@@ -359,6 +360,8 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
+ spin_unlock(&host->lock);
+
+@@ -366,6 +367,8 @@ static void mxs_mmc_adtc(struct mxs_mmc_
unsigned int data_size = 0, log2_blksz;
unsigned int blocks = data->blocks;
@@ -134,7 +134,7 @@ index e80c2b6..7b85e03 100644
u32 ignore_crc, get_resp, long_resp, read;
u32 ctrl0, cmd0, cmd1, val;
-@@ -401,15 +404,15 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
+@@ -408,15 +411,15 @@ static void mxs_mmc_adtc(struct mxs_mmc_
blocks = 1;
/* xfer count, block size and count need to be set differently */
@@ -153,7 +153,7 @@ index e80c2b6..7b85e03 100644
}
if ((cmd->opcode == MMC_STOP_TRANSMISSION) ||
-@@ -424,11 +427,11 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
+@@ -431,11 +434,11 @@ static void mxs_mmc_adtc(struct mxs_mmc_
}
/* set the timeout count */
@@ -168,7 +168,7 @@ index e80c2b6..7b85e03 100644
/* pio */
host->ssp_pio_words[0] = ctrl0;
-@@ -493,11 +496,12 @@ static void mxs_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
+@@ -500,11 +503,12 @@ static void mxs_mmc_request(struct mmc_h
static void mxs_mmc_set_clk_rate(struct mxs_mmc_host *host, unsigned int rate)
{
@@ -182,7 +182,7 @@ index e80c2b6..7b85e03 100644
for (clock_divide = 2; clock_divide <= 254; clock_divide += 2) {
clock_rate = DIV_ROUND_UP(ssp_clk, rate * clock_divide);
-@@ -514,13 +518,13 @@ static void mxs_mmc_set_clk_rate(struct mxs_mmc_host *host, unsigned int rate)
+@@ -521,13 +525,13 @@ static void mxs_mmc_set_clk_rate(struct
ssp_sck = ssp_clk / clock_divide / (1 + clock_rate);
@@ -199,7 +199,7 @@ index e80c2b6..7b85e03 100644
dev_dbg(mmc_dev(host->mmc),
"%s: clock_divide %d, clock_rate %d, ssp_clk %d, rate_actual %d, rate_requested %d\n",
-@@ -545,6 +549,7 @@ static void mxs_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+@@ -552,6 +556,7 @@ static void mxs_mmc_set_ios(struct mmc_h
static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
{
struct mxs_mmc_host *host = mmc_priv(mmc);
@@ -207,7 +207,7 @@ index e80c2b6..7b85e03 100644
unsigned long flags;
spin_lock_irqsave(&host->lock, flags);
-@@ -553,19 +558,19 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
+@@ -560,19 +565,19 @@ static void mxs_mmc_enable_sdio_irq(stru
if (enable) {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
@@ -216,12 +216,6 @@ index e80c2b6..7b85e03 100644
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
-
-- if (readl(host->base + HW_SSP_STATUS(host)) &
-+ if (readl(ssp->base + HW_SSP_STATUS(ssp)) &
- BM_SSP_STATUS_SDIO_IRQ)
- mmc_signal_sdio_irq(host->mmc);
-
} else {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
- host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
@@ -232,15 +226,21 @@ index e80c2b6..7b85e03 100644
}
spin_unlock_irqrestore(&host->lock, flags);
-@@ -626,6 +631,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+
+- if (enable && readl(host->base + HW_SSP_STATUS(host)) &
++ if (enable && readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ BM_SSP_STATUS_SDIO_IRQ)
+ mmc_signal_sdio_irq(host->mmc);
+
+@@ -633,6 +638,7 @@ static int mxs_mmc_probe(struct platform
struct pinctrl *pinctrl;
int ret = 0, irq_err, irq_dma;
dma_cap_mask_t mask;
+ struct mxs_ssp *ssp;
+ struct regulator *reg_vmmc;
+ enum of_gpio_flags flags;
- iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-@@ -639,14 +645,16 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -648,14 +654,16 @@ static int mxs_mmc_probe(struct platform
return -ENOMEM;
host = mmc_priv(mmc);
@@ -260,7 +260,7 @@ index e80c2b6..7b85e03 100644
/*
* TODO: This is a temporary solution and should be changed
* to use generic DMA binding later when the helpers get in.
-@@ -659,7 +667,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -668,7 +676,7 @@ static int mxs_mmc_probe(struct platform
goto out_mmc_free;
}
} else {
@@ -269,7 +269,7 @@ index e80c2b6..7b85e03 100644
host->dma_channel = dmares->start;
}
-@@ -672,12 +680,12 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -691,12 +699,12 @@ static int mxs_mmc_probe(struct platform
goto out_mmc_free;
}
@@ -286,7 +286,7 @@ index e80c2b6..7b85e03 100644
mxs_mmc_reset(host);
-@@ -719,8 +727,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -741,8 +749,8 @@ static int mxs_mmc_probe(struct platform
mmc->max_segs = 52;
mmc->max_blk_size = 1 << 0xf;
@@ -297,7 +297,7 @@ index e80c2b6..7b85e03 100644
mmc->max_seg_size = dma_get_max_seg_size(host->dmach->device->dev);
platform_set_drvdata(pdev, mmc);
-@@ -744,8 +752,8 @@ out_free_dma:
+@@ -766,8 +774,8 @@ out_free_dma:
if (host->dmach)
dma_release_channel(host->dmach);
out_clk_put:
@@ -308,7 +308,7 @@ index e80c2b6..7b85e03 100644
out_mmc_free:
mmc_free_host(mmc);
return ret;
-@@ -755,6 +763,7 @@ static int mxs_mmc_remove(struct platform_device *pdev)
+@@ -777,6 +785,7 @@ static int mxs_mmc_remove(struct platfor
{
struct mmc_host *mmc = platform_get_drvdata(pdev);
struct mxs_mmc_host *host = mmc_priv(mmc);
@@ -316,7 +316,7 @@ index e80c2b6..7b85e03 100644
mmc_remove_host(mmc);
-@@ -763,8 +772,8 @@ static int mxs_mmc_remove(struct platform_device *pdev)
+@@ -785,8 +794,8 @@ static int mxs_mmc_remove(struct platfor
if (host->dmach)
dma_release_channel(host->dmach);
@@ -327,7 +327,7 @@ index e80c2b6..7b85e03 100644
mmc_free_host(mmc);
-@@ -776,11 +785,12 @@ static int mxs_mmc_suspend(struct device *dev)
+@@ -798,11 +807,12 @@ static int mxs_mmc_suspend(struct device
{
struct mmc_host *mmc = dev_get_drvdata(dev);
struct mxs_mmc_host *host = mmc_priv(mmc);
@@ -341,7 +341,7 @@ index e80c2b6..7b85e03 100644
return ret;
}
-@@ -789,9 +799,10 @@ static int mxs_mmc_resume(struct device *dev)
+@@ -811,9 +821,10 @@ static int mxs_mmc_resume(struct device
{
struct mmc_host *mmc = dev_get_drvdata(dev);
struct mxs_mmc_host *host = mmc_priv(mmc);
@@ -353,10 +353,10 @@ index e80c2b6..7b85e03 100644
ret = mmc_resume_host(mmc);
-diff --git a/include/linux/spi/mxs-spi.h b/include/linux/spi/mxs-spi.h
-index 7dfa1d7..475f69f 100644
---- a/include/linux/spi/mxs-spi.h
-+++ b/include/linux/spi/mxs-spi.h
+Index: linux-3.6-rc6/include/linux/spi/mxs-spi.h
+===================================================================
+--- linux-3.6-rc6.orig/include/linux/spi/mxs-spi.h
++++ linux-3.6-rc6/include/linux/spi/mxs-spi.h
@@ -128,4 +128,12 @@ enum mxs_ssp_id {
IMX28_SSP,
};
@@ -370,12 +370,3 @@ index 7dfa1d7..475f69f 100644
+};
+
#endif /* __LINUX_SPI_MXS_SPI_H__ */
---
-1.7.10.4
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-lin...@li...
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
-
diff --git a/patches/linux/3.5/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch b/patches/linux/3.6/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch
similarity index 84%
copy from patches/linux/3.5/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch
copy to patches/linux/3.6/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch
index f167901..7b21984 100644
--- a/patches/linux/3.5/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch
+++ b/patches/linux/3.6/0411-pengutronix-mx28-mmc_spi_Pull_out_the_SSP_clock_configuration_function.patch
@@ -19,10 +19,10 @@ CC: Shawn Guo <sha...@li...>
4 files changed, 66 insertions(+), 39 deletions(-)
create mode 100644 drivers/clk/mxs/clk-ssp.c
-diff --git a/drivers/clk/mxs/Makefile b/drivers/clk/mxs/Makefile
-index 7bedeec..a6a2223 100644
---- a/drivers/clk/mxs/Makefile
-+++ b/drivers/clk/mxs/Makefile
+Index: linux-3.6-rc6/drivers/clk/mxs/Makefile
+===================================================================
+--- linux-3.6-rc6.orig/drivers/clk/mxs/Makefile
++++ linux-3.6-rc6/drivers/clk/mxs/Makefile
@@ -2,7 +2,7 @@
# Makefile for mxs specific clk
#
@@ -32,11 +32,10 @@ index 7bedeec..a6a2223 100644
obj-$(CONFIG_SOC_IMX23) += clk-imx23.o
obj-$(CONFIG_SOC_IMX28) += clk-imx28.o
-diff --git a/drivers/clk/mxs/clk-ssp.c b/drivers/clk/mxs/clk-ssp.c
-new file mode 100644
-index 0000000..af7bdbf
+Index: linux-3.6-rc6/drivers/clk/mxs/clk-ssp.c
+===================================================================
--- /dev/null
-+++ b/drivers/clk/mxs/clk-ssp.c
++++ linux-3.6-rc6/drivers/clk/mxs/clk-ssp.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2012 DENX Software Engineering, GmbH
@@ -100,11 +99,11 @@ index 0000000..af7bdbf
+ __func__, clock_divide, clock_rate, ssp_clk, ssp_sck, rate);
+}
+EXPORT_SYMBOL_GPL(mxs_ssp_set_clk_rate);
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index 7b85e03..0813340 100644
---- a/drivers/mmc/host/mxs-mmc.c
-+++ b/drivers/mmc/host/mxs-mmc.c
-@@ -501,43 +501,6 @@ static void mxs_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
+Index: linux-3.6-rc6/drivers/mmc/host/mxs-mmc.c
+===================================================================
+--- linux-3.6-rc6.orig/drivers/mmc/host/mxs-mmc.c
++++ linux-3.6-rc6/drivers/mmc/host/mxs-mmc.c
+@@ -501,43 +501,6 @@ static void mxs_mmc_request(struct mmc_h
mxs_mmc_start_cmd(host, mrq->cmd);
}
@@ -148,7 +147,7 @@ index 7b85e03..0813340 100644
static void mxs_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{
struct mxs_mmc_host *host = mmc_priv(mmc);
-@@ -550,7 +513,7 @@ static void mxs_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+@@ -550,7 +513,7 @@ static void mxs_mmc_set_ios(struct mmc_h
host->bus_width = 0;
if (ios->clock)
@@ -157,10 +156,10 @@ index 7b85e03..0813340 100644
}
static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
-diff --git a/include/linux/spi/mxs-spi.h b/include/linux/spi/mxs-spi.h
-index 475f69f..d07f8dc 100644
---- a/include/linux/spi/mxs-spi.h
-+++ b/include/linux/spi/mxs-spi.h
+Index: linux-3.6-rc6/include/linux/spi/mxs-spi.h
+===================================================================
+--- linux-3.6-rc6.orig/include/linux/spi/mxs-spi.h
++++ linux-3.6-rc6/include/linux/spi/mxs-spi.h
@@ -136,4 +136,6 @@ struct mxs_ssp {
enum mxs_ssp_id devid;
};
diff --git a/patches/linux/3.5/0412-pengutronix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch b/patches/linux/3.6/0412-pengutronix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch
similarity index 100%
copy from patches/linux/3.5/0412-pengutronix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch
copy to patches/linux/3.6/0412-pengutronix-mx28-spi_Add_SPI_driver_for_mx233_mx28.patch
diff --git a/patches/linux/3.5/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch b/patches/linux/3.6/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch
similarity index 83%
copy from patches/linux/3.5/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch
copy to patches/linux/3.6/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch
index a8add37..2995e90 100644
--- a/patches/linux/3.5/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch
+++ b/patches/linux/3.6/0413-pengutronix-mx28-mmc_spi_Pull_out_common_DMA_parts_from_MXS_MMC.patch
@@ -16,10 +16,10 @@ CC: Shawn Guo <sha...@li...>
include/linux/spi/mxs-spi.h | 9 +++++
3 files changed, 51 insertions(+), 47 deletions(-)
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index 0813340..4da9966 100644
---- a/drivers/mmc/host/mxs-mmc.c
-+++ b/drivers/mmc/host/mxs-mmc.c
+Index: linux-3.6-rc6/drivers/mmc/host/mxs-mmc.c
+===================================================================
+--- linux-3.6-rc6.orig/drivers/mmc/host/mxs-mmc.c
++++ linux-3.6-rc6/drivers/mmc/host/mxs-mmc.c
@@ -41,7 +41,6 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
@@ -42,7 +42,7 @@ index 0813340..4da9966 100644
unsigned char bus_width;
spinlock_t lock;
int sdio_irq_en;
-@@ -163,7 +155,7 @@ static void mxs_mmc_request_done(struct mxs_mmc_host *host)
+@@ -163,7 +155,7 @@ static void mxs_mmc_request_done(struct
if (data) {
dma_unmap_sg(mmc_dev(host->mmc), data->sg,
@@ -51,7 +51,7 @@ index 0813340..4da9966 100644
/*
* If there was an error on any block, we mark all
* data blocks as being in error.
-@@ -232,6 +224,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
+@@ -232,6 +224,7 @@ static irqreturn_t mxs_mmc_irq_handler(i
static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
struct mxs_mmc_host *host, unsigned long flags)
{
@@ -59,7 +59,7 @@ index 0813340..4da9966 100644
struct dma_async_tx_descriptor *desc;
struct mmc_data *data = host->data;
struct scatterlist * sgl;
-@@ -240,24 +233,24 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
+@@ -240,24 +233,24 @@ static struct dma_async_tx_descriptor *m
if (data) {
/* data */
dma_map_sg(mmc_dev(host->mmc), data->sg,
@@ -89,7 +89,7 @@ index 0813340..4da9966 100644
}
return desc;
-@@ -265,6 +258,7 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
+@@ -265,6 +258,7 @@ static struct dma_async_tx_descriptor *m
static void mxs_mmc_bc(struct mxs_mmc_host *host)
{
@@ -97,7 +97,7 @@ index 0813340..4da9966 100644
struct mmc_command *cmd = host->cmd;
struct dma_async_tx_descriptor *desc;
u32 ctrl0, cmd0, cmd1;
-@@ -278,17 +272,17 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)
+@@ -278,17 +272,17 @@ static void mxs_mmc_bc(struct mxs_mmc_ho
cmd0 |= BM_SSP_CMD0_CONT_CLKING_EN | BM_SSP_CMD0_SLOW_CLKING_EN;
}
@@ -129,7 +129,7 @@ index 0813340..4da9966 100644
struct mmc_command *cmd = host->cmd;
struct dma_async_tx_descriptor *desc;
u32 ignore_crc, get_resp, long_resp;
-@@ -319,17 +314,17 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)
+@@ -319,17 +314,17 @@ static void mxs_mmc_ac(struct mxs_mmc_ho
cmd0 |= BM_SSP_CMD0_CONT_CLKING_EN | BM_SSP_CMD0_SLOW_CLKING_EN;
}
@@ -153,7 +153,7 @@ index 0813340..4da9966 100644
return;
out:
-@@ -441,11 +436,11 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
+@@ -441,11 +436,11 @@ static void mxs_mmc_adtc(struct mxs_mmc_
writel(val, ssp->base + HW_SSP_TIMING(ssp));
/* pio */
@@ -170,7 +170,7 @@ index 0813340..4da9966 100644
desc = mxs_mmc_prep_dma(host, 0);
if (!desc)
goto out;
-@@ -453,14 +448,14 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
+@@ -453,14 +448,14 @@ static void mxs_mmc_adtc(struct mxs_mmc_
/* append data sg */
WARN_ON(host->data != NULL);
host->data = data;
@@ -188,7 +188,7 @@ index 0813340..4da9966 100644
return;
out:
dev_warn(mmc_dev(host->mmc),
-@@ -557,14 +552,15 @@ static const struct mmc_host_ops mxs_mmc_ops = {
+@@ -557,14 +552,15 @@ static const struct mmc_host_ops mxs_mmc
static bool mxs_mmc_dma_filter(struct dma_chan *chan, void *param)
{
struct mxs_mmc_host *host = param;
@@ -206,7 +206,7 @@ index 0813340..4da9966 100644
return true;
}
-@@ -632,7 +628,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -632,7 +628,7 @@ static int mxs_mmc_probe(struct platform
* to use generic DMA binding later when the helpers get in.
*/
ret = of_property_read_u32(np, "fsl,ssp-dma-channel",
@@ -215,7 +215,7 @@ index 0813340..4da9966 100644
if (ret) {
dev_err(mmc_dev(host->mmc),
"failed to get dma channel\n");
-@@ -640,7 +636,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -640,7 +636,7 @@ static int mxs_mmc_probe(struct platform
}
} else {
ssp->devid = pdev->id_entry->driver_data;
@@ -224,7 +224,7 @@ index 0813340..4da9966 100644
}
host->mmc = mmc;
-@@ -673,9 +669,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -673,9 +669,9 @@ static int mxs_mmc_probe(struct platform
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
@@ -237,7 +237,7 @@ index 0813340..4da9966 100644
dev_err(mmc_dev(host->mmc),
"%s: failed to request dma\n", __func__);
goto out_clk_put;
-@@ -714,7 +710,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -714,7 +710,7 @@ static int mxs_mmc_probe(struct platform
mmc->max_blk_size = 1 << 0xf;
mmc->max_blk_count = (ssp_is_old(ssp)) ? 0xff : 0xffffff;
mmc->max_req_size = (ssp_is_old(ssp)) ? 0xffff : 0xffffffff;
@@ -246,7 +246,7 @@ index 0813340..4da9966 100644
platform_set_drvdata(pdev, mmc);
-@@ -734,8 +730,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -734,8 +730,8 @@ static int mxs_mmc_probe(struct platform
return 0;
out_free_dma:
@@ -257,7 +257,7 @@ index 0813340..4da9966 100644
out_clk_put:
clk_disable_unprepare(ssp->clk);
clk_put(ssp->clk);
-@@ -754,8 +750,8 @@ static int mxs_mmc_remove(struct platform_device *pdev)
+@@ -754,8 +750,8 @@ static int mxs_mmc_remove(struct platfor
platform_set_drvdata(pdev, NULL);
@@ -268,10 +268,10 @@ index 0813340..4da9966 100644
clk_disable_unprepare(ssp->clk);
clk_put(ssp->clk);
-diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
-index 7bf826f..0f28afb 100644
---- a/drivers/spi/spi-mxs.c
-+++ b/drivers/spi/spi-mxs.c
+Index: linux-3.6-rc6/drivers/spi/spi-mxs.c
+===================================================================
+--- linux-3.6-rc6.orig/drivers/spi/spi-mxs.c
++++ linux-3.6-rc6/drivers/spi/spi-mxs.c
@@ -46,7 +46,6 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
@@ -280,10 +280,10 @@ index 7bf826f..0f28afb 100644
#include <linux/pinctrl/consumer.h>
#include <linux/stmp_device.h>
#include <linux/spi/spi.h>
-diff --git a/include/linux/spi/mxs-spi.h b/include/linux/spi/mxs-spi.h
-index d07f8dc..61ae130 100644
---- a/include/linux/spi/mxs-spi.h
-+++ b/include/linux/spi/mxs-spi.h
+Index: linux-3.6-rc6/include/linux/spi/mxs-spi.h
+===================================================================
+--- linux-3.6-rc6.orig/include/linux/spi/mxs-spi.h
++++ linux-3.6-rc6/include/linux/spi/mxs-spi.h
@@ -24,6 +24,8 @@
#ifndef __LINUX_SPI_MXS_SPI_H__
#define __LINUX_SPI_MXS_SPI_H__
diff --git a/patches/linux/3.5/0414-pengutronix-mx28-spi_Add_DMA_support_into_SPI_driver.patch b/patches/linux/3.6/0414-pengutronix-mx28-spi_Add_DMA_support_into_SPI_driver.patch
similarity index 100%
copy from patches/linux/3.5/0414-pengutronix-mx28-spi_Add_DMA_support_into_SPI_driver.patch
copy to patches/linux/3.6/0414-pengutronix-mx28-spi_Add_DMA_support_into_SPI_driver.patch
diff --git a/patches/linux/3.5/0415-pengutronix-mx28-spi_Add_SSP_SPI_device_tree_documentation.patch b/patches/linux/3.6/0415-pengutronix-mx28-spi_Add_SSP_SPI_device_tree_documentation.patch
similarity index 100%
copy from patches/linux/3.5/0415-pengutronix-mx28-spi_Add_SSP_SPI_device_tree_documentation.patch
copy to patches/linux/3.6/0415-pengutronix-mx28-spi_Add_SSP_SPI_device_tree_documentation.patch
diff --git a/patches/linux/3.5/0416-pengutronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch b/patches/linux/3.6/0416-pengutronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch
similarity index 100%
copy from patches/linux/3.5/0416-pengutronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch
copy to patches/linux/3.6/0416-pengutronix-mx28_Add_SPI_pinmux_into_imx28_dtsi.patch
diff --git a/patches/linux/3.5/0417-pengutronix-mx28-Add_SPI_ressources.patch b/patches/linux/3.6/0417-pengutronix-mx28-Add_SPI_ressources.patch
similarity index 100%
copy from patches/linux/3.5/0417-pengutronix-mx28-Add_SPI_ressources.patch
copy to patches/linux/3.6/0417-pengutronix-mx28-Add_SPI_ressources.patch
hooks/post-receive
--
armadeus
|
