[omap]: refresh/rename patches

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38932 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/omap/patches-3.12/0334-video-da8xx-fb-adding-dt-support.patch b/target/linux/omap/patches-3.12/0334-video-da8xx-fb-adding-dt-support.patch
index 5afe086..d54f4d2 100644 (file)
--- a/target/linux/omap/patches-3.12/0334-video-da8xx-fb-adding-dt-support.patch
+++ b/target/linux/omap/patches-3.12/0334-video-da8xx-fb-adding-dt-support.patch
@@ -33,9 +33,6 @@ Signed-off-by: Darren Etheridge <detheridge@ti.com>
  2 files changed, 105 insertions(+), 3 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/video/da8xx-fb.txt
 
  2 files changed, 105 insertions(+), 3 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/video/da8xx-fb.txt
 

-diff --git a/Documentation/devicetree/bindings/video/da8xx-fb.txt b/Documentation/devicetree/bindings/video/da8xx-fb.txt
-new file mode 100644
-index 0000000..d86afe7

 --- /dev/null
 +++ b/Documentation/devicetree/bindings/video/da8xx-fb.txt
 @@ -0,0 +1,42 @@
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/video/da8xx-fb.txt
 @@ -0,0 +1,42 @@


@@ -81,8 +78,6 @@ index 0000000..d86afe7
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
-index e030e17..74cc2dc 100644

 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c
 @@ -36,6 +36,7 @@
 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c
 @@ -36,6 +36,7 @@


@@ -148,7 +143,7 @@ index e030e17..74cc2dc 100644
        for (i = 0, lcdc_info = known_lcd_panels;
                i < ARRAY_SIZE(known_lcd_panels); i++, lcdc_info++) {
                if (strcmp(fb_pdata->type, lcdc_info->name) == 0)
        for (i = 0, lcdc_info = known_lcd_panels;
                i < ARRAY_SIZE(known_lcd_panels); i++, lcdc_info++) {
                if (strcmp(fb_pdata->type, lcdc_info->name) == 0)

-@@ -1346,7 +1389,7 @@ static int fb_probe(struct platform_device *device)
+@@ -1346,7 +1389,7 @@ static int fb_probe(struct platform_devi

        int ret;
        unsigned long ulcm;
  
        int ret;
        unsigned long ulcm;
  


@@ -157,7 +152,7 @@ index e030e17..74cc2dc 100644
                dev_err(&device->dev, "Can not get platform data\n");
                return -ENOENT;
        }
                dev_err(&device->dev, "Can not get platform data\n");
                return -ENOENT;
        }

-@@ -1386,7 +1429,10 @@ static int fb_probe(struct platform_device *device)
+@@ -1386,7 +1429,10 @@ static int fb_probe(struct platform_devi

                break;
        }
  
                break;
        }
  


@@ -169,7 +164,7 @@ index e030e17..74cc2dc 100644
  
        if (!lcd_cfg) {
                ret = -EINVAL;
  
        if (!lcd_cfg) {
                ret = -EINVAL;

-@@ -1405,7 +1451,7 @@ static int fb_probe(struct platform_device *device)
+@@ -1405,7 +1451,7 @@ static int fb_probe(struct platform_devi

        par->dev = &device->dev;
        par->lcdc_clk = tmp_lcdc_clk;
        par->lcdc_clk_rate = clk_get_rate(par->lcdc_clk);
        par->dev = &device->dev;
        par->lcdc_clk = tmp_lcdc_clk;
        par->lcdc_clk_rate = clk_get_rate(par->lcdc_clk);


@@ -178,7 +173,7 @@ index e030e17..74cc2dc 100644
                par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
                par->panel_power_ctrl(1);
        }
                par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
                par->panel_power_ctrl(1);
        }

-@@ -1653,6 +1699,19 @@ static int fb_resume(struct platform_device *dev)
+@@ -1653,6 +1699,19 @@ static int fb_resume(struct platform_dev

  #define fb_resume NULL
  #endif
  
  #define fb_resume NULL
  #endif
  


@@ -198,7 +193,7 @@ index e030e17..74cc2dc 100644
  static struct platform_driver da8xx_fb_driver = {
        .probe = fb_probe,
        .remove = fb_remove,
  static struct platform_driver da8xx_fb_driver = {
        .probe = fb_probe,
        .remove = fb_remove,

-@@ -1661,6 +1720,7 @@ static struct platform_driver da8xx_fb_driver = {
+@@ -1661,6 +1720,7 @@ static struct platform_driver da8xx_fb_d

        .driver = {
                   .name = DRIVER_NAME,
                   .owner = THIS_MODULE,
        .driver = {
                   .name = DRIVER_NAME,
                   .owner = THIS_MODULE,


@@ -206,6 +201,3 @@ index e030e17..74cc2dc 100644
                   },
  };
  
                   },
  };
  

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/0343-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch b/target/linux/omap/patches-3.12/0343-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
index ee7e6ea..1d3e0f5 100644 (file)
--- a/target/linux/omap/patches-3.12/0343-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
+++ b/target/linux/omap/patches-3.12/0343-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
@@ -14,11 +14,9 @@ Signed-off-by: Prathap M S <msprathap@ti.com>
  include/video/da8xx-fb.h |    4 ++++
  2 files changed, 37 insertions(+)
 
  include/video/da8xx-fb.h |    4 ++++
  2 files changed, 37 insertions(+)
 

-diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
-index c534d45..77dc477 100644

 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c
 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c

-@@ -235,6 +235,9 @@ static struct fb_fix_screeninfo da8xx_fb_fix = {
+@@ -198,6 +198,9 @@ static struct fb_fix_screeninfo da8xx_fb

        .accel = FB_ACCEL_NONE
  };
  
        .accel = FB_ACCEL_NONE
  };
  


@@ -28,7 +26,7 @@ index c534d45..77dc477 100644
  static struct fb_videomode known_lcd_panels[] = {
        /* Sharp LCD035Q3DG01 */
        [0] = {
  static struct fb_videomode known_lcd_panels[] = {
        /* Sharp LCD035Q3DG01 */
        [0] = {

-@@ -916,6 +919,32 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
+@@ -826,6 +829,32 @@ static int lcd_init(struct da8xx_fb_par

        return 0;
  }
  
        return 0;
  }
  


@@ -61,7 +59,7 @@ index c534d45..77dc477 100644
  /* IRQ handler for version 2 of LCDC */
  static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
  {
  /* IRQ handler for version 2 of LCDC */
  static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
  {

-@@ -953,6 +982,8 @@ static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
+@@ -863,6 +892,8 @@ static irqreturn_t lcdc_irq_handler_rev0

                                   LCD_DMA_FRM_BUF_CEILING_ADDR_0_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);
                                   LCD_DMA_FRM_BUF_CEILING_ADDR_0_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);


@@ -70,7 +68,7 @@ index c534d45..77dc477 100644
                }
  
                if (stat & LCD_END_OF_FRAME1) {
                }
  
                if (stat & LCD_END_OF_FRAME1) {

-@@ -1028,6 +1059,8 @@ static irqreturn_t lcdc_irq_handler_rev01(int irq, void *arg)
+@@ -938,6 +969,8 @@ static irqreturn_t lcdc_irq_handler_rev0

                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);
                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);


@@ -79,13 +77,11 @@ index c534d45..77dc477 100644
                }
        }
  
                }
        }
  

-diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
-index 74c986a..2a0c739 100644

 --- a/include/video/da8xx-fb.h
 +++ b/include/video/da8xx-fb.h
 --- a/include/video/da8xx-fb.h
 +++ b/include/video/da8xx-fb.h

-@@ -106,5 +106,9 @@ void da8xx_register_encoder(struct da8xx_encoder *encoder);
- void da8xx_unregister_encoder(struct da8xx_encoder *encoder);
- 
+@@ -91,5 +91,9 @@ struct lcd_sync_arg {
+ /* Proprietary FB_SYNC_ flags */
+ #define FB_SYNC_CLK_INVERT 0x40000000

  
 +typedef void (*vsync_callback_t)(void *arg);
 +int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);
  
 +typedef void (*vsync_callback_t)(void *arg);
 +int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);


@@ -93,6 +89,3 @@ index 74c986a..2a0c739 100644
 +
  #endif  /* ifndef DA8XX_FB_H */
  
 +
  #endif  /* ifndef DA8XX_FB_H */
  

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/0752-video-da8xx-fb-fix-defect-with-vsync-callback-invoca.patch b/target/linux/omap/patches-3.12/0752-video-da8xx-fb-fix-defect-with-vsync-callback-invoca.patch
index 698ed39..d22c7e0 100644 (file)
--- a/target/linux/omap/patches-3.12/0752-video-da8xx-fb-fix-defect-with-vsync-callback-invoca.patch
+++ b/target/linux/omap/patches-3.12/0752-video-da8xx-fb-fix-defect-with-vsync-callback-invoca.patch
@@ -16,11 +16,9 @@ Signed-off-by: Darren Etheridge <detheridge@ti.com>
  drivers/video/da8xx-fb.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
  drivers/video/da8xx-fb.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 

-diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
-index 212d2ac..d6825e4 100644

 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c
 --- a/drivers/video/da8xx-fb.c
 +++ b/drivers/video/da8xx-fb.c

-@@ -993,6 +993,8 @@ static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
+@@ -904,6 +904,8 @@ static irqreturn_t lcdc_irq_handler_rev0

                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);
                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);


@@ -29,7 +27,7 @@ index 212d2ac..d6825e4 100644
                }
  
                /* Set only when controller is disabled and at the end of
                }
  
                /* Set only when controller is disabled and at the end of

-@@ -1058,8 +1060,6 @@ static irqreturn_t lcdc_irq_handler_rev01(int irq, void *arg)
+@@ -969,8 +971,6 @@ static irqreturn_t lcdc_irq_handler_rev0

                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);
                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
                        par->vsync_flag = 1;
                        wake_up_interruptible(&par->vsync_wait);


@@ -38,6 +36,3 @@ index 212d2ac..d6825e4 100644
                }
        }
  
                }
        }
  

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch b/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch
index f474eb8..2f2bd31 100644 (file)
--- a/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch
+++ b/target/linux/omap/patches-3.12/100-ARM-dts-add-AM33XX-EDMA-support.patch
@@ -13,8 +13,6 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
 arch/arm/boot/dts/am33xx.dtsi | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 arch/arm/boot/dts/am33xx.dtsi | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index f9c5da9..19a1c1d 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 @@ -100,6 +100,18 @@
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 @@ -100,6 +100,18 @@

diff --git a/target/linux/omap/patches-3.12/101-ARM-dts-add-AM33XX-SPI-DMA-support.patch b/target/linux/omap/patches-3.12/101-ARM-dts-add-AM33XX-SPI-DMA-support.patch
index afce86e..693cf5d 100644 (file)
--- a/target/linux/omap/patches-3.12/101-ARM-dts-add-AM33XX-SPI-DMA-support.patch
+++ b/target/linux/omap/patches-3.12/101-ARM-dts-add-AM33XX-SPI-DMA-support.patch
@@ -7,8 +7,6 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
 arch/arm/boot/dts/am33xx.dtsi | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 arch/arm/boot/dts/am33xx.dtsi | 10 ++++++++++
  1 file changed, 10 insertions(+)
 

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 19a1c1d..9ce85e5 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 @@ -335,6 +335,11 @@
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 @@ -335,6 +335,11 @@

diff --git a/target/linux/omap/patches-3.12/103-ARM-dts-add-AM33XX-MMC-support-and-documentation.patch b/target/linux/omap/patches-3.12/103-ARM-dts-add-AM33XX-MMC-support-and-documentation.patch
index b4585b1..e0a85b2 100644 (file)
--- a/target/linux/omap/patches-3.12/103-ARM-dts-add-AM33XX-MMC-support-and-documentation.patch
+++ b/target/linux/omap/patches-3.12/103-ARM-dts-add-AM33XX-MMC-support-and-documentation.patch
@@ -19,11 +19,9 @@ Signed-off-by: Joel Fernandes <joelf@ti.com>
  arch/arm/boot/dts/am33xx.dtsi                      | 38 ++++++++++++++++++++++
  5 files changed, 88 insertions(+), 1 deletion(-)
 
  arch/arm/boot/dts/am33xx.dtsi                      | 38 ++++++++++++++++++++++
  5 files changed, 88 insertions(+), 1 deletion(-)
 

-diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
-index ed271fc..8c8908a 100644

 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
 +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
 +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

-@@ -20,8 +20,29 @@ ti,dual-volt: boolean, supports dual voltage cards
+@@ -20,8 +20,29 @@ ti,dual-volt: boolean, supports dual vol

  ti,non-removable: non-removable slot (like eMMC)
  ti,needs-special-reset: Requires a special softreset sequence
  ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
  ti,non-removable: non-removable slot (like eMMC)
  ti,needs-special-reset: Requires a special softreset sequence
  ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed


@@ -62,8 +60,6 @@ index ed271fc..8c8908a 100644
 +                      &edma 25>;
 +              dma-names = "tx", "rx";
        };
 +                      &edma 25>;
 +              dma-names = "tx", "rx";
        };

-diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
-index 7993c48..d5f43fe 100644

 --- a/arch/arm/boot/dts/am335x-bone.dts
 +++ b/arch/arm/boot/dts/am335x-bone.dts
 @@ -9,3 +9,14 @@
 --- a/arch/arm/boot/dts/am335x-bone.dts
 +++ b/arch/arm/boot/dts/am335x-bone.dts
 @@ -9,3 +9,14 @@


@@ -81,8 +77,6 @@ index 7993c48..d5f43fe 100644
 +      status = "okay";
 +      vmmc-supply = <&ldo3_reg>;
 +};
 +      status = "okay";
 +      vmmc-supply = <&ldo3_reg>;
 +};

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index e8ec875..bc4a69d 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -477,6 +477,8 @@
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -477,6 +477,8 @@


@@ -103,8 +97,6 @@ index e8ec875..bc4a69d 100644
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};

-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index 4f339fa..55fd194 100644

 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 @@ -393,6 +393,8 @@
 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 @@ -393,6 +393,8 @@


@@ -125,8 +117,6 @@ index 4f339fa..55fd194 100644
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 9ce85e5..0a82fca 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 @@ -240,6 +240,44 @@
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 @@ -240,6 +240,44 @@

diff --git a/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch b/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
index a0b6174..fa03b76 100644 (file)
--- a/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
+++ b/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
@@ -16,11 +16,9 @@ arch/arm/mach-omap2/omap_hwmod_33xx_data.c |   18 +++++++++---------
  arch/arm/mach-omap2/omap_hwmod_54xx_data.c |    6 +++---
  3 files changed, 15 insertions(+), 15 deletions(-)
 
  arch/arm/mach-omap2/omap_hwmod_54xx_data.c |    6 +++---
  3 files changed, 15 insertions(+), 15 deletions(-)
 

-diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-index 215894f..2815a91 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c

-@@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwmod = {
+@@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwm

        .name           = "emif",
        .class          = &am33xx_emif_hwmod_class,
        .clkdm_name     = "l3_clkdm",
        .name           = "emif",
        .class          = &am33xx_emif_hwmod_class,
        .clkdm_name     = "l3_clkdm",


@@ -29,7 +27,7 @@ index 215894f..2815a91 100644
        .main_clk       = "dpll_ddr_m2_div2_ck",
        .prcm           = {
                .omap4  = {
        .main_clk       = "dpll_ddr_m2_div2_ck",
        .prcm           = {
                .omap4  = {

-@@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_hwmod = {
+@@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_

        .name           = "l3_main",
        .class          = &am33xx_l3_hwmod_class,
        .clkdm_name     = "l3_clkdm",
        .name           = "l3_main",
        .class          = &am33xx_l3_hwmod_class,
        .clkdm_name     = "l3_clkdm",


@@ -38,7 +36,7 @@ index 215894f..2815a91 100644
        .main_clk       = "l3_gclk",
        .prcm           = {
                .omap4  = {
        .main_clk       = "l3_gclk",
        .prcm           = {
                .omap4  = {

-@@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr_hwmod = {
+@@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr

        .name           = "l3_instr",
        .class          = &am33xx_l3_hwmod_class,
        .clkdm_name     = "l3_clkdm",
        .name           = "l3_instr",
        .class          = &am33xx_l3_hwmod_class,
        .clkdm_name     = "l3_clkdm",


@@ -47,7 +45,7 @@ index 215894f..2815a91 100644
        .main_clk       = "l3_gclk",
        .prcm           = {
                .omap4  = {
        .main_clk       = "l3_gclk",
        .prcm           = {
                .omap4  = {

-@@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hwmod = {
+@@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hw

        .name           = "l4_ls",
        .class          = &am33xx_l4_hwmod_class,
        .clkdm_name     = "l4ls_clkdm",
        .name           = "l4_ls",
        .class          = &am33xx_l4_hwmod_class,
        .clkdm_name     = "l4ls_clkdm",


@@ -56,7 +54,7 @@ index 215894f..2815a91 100644
        .main_clk       = "l4ls_gclk",
        .prcm           = {
                .omap4  = {
        .main_clk       = "l4ls_gclk",
        .prcm           = {
                .omap4  = {

-@@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hwmod = {
+@@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hw

        .name           = "l4_hs",
        .class          = &am33xx_l4_hwmod_class,
        .clkdm_name     = "l4hs_clkdm",
        .name           = "l4_hs",
        .class          = &am33xx_l4_hwmod_class,
        .clkdm_name     = "l4hs_clkdm",


@@ -65,7 +63,7 @@ index 215894f..2815a91 100644
        .main_clk       = "l4hs_gclk",
        .prcm           = {
                .omap4  = {
        .main_clk       = "l4hs_gclk",
        .prcm           = {
                .omap4  = {

-@@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_hwmod = {
+@@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_

        .name           = "l4_wkup",
        .class          = &am33xx_l4_hwmod_class,
        .clkdm_name     = "l4_wkup_clkdm",
        .name           = "l4_wkup",
        .class          = &am33xx_l4_hwmod_class,
        .clkdm_name     = "l4_wkup_clkdm",


@@ -74,7 +72,7 @@ index 215894f..2815a91 100644
        .prcm           = {
                .omap4  = {
                        .clkctrl_offs   = AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET,
        .prcm           = {
                .omap4  = {
                        .clkctrl_offs   = AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET,

-@@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmod = {
+@@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmo

        .name           = "mpu",
        .class          = &am33xx_mpu_hwmod_class,
        .clkdm_name     = "mpu_clkdm",
        .name           = "mpu",
        .class          = &am33xx_mpu_hwmod_class,
        .clkdm_name     = "mpu_clkdm",


@@ -83,7 +81,7 @@ index 215894f..2815a91 100644
        .main_clk       = "dpll_mpu_m2_ck",
        .prcm           = {
                .omap4  = {
        .main_clk       = "dpll_mpu_m2_ck",
        .prcm           = {
                .omap4  = {

-@@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = {
+@@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_

        .name           = "ocmcram",
        .class          = &am33xx_ocmcram_hwmod_class,
        .clkdm_name     = "l3_clkdm",
        .name           = "ocmcram",
        .class          = &am33xx_ocmcram_hwmod_class,
        .clkdm_name     = "l3_clkdm",


@@ -92,7 +90,7 @@ index 215894f..2815a91 100644
        .main_clk       = "l3_gclk",
        .prcm           = {
                .omap4  = {
        .main_clk       = "l3_gclk",
        .prcm           = {
                .omap4  = {

-@@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
+@@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_

        .name           = "control",
        .class          = &am33xx_control_hwmod_class,
        .clkdm_name     = "l4_wkup_clkdm",
        .name           = "control",
        .class          = &am33xx_control_hwmod_class,
        .clkdm_name     = "l4_wkup_clkdm",


@@ -101,11 +99,9 @@ index 215894f..2815a91 100644
        .main_clk       = "dpll_core_m4_div2_ck",
        .prcm           = {
                .omap4  = {
        .main_clk       = "dpll_core_m4_div2_ck",
        .prcm           = {
                .omap4  = {

-diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-index 9c3b504..1e5b12c 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c

-@@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_hwmod = {
+@@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_

        .name           = "emif1",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",
        .name           = "emif1",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",


@@ -114,7 +110,7 @@ index 9c3b504..1e5b12c 100644
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {

-@@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
+@@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_

        .name           = "emif2",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",
        .name           = "emif2",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",


@@ -123,7 +119,7 @@ index 9c3b504..1e5b12c 100644
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {

-@@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hwmod = {
+@@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hw

        .name           = "mpu",
        .class          = &omap44xx_mpu_hwmod_class,
        .clkdm_name     = "mpuss_clkdm",
        .name           = "mpu",
        .class          = &omap44xx_mpu_hwmod_class,
        .clkdm_name     = "mpuss_clkdm",


@@ -132,11 +128,9 @@ index 9c3b504..1e5b12c 100644
        .main_clk       = "dpll_mpu_m2_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "dpll_mpu_m2_ck",
        .prcm = {
                .omap4 = {

-diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-index cde4155..e3caee1 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c

-@@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_hwmod = {
+@@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_

        .name           = "emif1",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",
        .name           = "emif1",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",


@@ -145,7 +139,7 @@ index cde4155..e3caee1 100644
        .main_clk       = "dpll_core_h11x2_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "dpll_core_h11x2_ck",
        .prcm = {
                .omap4 = {

-@@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_hwmod = {
+@@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_

        .name           = "emif2",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",
        .name           = "emif2",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",


@@ -154,7 +148,7 @@ index cde4155..e3caee1 100644
        .main_clk       = "dpll_core_h11x2_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "dpll_core_h11x2_ck",
        .prcm = {
                .omap4 = {

-@@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hwmod = {
+@@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hw

        .name           = "mpu",
        .class          = &omap54xx_mpu_hwmod_class,
        .clkdm_name     = "mpu_clkdm",
        .name           = "mpu",
        .class          = &omap54xx_mpu_hwmod_class,
        .clkdm_name     = "mpu_clkdm",

diff --git a/target/linux/omap/patches-3.12/201-ARM-dts-omap-Add-new-bindings-for-OMAP.patch b/target/linux/omap/patches-3.12/201-ARM-dts-omap-Add-new-bindings-for-OMAP.patch
index 7dd4477..a07b407 100644 (file)
--- a/target/linux/omap/patches-3.12/201-ARM-dts-omap-Add-new-bindings-for-OMAP.patch
+++ b/target/linux/omap/patches-3.12/201-ARM-dts-omap-Add-new-bindings-for-OMAP.patch
@@ -21,8 +21,6 @@ Signed-off-by: Rajendra Nayak <rnayak@ti.com>
  arch/arm/boot/dts/omap5.dtsi                       |    2 ++
  4 files changed, 9 insertions(+), 1 deletion(-)
 
  arch/arm/boot/dts/omap5.dtsi                       |    2 ++
  4 files changed, 9 insertions(+), 1 deletion(-)
 

-diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
-index 91b7049..808c154 100644

 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt
 +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
 @@ -21,7 +21,8 @@ Required properties:
 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt
 +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
 @@ -21,7 +21,8 @@ Required properties:


@@ -35,11 +33,9 @@ index 91b7049..808c154 100644
  
  Example:
  
  
  Example:
  

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index f9c5da9..ec33ea0 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -607,6 +607,7 @@
+@@ -667,6 +667,7 @@

                        reg = <0x44d00000 0x4000        /* M3 UMEM */
                               0x44d80000 0x2000>;      /* M3 DMEM */
                        ti,hwmods = "wkup_m3";
                        reg = <0x44d00000 0x4000        /* M3 UMEM */
                               0x44d80000 0x2000>;      /* M3 DMEM */
                        ti,hwmods = "wkup_m3";


@@ -47,7 +43,7 @@ index f9c5da9..ec33ea0 100644
                };
  
                elm: elm@48080000 {
                };
  
                elm: elm@48080000 {

-@@ -637,6 +638,7 @@
+@@ -697,6 +698,7 @@

                gpmc: gpmc@50000000 {
                        compatible = "ti,am3352-gpmc";
                        ti,hwmods = "gpmc";
                gpmc: gpmc@50000000 {
                        compatible = "ti,am3352-gpmc";
                        ti,hwmods = "gpmc";


@@ -55,8 +51,6 @@ index f9c5da9..ec33ea0 100644
                        reg = <0x50000000 0x2000>;
                        interrupts = <100>;
                        gpmc,num-cs = <7>;
                        reg = <0x50000000 0x2000>;
                        interrupts = <100>;
                        gpmc,num-cs = <7>;

-diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
-index 22d9f2b..e8fe797 100644

 --- a/arch/arm/boot/dts/omap4.dtsi
 +++ b/arch/arm/boot/dts/omap4.dtsi
 @@ -214,6 +214,7 @@
 --- a/arch/arm/boot/dts/omap4.dtsi
 +++ b/arch/arm/boot/dts/omap4.dtsi
 @@ -214,6 +214,7 @@


@@ -83,8 +77,6 @@ index 22d9f2b..e8fe797 100644
                        phy-type = <1>;
                        hw-caps-read-idle-ctrl;
                        hw-caps-ll-interface;
                        phy-type = <1>;
                        hw-caps-read-idle-ctrl;
                        hw-caps-ll-interface;

-diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
-index 7cdea1b..a9d49df 100644

 --- a/arch/arm/boot/dts/omap5.dtsi
 +++ b/arch/arm/boot/dts/omap5.dtsi
 @@ -607,6 +607,7 @@
 --- a/arch/arm/boot/dts/omap5.dtsi
 +++ b/arch/arm/boot/dts/omap5.dtsi
 @@ -607,6 +607,7 @@

diff --git a/target/linux/omap/patches-3.12/202-ARM-OMAP2-hwmod-Extract-no-idle-and-no-reset-info-from-DT.patch b/target/linux/omap/patches-3.12/202-ARM-OMAP2-hwmod-Extract-no-idle-and-no-reset-info-from-DT.patch
index 129f895..453ebd6 100644 (file)
--- a/target/linux/omap/patches-3.12/202-ARM-OMAP2-hwmod-Extract-no-idle-and-no-reset-info-from-DT.patch
+++ b/target/linux/omap/patches-3.12/202-ARM-OMAP2-hwmod-Extract-no-idle-and-no-reset-info-from-DT.patch
@@ -8,11 +8,9 @@ Signed-off-by: Rajendra Nayak <rnayak@ti.com>
 arch/arm/mach-omap2/omap_hwmod.c |   23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
 arch/arm/mach-omap2/omap_hwmod.c |   23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 

-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index d9ee0ff..b55923a 100644

 --- a/arch/arm/mach-omap2/omap_hwmod.c
 +++ b/arch/arm/mach-omap2/omap_hwmod.c
 --- a/arch/arm/mach-omap2/omap_hwmod.c
 +++ b/arch/arm/mach-omap2/omap_hwmod.c

-@@ -2363,11 +2363,11 @@ static struct device_node *of_dev_hwmod_lookup(struct device_node *np,
+@@ -2363,11 +2363,11 @@ static struct device_node *of_dev_hwmod_

   * are part of the device's address space can be ioremapped properly.
   * No return value.
   */
   * are part of the device's address space can be ioremapped properly.
   * No return value.
   */


@@ -26,7 +24,7 @@ index d9ee0ff..b55923a 100644
  
        if (!oh)
                return;
  
        if (!oh)
                return;

-@@ -2383,12 +2383,10 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)
+@@ -2383,12 +2383,10 @@ static void __init _init_mpu_rt_base(str

                         oh->name);
  
                /* Extract the IO space from device tree blob */
                         oh->name);
  
                /* Extract the IO space from device tree blob */


@@ -41,7 +39,7 @@ index d9ee0ff..b55923a 100644
        } else {
                va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
        }
        } else {
                va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
        }

-@@ -2420,12 +2418,16 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)
+@@ -2420,12 +2418,16 @@ static void __init _init_mpu_rt_base(str

  static int __init _init(struct omap_hwmod *oh, void *data)
  {
        int r;
  static int __init _init(struct omap_hwmod *oh, void *data)
  {
        int r;


@@ -59,7 +57,7 @@ index d9ee0ff..b55923a 100644
  
        r = _init_clocks(oh, NULL);
        if (r < 0) {
  
        r = _init_clocks(oh, NULL);
        if (r < 0) {

-@@ -2433,6 +2435,13 @@ static int __init _init(struct omap_hwmod *oh, void *data)
+@@ -2433,6 +2435,13 @@ static int __init _init(struct omap_hwmo

                return -EINVAL;
        }
  
                return -EINVAL;
        }
  

diff --git a/target/linux/omap/patches-3.12/203-ARM-OMAP2-hwmod-Cleanup-usag~RESET-and-HWMOD_INIT_NO_IDLE.patch b/target/linux/omap/patches-3.12/203-ARM-OMAP2-hwmod-Cleanup-usag~RESET-and-HWMOD_INIT_NO_IDLE.patch
index c014311..5158ee2 100644 (file)
--- a/target/linux/omap/patches-3.12/203-ARM-OMAP2-hwmod-Cleanup-usag~RESET-and-HWMOD_INIT_NO_IDLE.patch
+++ b/target/linux/omap/patches-3.12/203-ARM-OMAP2-hwmod-Cleanup-usag~RESET-and-HWMOD_INIT_NO_IDLE.patch
@@ -19,11 +19,9 @@ arch/arm/mach-omap2/omap_hwmod_33xx_data.c |    4 ++--
  arch/arm/mach-omap2/omap_hwmod_54xx_data.c |    2 --
  3 files changed, 3 insertions(+), 7 deletions(-)
 
  arch/arm/mach-omap2/omap_hwmod_54xx_data.c |    2 --
  3 files changed, 3 insertions(+), 7 deletions(-)
 

-diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-index 2815a91..e8dc72d 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c

-@@ -198,7 +198,7 @@ static struct omap_hwmod am33xx_wkup_m3_hwmod = {
+@@ -198,7 +198,7 @@ static struct omap_hwmod am33xx_wkup_m3_

        .class          = &am33xx_wkup_m3_hwmod_class,
        .clkdm_name     = "l4_wkup_aon_clkdm",
        /* Keep hardreset asserted */
        .class          = &am33xx_wkup_m3_hwmod_class,
        .clkdm_name     = "l4_wkup_aon_clkdm",
        /* Keep hardreset asserted */


@@ -32,7 +30,7 @@ index 2815a91..e8dc72d 100644
        .main_clk       = "dpll_core_m4_div2_ck",
        .prcm           = {
                .omap4  = {
        .main_clk       = "dpll_core_m4_div2_ck",
        .prcm           = {
                .omap4  = {

-@@ -932,7 +932,7 @@ static struct omap_hwmod am33xx_gpmc_hwmod = {
+@@ -932,7 +932,7 @@ static struct omap_hwmod am33xx_gpmc_hwm

        .name           = "gpmc",
        .class          = &am33xx_gpmc_hwmod_class,
        .clkdm_name     = "l3s_clkdm",
        .name           = "gpmc",
        .class          = &am33xx_gpmc_hwmod_class,
        .clkdm_name     = "l3s_clkdm",


@@ -41,11 +39,9 @@ index 2815a91..e8dc72d 100644
        .main_clk       = "l3s_gclk",
        .prcm           = {
                .omap4  = {
        .main_clk       = "l3s_gclk",
        .prcm           = {
                .omap4  = {

-diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-index 1e5b12c..a507a70 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c

-@@ -914,7 +914,6 @@ static struct omap_hwmod omap44xx_emif1_hwmod = {
+@@ -914,7 +914,6 @@ static struct omap_hwmod omap44xx_emif1_

        .name           = "emif1",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",
        .name           = "emif1",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",


@@ -53,7 +49,7 @@ index 1e5b12c..a507a70 100644
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {

-@@ -930,7 +929,6 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
+@@ -930,7 +929,6 @@ static struct omap_hwmod omap44xx_emif2_

        .name           = "emif2",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",
        .name           = "emif2",
        .class          = &omap44xx_emif_hwmod_class,
        .clkdm_name     = "l3_emif_clkdm",


@@ -61,7 +57,7 @@ index 1e5b12c..a507a70 100644
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "ddrphy_ck",
        .prcm = {
                .omap4 = {

-@@ -1184,7 +1182,7 @@ static struct omap_hwmod omap44xx_gpmc_hwmod = {
+@@ -1184,7 +1182,7 @@ static struct omap_hwmod omap44xx_gpmc_h

         * the kernel from the board file or DT data.
         * HWMOD_INIT_NO_RESET should be removed ASAP.
         */
         * the kernel from the board file or DT data.
         * HWMOD_INIT_NO_RESET should be removed ASAP.
         */


@@ -70,11 +66,9 @@ index 1e5b12c..a507a70 100644
        .prcm = {
                .omap4 = {
                        .clkctrl_offs = OMAP4_CM_L3_2_GPMC_CLKCTRL_OFFSET,
        .prcm = {
                .omap4 = {
                        .clkctrl_offs = OMAP4_CM_L3_2_GPMC_CLKCTRL_OFFSET,

-diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-index e3caee1..e47f24d 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c

-@@ -352,7 +352,6 @@ static struct omap_hwmod omap54xx_emif1_hwmod = {
+@@ -352,7 +352,6 @@ static struct omap_hwmod omap54xx_emif1_

        .name           = "emif1",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",
        .name           = "emif1",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",


@@ -82,7 +76,7 @@ index e3caee1..e47f24d 100644
        .main_clk       = "dpll_core_h11x2_ck",
        .prcm = {
                .omap4 = {
        .main_clk       = "dpll_core_h11x2_ck",
        .prcm = {
                .omap4 = {

-@@ -368,7 +367,6 @@ static struct omap_hwmod omap54xx_emif2_hwmod = {
+@@ -368,7 +367,6 @@ static struct omap_hwmod omap54xx_emif2_

        .name           = "emif2",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",
        .name           = "emif2",
        .class          = &omap54xx_emif_hwmod_class,
        .clkdm_name     = "emif_clkdm",

diff --git a/target/linux/omap/patches-3.12/204-ARM-dts-AM335x-evmsk-Do-not-reset-gpio0.patch b/target/linux/omap/patches-3.12/204-ARM-dts-AM335x-evmsk-Do-not-reset-gpio0.patch
index fce95ab..9577a70 100644 (file)
--- a/target/linux/omap/patches-3.12/204-ARM-dts-AM335x-evmsk-Do-not-reset-gpio0.patch
+++ b/target/linux/omap/patches-3.12/204-ARM-dts-AM335x-evmsk-Do-not-reset-gpio0.patch
@@ -10,13 +10,11 @@ Signed-off-by: Rajendra Nayak <rnayak@ti.com>
 arch/arm/boot/dts/am335x-evmsk.dts |    4 ++++
  1 file changed, 4 insertions(+)
 
 arch/arm/boot/dts/am335x-evmsk.dts |    4 ++++
  1 file changed, 4 insertions(+)
 

-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index 4f339fa..0e44d29 100644

 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts

-@@ -419,3 +419,7 @@
-       phy_id = <&davinci_mdio>, <1>;
-       phy-mode = "rgmii-txid";
+@@ -426,3 +426,7 @@
+       status = "okay";
+       vmmc-supply = <&vmmc_reg>;

  };
 +
 +&gpio0 {
  };
 +
 +&gpio0 {

diff --git a/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch b/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
index c4525c4..0be3181 100644 (file)
--- a/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
+++ b/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
@@ -17,9 +17,6 @@ Acked-by: Mark Rutland <mark.rutland@arm.com>
  5 files changed, 49 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt
 
  5 files changed, 49 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt
 

-diff --git a/Documentation/devicetree/bindings/crypto/omap-sham.txt b/Documentation/devicetree/bindings/crypto/omap-sham.txt
-new file mode 100644
-index 0000000..f839acd

 --- /dev/null
 +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
 @@ -0,0 +1,28 @@
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
 @@ -0,0 +1,28 @@


@@ -51,23 +48,19 @@ index 0000000..f839acd
 +              dmas = <&edma 36>;
 +              dma-names = "rx";
 +      };
 +              dmas = <&edma 36>;
 +              dma-names = "rx";
 +      };

-diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
-index 0d63348..8a9802e 100644

 --- a/arch/arm/boot/dts/am335x-bone.dts
 +++ b/arch/arm/boot/dts/am335x-bone.dts
 --- a/arch/arm/boot/dts/am335x-bone.dts
 +++ b/arch/arm/boot/dts/am335x-bone.dts

-@@ -19,3 +19,7 @@
- &mmc1 {
+@@ -20,3 +20,7 @@
+       status = "okay";

        vmmc-supply = <&ldo3_reg>;
  };
 +
 +&sham {
 +      status = "okay";
 +};
        vmmc-supply = <&ldo3_reg>;
  };
 +
 +&sham {
 +      status = "okay";
 +};

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index 23b0a3e..d59e51c 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts

-@@ -522,3 +522,7 @@
+@@ -524,3 +524,7 @@

        status = "okay";
        vmmc-supply = <&vmmc_reg>;
  };
        status = "okay";
        vmmc-supply = <&vmmc_reg>;
  };


@@ -75,23 +68,19 @@ index 23b0a3e..d59e51c 100644
 +&sham {
 +      status = "okay";
 +};
 +&sham {
 +      status = "okay";
 +};

-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index bc93895..d45a330 100644

 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts

-@@ -424,3 +424,7 @@
-       status = "okay";
-       vmmc-supply = <&vmmc_reg>;
+@@ -430,3 +430,7 @@
+ &gpio0 {
+       ti,no-reset-on-init;

  };
 +
 +&sham {
 +      status = "okay";
 +};
  };
 +
 +&sham {
 +      status = "okay";
 +};

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 553adc6..299710b 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -710,5 +710,14 @@
+@@ -707,5 +707,14 @@

                        #size-cells = <1>;
                        status = "disabled";
                };
                        #size-cells = <1>;
                        status = "disabled";
                };

diff --git a/target/linux/omap/patches-3.12/301-ARM-dts-AM33XX-Add-AES-data-and-documentation.patch b/target/linux/omap/patches-3.12/301-ARM-dts-AM33XX-Add-AES-data-and-documentation.patch
index 52763c3..d464d31 100644 (file)
--- a/target/linux/omap/patches-3.12/301-ARM-dts-AM33XX-Add-AES-data-and-documentation.patch
+++ b/target/linux/omap/patches-3.12/301-ARM-dts-AM33XX-Add-AES-data-and-documentation.patch
@@ -17,9 +17,6 @@ Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
  5 files changed, 53 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt
 
  5 files changed, 53 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt
 

-diff --git a/Documentation/devicetree/bindings/crypto/omap-aes.txt b/Documentation/devicetree/bindings/crypto/omap-aes.txt
-new file mode 100644
-index 0000000..fd97176

 --- /dev/null
 +++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt
 @@ -0,0 +1,31 @@
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt
 @@ -0,0 +1,31 @@


@@ -54,11 +51,9 @@ index 0000000..fd97176
 +                     <&edma 5>;
 +              dma-names = "tx", "rx";
 +      };
 +                     <&edma 5>;
 +              dma-names = "tx", "rx";
 +      };

-diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
-index 8a9802e..94ee427 100644

 --- a/arch/arm/boot/dts/am335x-bone.dts
 +++ b/arch/arm/boot/dts/am335x-bone.dts
 --- a/arch/arm/boot/dts/am335x-bone.dts
 +++ b/arch/arm/boot/dts/am335x-bone.dts

-@@ -23,3 +23,7 @@
+@@ -24,3 +24,7 @@

  &sham {
        status = "okay";
  };
  &sham {
        status = "okay";
  };


@@ -66,11 +61,9 @@ index 8a9802e..94ee427 100644
 +&aes {
 +      status = "okay";
 +};
 +&aes {
 +      status = "okay";
 +};

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index d59e51c..86463fa 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts

-@@ -526,3 +526,7 @@
+@@ -528,3 +528,7 @@

  &sham {
        status = "okay";
  };
  &sham {
        status = "okay";
  };


@@ -78,11 +71,9 @@ index d59e51c..86463fa 100644
 +&aes {
 +      status = "okay";
 +};
 +&aes {
 +      status = "okay";
 +};

-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index d45a330..f577e65 100644

 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts

-@@ -428,3 +428,7 @@
+@@ -434,3 +434,7 @@

  &sham {
        status = "okay";
  };
  &sham {
        status = "okay";
  };


@@ -90,11 +81,9 @@ index d45a330..f577e65 100644
 +&aes {
 +      status = "okay";
 +};
 +&aes {
 +      status = "okay";
 +};

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 299710b..2664da9 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -719,5 +719,15 @@
+@@ -716,5 +716,15 @@

                        dmas = <&edma 36>;
                        dma-names = "rx";
                };
                        dmas = <&edma 36>;
                        dma-names = "rx";
                };

diff --git a/target/linux/omap/patches-3.12/302-ARM-dts-AM33XX-Fix-AES-interrupt-number.patch b/target/linux/omap/patches-3.12/302-ARM-dts-AM33XX-Fix-AES-interrupt-number.patch
index 1a2517e..bb93954 100644 (file)
--- a/target/linux/omap/patches-3.12/302-ARM-dts-AM33XX-Fix-AES-interrupt-number.patch
+++ b/target/linux/omap/patches-3.12/302-ARM-dts-AM33XX-Fix-AES-interrupt-number.patch
@@ -8,11 +8,9 @@ Signed-off-by: Joel Fernandes <joelf@ti.com>
 arch/arm/boot/dts/am33xx.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 arch/arm/boot/dts/am33xx.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 2664da9..5c2d6c1 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -724,7 +724,7 @@
+@@ -721,7 +721,7 @@

                        compatible = "ti,omap4-aes";
                        ti,hwmods = "aes";
                        reg = <0x53500000 0xa0>;
                        compatible = "ti,omap4-aes";
                        ti,hwmods = "aes";
                        reg = <0x53500000 0xa0>;

diff --git a/target/linux/omap/patches-3.12/350-ARM-AM33xx-hwmod-Add-RNG-module-data.patch b/target/linux/omap/patches-3.12/350-ARM-AM33xx-hwmod-Add-RNG-module-data.patch
index 5ca2790..065a781 100644 (file)
--- a/target/linux/omap/patches-3.12/350-ARM-AM33xx-hwmod-Add-RNG-module-data.patch
+++ b/target/linux/omap/patches-3.12/350-ARM-AM33xx-hwmod-Add-RNG-module-data.patch
@@ -8,11 +8,9 @@ Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c |   36 ++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)
 
  arch/arm/mach-omap2/omap_hwmod_33xx_data.c |   36 ++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)
 

-diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-index 215894f..3e32f45 100644

 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c

-@@ -2480,6 +2480,41 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__aes0 = {
+@@ -2480,6 +2480,41 @@ static struct omap_hwmod_ocp_if am33xx_l

        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  


@@ -54,7 +52,7 @@ index 215894f..3e32f45 100644
  static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l3_main__emif,
        &am33xx_mpu__l3_main,
  static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l3_main__emif,
        &am33xx_mpu__l3_main,

-@@ -2559,6 +2594,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
+@@ -2559,6 +2594,7 @@ static struct omap_hwmod_ocp_if *am33xx_

        &am33xx_cpgmac0__mdio,
        &am33xx_l3_main__sha0,
        &am33xx_l3_main__aes0,
        &am33xx_cpgmac0__mdio,
        &am33xx_l3_main__sha0,
        &am33xx_l3_main__aes0,

diff --git a/target/linux/omap/patches-3.12/400-ASoC-davinci-evm-Move-sysclk-logic-away-from-evm_hw_.patch b/target/linux/omap/patches-3.12/400-ASoC-davinci-evm-Move-sysclk-logic-away-from-evm_hw_.patch
index 292fda8..af3e939 100644 (file)
--- a/target/linux/omap/patches-3.12/400-ASoC-davinci-evm-Move-sysclk-logic-away-from-evm_hw_.patch
+++ b/target/linux/omap/patches-3.12/400-ASoC-davinci-evm-Move-sysclk-logic-away-from-evm_hw_.patch
@@ -12,8 +12,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  sound/soc/davinci/davinci-evm.c |   64 +++++++++++++++++++++++++++------------
  1 file changed, 44 insertions(+), 20 deletions(-)
 
  sound/soc/davinci/davinci-evm.c |   64 +++++++++++++++++++++++++++------------
  1 file changed, 44 insertions(+), 20 deletions(-)
 

-diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
-index fd7c45b..2f8161c 100644

 --- a/sound/soc/davinci/davinci-evm.c
 +++ b/sound/soc/davinci/davinci-evm.c
 @@ -27,6 +27,10 @@
 --- a/sound/soc/davinci/davinci-evm.c
 +++ b/sound/soc/davinci/davinci-evm.c
 @@ -27,6 +27,10 @@


@@ -27,7 +25,7 @@ index fd7c45b..2f8161c 100644
  #define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B | \
                SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF)
  static int evm_hw_params(struct snd_pcm_substream *substream,
  #define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B | \
                SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF)
  static int evm_hw_params(struct snd_pcm_substream *substream,

-@@ -35,27 +39,11 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
+@@ -35,27 +39,11 @@ static int evm_hw_params(struct snd_pcm_

        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;


@@ -59,7 +57,7 @@ index fd7c45b..2f8161c 100644
  
        /* set codec DAI configuration */
        ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);
  
        /* set codec DAI configuration */
        ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);

-@@ -243,35 +231,65 @@ static struct snd_soc_dai_link da850_evm_dai = {
+@@ -243,35 +231,65 @@ static struct snd_soc_dai_link da850_evm

  };
  
  /* davinci dm6446 evm audio machine driver */
  };
  
  /* davinci dm6446 evm audio machine driver */


@@ -125,7 +123,7 @@ index fd7c45b..2f8161c 100644
  };
  
  static struct snd_soc_card da830_snd_soc_card = {
  };
  
  static struct snd_soc_card da830_snd_soc_card = {

-@@ -279,6 +297,11 @@ static struct snd_soc_card da830_snd_soc_card = {
+@@ -279,6 +297,11 @@ static struct snd_soc_card da830_snd_soc

        .owner = THIS_MODULE,
        .dai_link = &da830_evm_dai,
        .num_links = 1,
        .owner = THIS_MODULE,
        .dai_link = &da830_evm_dai,
        .num_links = 1,


@@ -137,7 +135,7 @@ index fd7c45b..2f8161c 100644
  };
  
  static struct snd_soc_card da850_snd_soc_card = {
  };
  
  static struct snd_soc_card da850_snd_soc_card = {

-@@ -286,6 +309,7 @@ static struct snd_soc_card da850_snd_soc_card = {
+@@ -286,6 +309,7 @@ static struct snd_soc_card da850_snd_soc

        .owner = THIS_MODULE,
        .dai_link = &da850_evm_dai,
        .num_links = 1,
        .owner = THIS_MODULE,
        .dai_link = &da850_evm_dai,
        .num_links = 1,


@@ -145,6 +143,3 @@ index fd7c45b..2f8161c 100644
  };
  
  static struct platform_device *evm_snd_device;
  };
  
  static struct platform_device *evm_snd_device;

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/401-ASoC-davinci-evm-Add-device-tree-binding.patch b/target/linux/omap/patches-3.12/401-ASoC-davinci-evm-Add-device-tree-binding.patch
index a3cbfb7..b90fdb8 100644 (file)
--- a/target/linux/omap/patches-3.12/401-ASoC-davinci-evm-Add-device-tree-binding.patch
+++ b/target/linux/omap/patches-3.12/401-ASoC-davinci-evm-Add-device-tree-binding.patch
@@ -21,9 +21,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  2 files changed, 176 insertions(+), 2 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
 
  2 files changed, 176 insertions(+), 2 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
 

-diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
-new file mode 100644
-index 0000000..e6b61ff

 --- /dev/null
 +++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
 @@ -0,0 +1,58 @@
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
 @@ -0,0 +1,58 @@


@@ -85,8 +82,6 @@ index 0000000..e6b61ff
 +              "LINE1R",               "Line In",
 +              "LINE2R",               "Line In";
 +};
 +              "LINE1R",               "Line In",
 +              "LINE2R",               "Line In";
 +};

-diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
-index 2f8161c..340a68d 100644

 --- a/sound/soc/davinci/davinci-evm.c
 +++ b/sound/soc/davinci/davinci-evm.c
 @@ -16,6 +16,7 @@
 --- a/sound/soc/davinci/davinci-evm.c
 +++ b/sound/soc/davinci/davinci-evm.c
 @@ -16,6 +16,7 @@


@@ -106,7 +101,7 @@ index 2f8161c..340a68d 100644
  #include "davinci-pcm.h"
  #include "davinci-i2s.h"
  #include "davinci-mcasp.h"
  #include "davinci-pcm.h"
  #include "davinci-i2s.h"
  #include "davinci-mcasp.h"

-@@ -121,13 +124,22 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
+@@ -121,13 +124,22 @@ static int evm_aic3x_init(struct snd_soc

  {
        struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_dapm_context *dapm = &codec->dapm;
  {
        struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_dapm_context *dapm = &codec->dapm;


@@ -131,7 +126,7 @@ index 2f8161c..340a68d 100644
  
        /* not connected */
        snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");
  
        /* not connected */
        snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");

-@@ -312,6 +324,98 @@ static struct snd_soc_card da850_snd_soc_card = {
+@@ -312,6 +324,98 @@ static struct snd_soc_card da850_snd_soc

        .drvdata = &da850_snd_soc_card_drvdata,
  };
  
        .drvdata = &da850_snd_soc_card_drvdata,
  };
  


@@ -256,6 +251,3 @@ index 2f8161c..340a68d 100644
        platform_device_unregister(evm_snd_device);
  }
  
        platform_device_unregister(evm_snd_device);
  }
  

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/402-ASoC-davinci-mcasp-Add-DMA-register-locations-to-DT.patch b/target/linux/omap/patches-3.12/402-ASoC-davinci-mcasp-Add-DMA-register-locations-to-DT.patch
index 2a99a5a..ef7b436 100644 (file)
--- a/target/linux/omap/patches-3.12/402-ASoC-davinci-mcasp-Add-DMA-register-locations-to-DT.patch
+++ b/target/linux/omap/patches-3.12/402-ASoC-davinci-mcasp-Add-DMA-register-locations-to-DT.patch
@@ -17,8 +17,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  sound/soc/davinci/davinci-mcasp.c                  |   59 +++++++++++++-------
  2 files changed, 46 insertions(+), 21 deletions(-)
 
  sound/soc/davinci/davinci-mcasp.c                  |   59 +++++++++++++-------
  2 files changed, 46 insertions(+), 21 deletions(-)
 

-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
-index 374e145..63b67ae 100644

 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -6,7 +6,11 @@ Required properties:
 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -6,7 +6,11 @@ Required properties:


@@ -50,11 +48,9 @@ index 374e145..63b67ae 100644
        interrupts = <82 83>;
        op-mode = <0>;          /* MCASP_IIS_MODE */
        tdm-slots = <2>;
        interrupts = <82 83>;
        op-mode = <0>;          /* MCASP_IIS_MODE */
        tdm-slots = <2>;

-diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
-index 32ddb7f..a056fc5 100644

 --- a/sound/soc/davinci/davinci-mcasp.c
 +++ b/sound/soc/davinci/davinci-mcasp.c
 --- a/sound/soc/davinci/davinci-mcasp.c
 +++ b/sound/soc/davinci/davinci-mcasp.c

-@@ -1001,18 +1001,40 @@ static const struct snd_soc_component_driver davinci_mcasp_component = {
+@@ -1001,18 +1001,40 @@ static const struct snd_soc_component_dr

        .name           = "davinci-mcasp",
  };
  
        .name           = "davinci-mcasp",
  };
  


@@ -98,7 +94,7 @@ index 32ddb7f..a056fc5 100644
        },
        { /* sentinel */ }
  };
        },
        { /* sentinel */ }
  };

-@@ -1035,20 +1057,13 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1035,20 +1057,13 @@ static struct snd_platform_data *davinci

                pdata = pdev->dev.platform_data;
                return pdata;
        } else if (match) {
                pdata = pdev->dev.platform_data;
                return pdata;
        } else if (match) {


@@ -120,7 +116,7 @@ index 32ddb7f..a056fc5 100644
        ret = of_property_read_u32(np, "op-mode", &val);
        if (ret >= 0)
                pdata->op_mode = val;
        ret = of_property_read_u32(np, "op-mode", &val);
        if (ret >= 0)
                pdata->op_mode = val;

-@@ -1145,10 +1160,15 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
+@@ -1145,10 +1160,15 @@ static int davinci_mcasp_probe(struct pl

                return -EINVAL;
        }
  
                return -EINVAL;
        }
  


@@ -139,7 +135,7 @@ index 32ddb7f..a056fc5 100644
        }
  
        ioarea = devm_request_mem_region(&pdev->dev, mem->start,
        }
  
        ioarea = devm_request_mem_region(&pdev->dev, mem->start,

-@@ -1182,13 +1202,16 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
+@@ -1182,13 +1202,16 @@ static int davinci_mcasp_probe(struct pl

        dev->rxnumevt = pdata->rxnumevt;
        dev->dev = &pdev->dev;
  
        dev->rxnumevt = pdata->rxnumevt;
        dev->dev = &pdev->dev;
  


@@ -158,7 +154,7 @@ index 32ddb7f..a056fc5 100644
  
        /* first TX, then RX */
        res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
  
        /* first TX, then RX */
        res = platform_get_resource(pdev, IORESOURCE_DMA, 0);

-@@ -1205,8 +1228,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
+@@ -1205,8 +1228,7 @@ static int davinci_mcasp_probe(struct pl

        dma_data->ram_chan_q = pdata->ram_chan_q;
        dma_data->sram_pool = pdata->sram_pool;
        dma_data->sram_size = pdata->sram_size_capture;
        dma_data->ram_chan_q = pdata->ram_chan_q;
        dma_data->sram_pool = pdata->sram_pool;
        dma_data->sram_size = pdata->sram_size_capture;


@@ -168,11 +164,8 @@ index 32ddb7f..a056fc5 100644
  
        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
        if (!res) {
  
        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
        if (!res) {

-@@ -1266,4 +1288,3 @@ module_platform_driver(davinci_mcasp_driver);
+@@ -1266,4 +1288,3 @@ module_platform_driver(davinci_mcasp_dri

  MODULE_AUTHOR("Steve Chen");
  MODULE_DESCRIPTION("TI DAVINCI McASP SoC Interface");
  MODULE_LICENSE("GPL");
 -
  MODULE_AUTHOR("Steve Chen");
  MODULE_DESCRIPTION("TI DAVINCI McASP SoC Interface");
  MODULE_LICENSE("GPL");
 -

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/403-ASoC-davinci-mcasp-Extract-DMA-channels-directly-fro.patch b/target/linux/omap/patches-3.12/403-ASoC-davinci-mcasp-Extract-DMA-channels-directly-fro.patch
index 5fc2f13..c3b042e 100644 (file)
--- a/target/linux/omap/patches-3.12/403-ASoC-davinci-mcasp-Extract-DMA-channels-directly-fro.patch
+++ b/target/linux/omap/patches-3.12/403-ASoC-davinci-mcasp-Extract-DMA-channels-directly-fro.patch
@@ -15,8 +15,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  sound/soc/davinci/davinci-mcasp.c                  |   47 +++++++++++++-------
  3 files changed, 39 insertions(+), 15 deletions(-)
 
  sound/soc/davinci/davinci-mcasp.c                  |   47 +++++++++++++-------
  3 files changed, 39 insertions(+), 15 deletions(-)
 

-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
-index 63b67ae..68e0f47 100644

 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -18,6 +18,11 @@ Required properties:
 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -18,6 +18,11 @@ Required properties:


@@ -31,8 +29,6 @@ index 63b67ae..68e0f47 100644
  
  Optional properties:
  
  
  Optional properties:
  

-diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
-index 8db5ae0..689a856 100644

 --- a/include/linux/platform_data/davinci_asp.h
 +++ b/include/linux/platform_data/davinci_asp.h
 @@ -84,6 +84,8 @@ struct snd_platform_data {
 --- a/include/linux/platform_data/davinci_asp.h
 +++ b/include/linux/platform_data/davinci_asp.h
 @@ -84,6 +84,8 @@ struct snd_platform_data {


@@ -44,11 +40,9 @@ index 8db5ae0..689a856 100644
  };
  
  enum {
  };
  
  enum {

-diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
-index a056fc5..acbf5f8 100644

 --- a/sound/soc/davinci/davinci-mcasp.c
 +++ b/sound/soc/davinci/davinci-mcasp.c
 --- a/sound/soc/davinci/davinci-mcasp.c
 +++ b/sound/soc/davinci/davinci-mcasp.c

-@@ -1047,6 +1047,7 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1047,6 +1047,7 @@ static struct snd_platform_data *davinci

        struct snd_platform_data *pdata = NULL;
        const struct of_device_id *match =
                        of_match_device(mcasp_dt_ids, &pdev->dev);
        struct snd_platform_data *pdata = NULL;
        const struct of_device_id *match =
                        of_match_device(mcasp_dt_ids, &pdev->dev);


@@ -56,7 +50,7 @@ index a056fc5..acbf5f8 100644
  
        const u32 *of_serial_dir32;
        u8 *of_serial_dir;
  
        const u32 *of_serial_dir32;
        u8 *of_serial_dir;

-@@ -1109,6 +1110,28 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1109,6 +1110,28 @@ static struct snd_platform_data *davinci

                pdata->serial_dir = of_serial_dir;
        }
  
                pdata->serial_dir = of_serial_dir;
        }
  


@@ -94,7 +88,7 @@ index a056fc5..acbf5f8 100644
        struct snd_platform_data *pdata;
        struct davinci_audio_dev *dev;
        int ret;
        struct snd_platform_data *pdata;
        struct davinci_audio_dev *dev;
        int ret;

-@@ -1213,15 +1236,11 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
+@@ -1213,15 +1236,11 @@ static int davinci_mcasp_probe(struct pl

        dma_data->sram_size = pdata->sram_size_playback;
        dma_data->dma_addr = dma->start + pdata->tx_dma_offset;
  
        dma_data->sram_size = pdata->sram_size_playback;
        dma_data->dma_addr = dma->start + pdata->tx_dma_offset;
  


@@ -114,7 +108,7 @@ index a056fc5..acbf5f8 100644
  
        dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE];
        dma_data->asp_chan_q = pdata->asp_chan_q;
  
        dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE];
        dma_data->asp_chan_q = pdata->asp_chan_q;

-@@ -1231,13 +1250,11 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
+@@ -1231,13 +1250,11 @@ static int davinci_mcasp_probe(struct pl

        dma_data->dma_addr = dma->start + pdata->rx_dma_offset;
  
        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
        dma_data->dma_addr = dma->start + pdata->rx_dma_offset;
  
        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);


@@ -132,6 +126,3 @@ index a056fc5..acbf5f8 100644
        dev_set_drvdata(&pdev->dev, dev);
        ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
                                         &davinci_mcasp_dai[pdata->op_mode], 1);
        dev_set_drvdata(&pdev->dev, dev);
        ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
                                         &davinci_mcasp_dai[pdata->op_mode], 1);

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/404-ASoC-davinci-mcasp-Interrupts-property-to-optional-a.patch b/target/linux/omap/patches-3.12/404-ASoC-davinci-mcasp-Interrupts-property-to-optional-a.patch
index 9bf4d98..9105822 100644 (file)
--- a/target/linux/omap/patches-3.12/404-ASoC-davinci-mcasp-Interrupts-property-to-optional-a.patch
+++ b/target/linux/omap/patches-3.12/404-ASoC-davinci-mcasp-Interrupts-property-to-optional-a.patch
@@ -13,8 +13,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
  Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 

-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
-index 68e0f47..2fd0bf2 100644

 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -11,7 +11,6 @@ Required properties:
 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -11,7 +11,6 @@ Required properties:


@@ -42,6 +40,3 @@ index 68e0f47..2fd0bf2 100644
        op-mode = <0>;          /* MCASP_IIS_MODE */
        tdm-slots = <2>;
        num-serializer = <16>;
        op-mode = <0>;          /* MCASP_IIS_MODE */
        tdm-slots = <2>;
        num-serializer = <16>;

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/405-ASoC-davinci-Add-support-for-AM33xx-SoC-Audio.patch b/target/linux/omap/patches-3.12/405-ASoC-davinci-Add-support-for-AM33xx-SoC-Audio.patch
index 2e27a2d..ddc2b82 100644 (file)
--- a/target/linux/omap/patches-3.12/405-ASoC-davinci-Add-support-for-AM33xx-SoC-Audio.patch
+++ b/target/linux/omap/patches-3.12/405-ASoC-davinci-Add-support-for-AM33xx-SoC-Audio.patch
@@ -14,8 +14,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  sound/soc/davinci/Makefile |    1 +
  2 files changed, 16 insertions(+), 3 deletions(-)
 
  sound/soc/davinci/Makefile |    1 +
  2 files changed, 16 insertions(+), 3 deletions(-)
 

-diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
-index c82f89c..95970f5 100644

 --- a/sound/soc/davinci/Kconfig
 +++ b/sound/soc/davinci/Kconfig
 @@ -1,9 +1,10 @@
 --- a/sound/soc/davinci/Kconfig
 +++ b/sound/soc/davinci/Kconfig
 @@ -1,9 +1,10 @@


@@ -50,11 +48,9 @@ index c82f89c..95970f5 100644
  config SND_DAVINCI_SOC_EVM
        tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
        depends on SND_DAVINCI_SOC
  config SND_DAVINCI_SOC_EVM
        tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
        depends on SND_DAVINCI_SOC

-diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile
-index a396ab6..bc81e79 100644

 --- a/sound/soc/davinci/Makefile
 +++ b/sound/soc/davinci/Makefile
 --- a/sound/soc/davinci/Makefile
 +++ b/sound/soc/davinci/Makefile

-@@ -13,6 +13,7 @@ obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o
+@@ -13,6 +13,7 @@ obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += sn

  snd-soc-evm-objs := davinci-evm.o
  
  obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o
  snd-soc-evm-objs := davinci-evm.o
  
  obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o


@@ -62,6 +58,3 @@ index a396ab6..bc81e79 100644
  obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o
  obj-$(CONFIG_SND_DA830_SOC_EVM) += snd-soc-evm.o
  obj-$(CONFIG_SND_DA850_SOC_EVM) += snd-soc-evm.o
  obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o
  obj-$(CONFIG_SND_DA830_SOC_EVM) += snd-soc-evm.o
  obj-$(CONFIG_SND_DA850_SOC_EVM) += snd-soc-evm.o

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/406-ASoC-tlv320aic3x-Add-regulators-to-DT-bindings-docum.patch b/target/linux/omap/patches-3.12/406-ASoC-tlv320aic3x-Add-regulators-to-DT-bindings-docum.patch
index 6dae77b..3372ae4 100644 (file)
--- a/target/linux/omap/patches-3.12/406-ASoC-tlv320aic3x-Add-regulators-to-DT-bindings-docum.patch
+++ b/target/linux/omap/patches-3.12/406-ASoC-tlv320aic3x-Add-regulators-to-DT-bindings-docum.patch
@@ -11,8 +11,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  Documentation/devicetree/bindings/sound/tlv320aic3x.txt |    7 +++++++
  1 file changed, 7 insertions(+)
 
  Documentation/devicetree/bindings/sound/tlv320aic3x.txt |    7 +++++++
  1 file changed, 7 insertions(+)
 

-diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
-index 705a6b1..ba26477 100644

 --- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 +++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 @@ -24,10 +24,17 @@ Optional properties:
 --- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 +++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 @@ -24,10 +24,17 @@ Optional properties:


@@ -33,6 +31,3 @@ index 705a6b1..ba26477 100644
 +      DRVDD-supply = <&regulator>;
 +      DVDD-supply = <&regulator>;
  };
 +      DRVDD-supply = <&regulator>;
 +      DVDD-supply = <&regulator>;
  };

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/407-ASoC-tlv320aic3x-Add-codec-pins-to-DT-bindings-docum.patch b/target/linux/omap/patches-3.12/407-ASoC-tlv320aic3x-Add-codec-pins-to-DT-bindings-docum.patch
index af86233..1cadcc5 100644 (file)
--- a/target/linux/omap/patches-3.12/407-ASoC-tlv320aic3x-Add-codec-pins-to-DT-bindings-docum.patch
+++ b/target/linux/omap/patches-3.12/407-ASoC-tlv320aic3x-Add-codec-pins-to-DT-bindings-docum.patch
@@ -11,8 +11,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  .../devicetree/bindings/sound/tlv320aic3x.txt       |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
  .../devicetree/bindings/sound/tlv320aic3x.txt       |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 

-diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
-index ba26477..5e6040c 100644

 --- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 +++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 @@ -27,6 +27,25 @@ Optional properties:
 --- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 +++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
 @@ -27,6 +27,25 @@ Optional properties:


@@ -41,6 +39,3 @@ index ba26477..5e6040c 100644
  Example:
  
  tlv320aic3x: tlv320aic3x@1b {
  Example:
  
  tlv320aic3x: tlv320aic3x@1b {

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/408-ARM-dts-am33xx-Add-mcasp0-and-mcasp1-device-tree-ent.patch b/target/linux/omap/patches-3.12/408-ARM-dts-am33xx-Add-mcasp0-and-mcasp1-device-tree-ent.patch
index d53516c..1dda13a 100644 (file)
--- a/target/linux/omap/patches-3.12/408-ARM-dts-am33xx-Add-mcasp0-and-mcasp1-device-tree-ent.patch
+++ b/target/linux/omap/patches-3.12/408-ARM-dts-am33xx-Add-mcasp0-and-mcasp1-device-tree-ent.patch
@@ -13,13 +13,11 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  arch/arm/boot/dts/am33xx.dtsi |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
  arch/arm/boot/dts/am33xx.dtsi |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 6eb809c..4fb3521 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -839,6 +839,25 @@
-                       clocks = <&rng_fck>;
-                       clock-names = "fck";
+@@ -726,5 +726,24 @@
+                              <&edma 5>;
+                       dma-names = "tx", "rx";

                };
 +
 +              mcasp0: mcasp@48038000 {
                };
 +
 +              mcasp0: mcasp@48038000 {


@@ -41,8 +39,4 @@ index 6eb809c..4fb3521 100644
 +              };
 +
        };
 +              };
 +
        };

- 
-       clocks {
--- 
-1.7.10.4
-
+ };

diff --git a/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch b/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch
index f0e5758..a555378 100644 (file)
--- a/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch
+++ b/target/linux/omap/patches-3.12/409-ARM-dts-am33xx-mcasp-Add-new-dma-register-location-t.patch
@@ -15,11 +15,9 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  arch/arm/boot/dts/am33xx.dtsi |   14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
  arch/arm/boot/dts/am33xx.dtsi |   14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 4fb3521..b9e2ff3 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -843,19 +843,29 @@
+@@ -730,19 +730,29 @@

                mcasp0: mcasp@48038000 {
                        compatible = "ti,omap2-mcasp-audio";
                        ti,hwmods = "mcasp0";
                mcasp0: mcasp@48038000 {
                        compatible = "ti,omap2-mcasp-audio";
                        ti,hwmods = "mcasp0";


@@ -51,6 +49,3 @@ index 4fb3521..b9e2ff3 100644
                };
  
        };
                };
  
        };

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/410-ARM-dts-am335x-evm-Add-audio-support-for-am335x-evm.patch b/target/linux/omap/patches-3.12/410-ARM-dts-am335x-evm-Add-audio-support-for-am335x-evm.patch
index 6283c94..e75d0b0 100644 (file)
--- a/target/linux/omap/patches-3.12/410-ARM-dts-am335x-evm-Add-audio-support-for-am335x-evm.patch
+++ b/target/linux/omap/patches-3.12/410-ARM-dts-am335x-evm-Add-audio-support-for-am335x-evm.patch
@@ -13,8 +13,6 @@ Signed-off-by: Jyri Sarha <jsarha@ti.com>
  arch/arm/boot/dts/am335x-evm.dts |   56 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
 
  arch/arm/boot/dts/am335x-evm.dts |   56 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
 

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index bc4a69d..664fa2a 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -149,6 +149,16 @@
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -149,6 +149,16 @@


@@ -101,6 +99,3 @@ index bc4a69d..664fa2a 100644
  &tps {
        vcc1-supply = <&vbat>;
        vcc2-supply = <&vbat>;
  &tps {
        vcc1-supply = <&vbat>;
        vcc2-supply = <&vbat>;

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/411-ARM-dts-am335x-evm-Remove-blank-lines.patch b/target/linux/omap/patches-3.12/411-ARM-dts-am335x-evm-Remove-blank-lines.patch
index 77c5006..0c005e4 100644 (file)
--- a/target/linux/omap/patches-3.12/411-ARM-dts-am335x-evm-Remove-blank-lines.patch
+++ b/target/linux/omap/patches-3.12/411-ARM-dts-am335x-evm-Remove-blank-lines.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  arch/arm/boot/dts/am335x-evm.dts |    2 --
  1 file changed, 2 deletions(-)
 
  arch/arm/boot/dts/am335x-evm.dts |    2 --
  1 file changed, 2 deletions(-)
 

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index 664fa2a..baeb805 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -266,7 +266,6 @@
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -266,7 +266,6 @@


@@ -30,6 +28,3 @@ index 664fa2a..baeb805 100644
        };
  
        vbat: fixedregulator@0 {
        };
  
        vbat: fixedregulator@0 {

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/412-ARM-dts-am335x-evm-Clarify-the-audio-codec-node.patch b/target/linux/omap/patches-3.12/412-ARM-dts-am335x-evm-Clarify-the-audio-codec-node.patch
index 53ab24e..23e39ce 100644 (file)
--- a/target/linux/omap/patches-3.12/412-ARM-dts-am335x-evm-Clarify-the-audio-codec-node.patch
+++ b/target/linux/omap/patches-3.12/412-ARM-dts-am335x-evm-Clarify-the-audio-codec-node.patch
@@ -11,8 +11,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  arch/arm/boot/dts/am335x-evm.dts |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
  arch/arm/boot/dts/am335x-evm.dts |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index baeb805..e52d09c 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -255,8 +255,8 @@
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -255,8 +255,8 @@


@@ -35,6 +33,3 @@ index baeb805..e52d09c 100644
                        ti,mcasp-controller = <&mcasp1>;
                        ti,codec-clock-rate = <12000000>;
                        ti,audio-routing =
                        ti,mcasp-controller = <&mcasp1>;
                        ti,codec-clock-rate = <12000000>;
                        ti,audio-routing =

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/413-ARM-dts-am335x-evm-Add-unique-name-for-the-sound-car.patch b/target/linux/omap/patches-3.12/413-ARM-dts-am335x-evm-Add-unique-name-for-the-sound-car.patch
index 02cf3d8..6ecbd5f 100644 (file)
--- a/target/linux/omap/patches-3.12/413-ARM-dts-am335x-evm-Add-unique-name-for-the-sound-car.patch
+++ b/target/linux/omap/patches-3.12/413-ARM-dts-am335x-evm-Add-unique-name-for-the-sound-car.patch
@@ -14,8 +14,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  arch/arm/boot/dts/am335x-evm.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
  arch/arm/boot/dts/am335x-evm.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index e52d09c..47613fd 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -365,7 +365,7 @@
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -365,7 +365,7 @@


@@ -27,6 +25,3 @@ index e52d09c..47613fd 100644
                        ti,audio-codec = <&tlv320aic3106>;
                        ti,mcasp-controller = <&mcasp1>;
                        ti,codec-clock-rate = <12000000>;
                        ti,audio-codec = <&tlv320aic3106>;
                        ti,mcasp-controller = <&mcasp1>;
                        ti,codec-clock-rate = <12000000>;

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/414-ARM-dts-am335x-evmsk-Audio-support.patch b/target/linux/omap/patches-3.12/414-ARM-dts-am335x-evmsk-Audio-support.patch
index 113e1df..d562731 100644 (file)
--- a/target/linux/omap/patches-3.12/414-ARM-dts-am335x-evmsk-Audio-support.patch
+++ b/target/linux/omap/patches-3.12/414-ARM-dts-am335x-evmsk-Audio-support.patch
@@ -15,8 +15,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  arch/arm/boot/dts/am335x-evmsk.dts |   51 ++++++++++++++++++++++++++++++++++++
  1 file changed, 51 insertions(+)
 
  arch/arm/boot/dts/am335x-evmsk.dts |   51 ++++++++++++++++++++++++++++++++++++
  1 file changed, 51 insertions(+)
 

-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index 879981d..b87ce7f 100644

 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 @@ -158,6 +158,15 @@
 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 @@ -158,6 +158,15 @@


@@ -72,9 +70,9 @@ index 879981d..b87ce7f 100644
        };
  
        vbat: fixedregulator@0 {
        };
  
        vbat: fixedregulator@0 {

-@@ -430,3 +462,22 @@
+@@ -438,3 +470,22 @@
+ &aes {

        status = "okay";
        status = "okay";

-       vmmc-supply = <&vmmc_reg>;

  };
 +
 +&mcasp1 {
  };
 +
 +&mcasp1 {


@@ -95,6 +93,3 @@ index 879981d..b87ce7f 100644
 +              tx-num-evt = <1>;
 +              rx-num-evt = <1>;
 +};
 +              tx-num-evt = <1>;
 +              rx-num-evt = <1>;
 +};

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch b/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
index e377cb2..0421b90 100644 (file)
--- a/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
+++ b/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
@@ -16,8 +16,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  sound/soc/davinci/davinci-mcasp.c                  |   22 +++++---------------
  2 files changed, 8 insertions(+), 22 deletions(-)
 
  sound/soc/davinci/davinci-mcasp.c                  |   22 +++++---------------
  2 files changed, 8 insertions(+), 22 deletions(-)
 

-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
-index 2fd0bf2..be6cf94 100644

 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -13,10 +13,9 @@ Required properties:
 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
 @@ -13,10 +13,9 @@ Required properties:


@@ -42,11 +40,9 @@ index 2fd0bf2..be6cf94 100644
        serial-dir = <
                        0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */
                        0 0 0 0
        serial-dir = <
                        0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */
                        0 0 0 0

-diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
-index acbf5f8..69e662e 100644

 --- a/sound/soc/davinci/davinci-mcasp.c
 +++ b/sound/soc/davinci/davinci-mcasp.c
 --- a/sound/soc/davinci/davinci-mcasp.c
 +++ b/sound/soc/davinci/davinci-mcasp.c

-@@ -1050,7 +1050,6 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1050,7 +1050,6 @@ static struct snd_platform_data *davinci

        struct of_phandle_args dma_spec;
  
        const u32 *of_serial_dir32;
        struct of_phandle_args dma_spec;
  
        const u32 *of_serial_dir32;


@@ -54,7 +50,7 @@ index acbf5f8..69e662e 100644
        u32 val;
        int i, ret = 0;
  
        u32 val;
        int i, ret = 0;
  

-@@ -1081,32 +1080,21 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1081,32 +1080,21 @@ static struct snd_platform_data *davinci

                pdata->tdm_slots = val;
        }
  
                pdata->tdm_slots = val;
        }
  


@@ -92,6 +88,3 @@ index acbf5f8..69e662e 100644
                pdata->serial_dir = of_serial_dir;
        }
  
                pdata->serial_dir = of_serial_dir;
        }
  

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/416-ARM-dts-am335x-evm-Remove-num-serializer-property-fo.patch b/target/linux/omap/patches-3.12/416-ARM-dts-am335x-evm-Remove-num-serializer-property-fo.patch
index b6f2e85..45fb24a 100644 (file)
--- a/target/linux/omap/patches-3.12/416-ARM-dts-am335x-evm-Remove-num-serializer-property-fo.patch
+++ b/target/linux/omap/patches-3.12/416-ARM-dts-am335x-evm-Remove-num-serializer-property-fo.patch
@@ -11,8 +11,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  arch/arm/boot/dts/am335x-evm.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
  arch/arm/boot/dts/am335x-evm.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

-diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
-index 47613fd..c4494a2 100644

 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -450,7 +450,7 @@
 --- a/arch/arm/boot/dts/am335x-evm.dts
 +++ b/arch/arm/boot/dts/am335x-evm.dts
 @@ -450,7 +450,7 @@


@@ -24,6 +22,3 @@ index 47613fd..c4494a2 100644
                serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                        0 0 1 2
                        0 0 0 0
                serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                        0 0 1 2
                        0 0 0 0

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/417-ARM-dts-am335x-evmsk-Remove-num-serializer-property.patch b/target/linux/omap/patches-3.12/417-ARM-dts-am335x-evmsk-Remove-num-serializer-property.patch
index abf7690..144a55f 100644 (file)
--- a/target/linux/omap/patches-3.12/417-ARM-dts-am335x-evmsk-Remove-num-serializer-property.patch
+++ b/target/linux/omap/patches-3.12/417-ARM-dts-am335x-evmsk-Remove-num-serializer-property.patch
@@ -11,11 +11,9 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  arch/arm/boot/dts/am335x-evmsk.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
  arch/arm/boot/dts/am335x-evmsk.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 

-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index b87ce7f..354c0e5 100644

 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts
 --- a/arch/arm/boot/dts/am335x-evmsk.dts
 +++ b/arch/arm/boot/dts/am335x-evmsk.dts

-@@ -471,7 +471,7 @@
+@@ -479,7 +479,7 @@

  
                op-mode = <0>;          /* MCASP_IIS_MODE */
                tdm-slots = <2>;
  
                op-mode = <0>;          /* MCASP_IIS_MODE */
                tdm-slots = <2>;


@@ -24,6 +22,3 @@ index b87ce7f..354c0e5 100644
                serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                        0 0 1 2
                        0 0 0 0
                serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                        0 0 1 2
                        0 0 0 0

--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/500-ARM-dts-AM33XX-Add-LCDC-info-into-am335x-evm.patch b/target/linux/omap/patches-3.12/500-ARM-dts-AM33XX-Add-LCDC-info-into-am335x-evm.patch
index 6542010..1eb8d2e 100644 (file)
--- a/target/linux/omap/patches-3.12/500-ARM-dts-AM33XX-Add-LCDC-info-into-am335x-evm.patch
+++ b/target/linux/omap/patches-3.12/500-ARM-dts-AM33XX-Add-LCDC-info-into-am335x-evm.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -682,6 +682,15 @@
+@@ -678,6 +678,15 @@

                        status = "disabled";
                };
  
                        status = "disabled";
                };
  

diff --git a/target/linux/omap/patches-3.12/600-crypto-omap-des-Add-omap-des-driver-for-OMAP4-AM43xx.patch b/target/linux/omap/patches-3.12/600-crypto-omap-des-Add-omap-des-driver-for-OMAP4-AM43xx.patch
index 14e3fbe..e78b215 100644 (file)
--- a/target/linux/omap/patches-3.12/600-crypto-omap-des-Add-omap-des-driver-for-OMAP4-AM43xx.patch
+++ b/target/linux/omap/patches-3.12/600-crypto-omap-des-Add-omap-des-driver-for-OMAP4-AM43xx.patch
@@ -33,9 +33,6 @@ drivers/crypto/omap-des.c | 1192 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 1192 insertions(+)
  create mode 100644 drivers/crypto/omap-des.c
 
  1 file changed, 1192 insertions(+)
  create mode 100644 drivers/crypto/omap-des.c
 

-diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
-new file mode 100644
-index 0000000..6a9a25f

 --- /dev/null
 +++ b/drivers/crypto/omap-des.c
 @@ -0,0 +1,1192 @@
 --- /dev/null
 +++ b/drivers/crypto/omap-des.c
 @@ -0,0 +1,1192 @@

diff --git a/target/linux/omap/patches-3.12/601-crypto-omap-des-Add-config-and-build-options.patch b/target/linux/omap/patches-3.12/601-crypto-omap-des-Add-config-and-build-options.patch
index 495e1a2..8ce6ec8 100644 (file)
--- a/target/linux/omap/patches-3.12/601-crypto-omap-des-Add-config-and-build-options.patch
+++ b/target/linux/omap/patches-3.12/601-crypto-omap-des-Add-config-and-build-options.patch
@@ -25,11 +25,9 @@ drivers/crypto/Kconfig  | 11 +++++++++++
  drivers/crypto/Makefile |  1 +
  2 files changed, 12 insertions(+)
 
  drivers/crypto/Makefile |  1 +
  2 files changed, 12 insertions(+)
 

-diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
-index e289afa..119a8e5 100644

 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig

-@@ -259,6 +259,17 @@ config CRYPTO_DEV_OMAP_AES
+@@ -263,6 +263,17 @@ config CRYPTO_DEV_OMAP_AES

          OMAP processors have AES module accelerator. Select this if you
          want to use the OMAP module for AES algorithms.
  
          OMAP processors have AES module accelerator. Select this if you
          want to use the OMAP module for AES algorithms.
  


@@ -47,15 +45,13 @@ index e289afa..119a8e5 100644
  config CRYPTO_DEV_PICOXCELL
        tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
        depends on ARCH_PICOXCELL && HAVE_CLK
  config CRYPTO_DEV_PICOXCELL
        tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
        depends on ARCH_PICOXCELL && HAVE_CLK

-diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
-index 38ce13d..ada440f 100644

 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile

-@@ -11,6 +11,7 @@ obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
+@@ -11,6 +11,7 @@ obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4x

  obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/
  obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
  obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
 +obj-$(CONFIG_CRYPTO_DEV_OMAP_DES) += omap-des.o
  obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
  obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
  obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/
  obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
  obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
 +obj-$(CONFIG_CRYPTO_DEV_OMAP_DES) += omap-des.o
  obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
  obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o

- obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
+ obj-$(CONFIG_CRYPTO_DEV_DCP) += dcp.o

diff --git a/target/linux/omap/patches-3.12/602-crypto-omap-des-Add-triple-DES-des3_ede-support-to-driver.patch b/target/linux/omap/patches-3.12/602-crypto-omap-des-Add-triple-DES-des3_ede-support-to-driver.patch
index f94e0f5..06d96b1 100644 (file)
--- a/target/linux/omap/patches-3.12/602-crypto-omap-des-Add-triple-DES-des3_ede-support-to-driver.patch
+++ b/target/linux/omap/patches-3.12/602-crypto-omap-des-Add-triple-DES-des3_ede-support-to-driver.patch
@@ -25,8 +25,6 @@ Signed-off-by: Joel Fernandes <joelf@ti.com>
 drivers/crypto/omap-des.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 50 insertions(+), 3 deletions(-)
 
 drivers/crypto/omap-des.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 50 insertions(+), 3 deletions(-)
 

-diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
-index 6a9a25f..0df60cb 100644

 --- a/drivers/crypto/omap-des.c
 +++ b/drivers/crypto/omap-des.c
 @@ -83,7 +83,7 @@ struct omap_des_ctx {
 --- a/drivers/crypto/omap-des.c
 +++ b/drivers/crypto/omap-des.c
 @@ -83,7 +83,7 @@ struct omap_des_ctx {


@@ -38,7 +36,7 @@ index 6a9a25f..0df60cb 100644
        unsigned long   flags;
  };
  
        unsigned long   flags;
  };
  

-@@ -265,8 +265,10 @@ static int omap_des_write_ctrl(struct omap_des_dev *dd)
+@@ -265,8 +265,10 @@ static int omap_des_write_ctrl(struct om

                val |= DES_REG_CTRL_CBC;
        if (dd->flags & FLAGS_ENCRYPT)
                val |= DES_REG_CTRL_DIRECTION;
                val |= DES_REG_CTRL_CBC;
        if (dd->flags & FLAGS_ENCRYPT)
                val |= DES_REG_CTRL_DIRECTION;


@@ -50,7 +48,7 @@ index 6a9a25f..0df60cb 100644
  
        omap_des_write_mask(dd, DES_REG_CTRL(dd), val, mask);
  
  
        omap_des_write_mask(dd, DES_REG_CTRL(dd), val, mask);
  

-@@ -725,7 +727,7 @@ static int omap_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
+@@ -725,7 +727,7 @@ static int omap_des_setkey(struct crypto

  {
        struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(tfm);
  
  {
        struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(tfm);
  


@@ -59,10 +57,12 @@ index 6a9a25f..0df60cb 100644
                return -EINVAL;
  
        pr_debug("enter, keylen: %d\n", keylen);
                return -EINVAL;
  
        pr_debug("enter, keylen: %d\n", keylen);

-@@ -817,6 +819,51 @@ static struct crypto_alg algs_ecb_cbc[] = {
+@@ -815,6 +817,51 @@ static struct crypto_alg algs_ecb_cbc[]
+               .ivsize         = DES_BLOCK_SIZE,
+               .setkey         = omap_des_setkey,

                .encrypt        = omap_des_cbc_encrypt,
                .encrypt        = omap_des_cbc_encrypt,

-               .decrypt        = omap_des_cbc_decrypt,
-       }
++              .decrypt        = omap_des_cbc_decrypt,
++      }

 +},
 +{
 +      .cra_name               = "ecb(des3_ede)",
 +},
 +{
 +      .cra_name               = "ecb(des3_ede)",


@@ -106,8 +106,6 @@ index 6a9a25f..0df60cb 100644
 +              .ivsize         = DES_BLOCK_SIZE,
 +              .setkey         = omap_des_setkey,
 +              .encrypt        = omap_des_cbc_encrypt,
 +              .ivsize         = DES_BLOCK_SIZE,
 +              .setkey         = omap_des_setkey,
 +              .encrypt        = omap_des_cbc_encrypt,

-+              .decrypt        = omap_des_cbc_decrypt,
-+      }
+               .decrypt        = omap_des_cbc_decrypt,
+       }

  }
  }

- };
- 

diff --git a/target/linux/omap/patches-3.12/797-ARM_dts_omap4-panda-es_Do_not_reset_gpio1.patch b/target/linux/omap/patches-3.12/797-ARM_dts_omap4-panda-es_Do_not_reset_gpio1.patch
index 580bcce..0bd80e2 100644 (file)
--- a/target/linux/omap/patches-3.12/797-ARM_dts_omap4-panda-es_Do_not_reset_gpio1.patch
+++ b/target/linux/omap/patches-3.12/797-ARM_dts_omap4-panda-es_Do_not_reset_gpio1.patch
@@ -14,8 +14,6 @@ is not sufficient to operate the device at OPP100.
 Signed-off-by: Nishanth Menon <nm@ti.com>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---
 Signed-off-by: Nishanth Menon <nm@ti.com>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---

-diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts
-index 56c4354..816d1c9 100644

 --- a/arch/arm/boot/dts/omap4-panda-es.dts
 +++ b/arch/arm/boot/dts/omap4-panda-es.dts
 @@ -62,3 +62,7 @@
 --- a/arch/arm/boot/dts/omap4-panda-es.dts
 +++ b/arch/arm/boot/dts/omap4-panda-es.dts
 @@ -62,3 +62,7 @@


@@ -26,5 +24,3 @@ index 56c4354..816d1c9 100644
 +&gpio1 {
 +       ti,no-reset-on-init;
 +};
 +&gpio1 {
 +       ti,no-reset-on-init;
 +};

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch b/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch
index a6c80a2..ca92faa 100644 (file)
--- a/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch
+++ b/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch
@@ -11,11 +11,9 @@ Cc: stable@vger.kernel.org
 Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---
 Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---

-diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
-index 3926f37..e022a86 100644

 --- a/arch/arm/mach-omap2/irq.c
 +++ b/arch/arm/mach-omap2/irq.c
 --- a/arch/arm/mach-omap2/irq.c
 +++ b/arch/arm/mach-omap2/irq.c

-@@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
+@@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(

                        goto out;
  
                irqnr = readl_relaxed(base_addr + 0xd8);
                        goto out;
  
                irqnr = readl_relaxed(base_addr + 0xd8);


@@ -24,5 +22,3 @@ index 3926f37..e022a86 100644
                if (irqnr)
                        goto out;
                irqnr = readl_relaxed(base_addr + 0xf8);
                if (irqnr)
                        goto out;
                irqnr = readl_relaxed(base_addr + 0xf8);

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/801-ARM_dts_am33xx_change_usb_ctrl_module_label.patch b/target/linux/omap/patches-3.12/801-ARM_dts_am33xx_change_usb_ctrl_module_label.patch
index 590fe5f..83ecdf9 100644 (file)
--- a/target/linux/omap/patches-3.12/801-ARM_dts_am33xx_change_usb_ctrl_module_label.patch
+++ b/target/linux/omap/patches-3.12/801-ARM_dts_am33xx_change_usb_ctrl_module_label.patch
@@ -9,11 +9,9 @@ Changes the label to usb_ctrl_mod.
 Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---
 Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 97f5019..0ca13ad 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -416,7 +416,7 @@
+@@ -406,7 +406,7 @@

                        ti,hwmods = "usb_otg_hs";
                        status = "disabled";
  
                        ti,hwmods = "usb_otg_hs";
                        status = "disabled";
  


@@ -22,7 +20,7 @@ index 97f5019..0ca13ad 100644
                                compatible = "ti,am335x-usb-ctrl-module";
                                reg = <0x44e10620 0x10
                                        0x44e10648 0x4>;
                                compatible = "ti,am335x-usb-ctrl-module";
                                reg = <0x44e10620 0x10
                                        0x44e10648 0x4>;

-@@ -429,7 +429,7 @@
+@@ -419,7 +419,7 @@

                                reg = <0x47401300 0x100>;
                                reg-names = "phy";
                                status = "disabled";
                                reg = <0x47401300 0x100>;
                                reg-names = "phy";
                                status = "disabled";


@@ -31,7 +29,7 @@ index 97f5019..0ca13ad 100644
                        };
  
                        usb0: usb@47401000 {
                        };
  
                        usb0: usb@47401000 {

-@@ -477,7 +477,7 @@
+@@ -467,7 +467,7 @@

                                reg = <0x47401b00 0x100>;
                                reg-names = "phy";
                                status = "disabled";
                                reg = <0x47401b00 0x100>;
                                reg-names = "phy";
                                status = "disabled";


@@ -40,5 +38,3 @@ index 97f5019..0ca13ad 100644
                        };
  
                        usb1: usb@47401800 {
                        };
  
                        usb1: usb@47401800 {

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not register_non-dt_OPP_tables_for_device_tree_boot.patch b/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not register_non-dt_OPP_tables_for_device_tree_boot.patch
deleted file mode 100644 (file)
index 48bd156..0000000
--- a/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not register_non-dt_OPP_tables_for_device_tree_boot.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 92d51856d7405fa55bcf3d6f20d7e97e0bf2656c Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-Date: Wed, 16 Oct 2013 15:39:01 +0000
-Subject: ARM: OMAP3+: do not register non-dt OPP tables for device tree boot
-
-OMAP3+ supports both device tree and non-device tree boot.
-Device tree bindings for OMAP3+ is supposed to be added via dts following:
-Documentation/devicetree/bindings/power/opp.txt
-
-Since we now have device tree entries for OMAP3+ cpu OPPs,
-The current code wrongly adds duplicate OPPs. So, dont register OPPs
-when booting using device tree.
-
-Signed-off-by: Nishanth Menon <nm@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
----
-diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c
-index bd41d59..82fd8c7 100644
---- a/arch/arm/mach-omap2/opp.c
-+++ b/arch/arm/mach-omap2/opp.c
-@@ -17,6 +17,7 @@
-  * GNU General Public License for more details.
-  */
- #include <linux/module.h>
-+#include <linux/of.h>
- #include <linux/opp.h>
- #include <linux/cpu.h>
- 
-@@ -40,6 +41,9 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
- {
-       int i, r;
- 
-+      if (of_have_populated_dt())
-+              return -EINVAL;
-+
-       if (!opp_def || !opp_def_size) {
-               pr_err("%s: invalid params!\n", __func__);
-               return -EINVAL;
---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch b/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch
new file mode 100644 (file)
index 0000000..4dc5f00
--- /dev/null
+++ b/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch
@@ -0,0 +1,36 @@
+From 92d51856d7405fa55bcf3d6f20d7e97e0bf2656c Mon Sep 17 00:00:00 2001
+From: Nishanth Menon <nm@ti.com>
+Date: Wed, 16 Oct 2013 15:39:01 +0000
+Subject: ARM: OMAP3+: do not register non-dt OPP tables for device tree boot
+
+OMAP3+ supports both device tree and non-device tree boot.
+Device tree bindings for OMAP3+ is supposed to be added via dts following:
+Documentation/devicetree/bindings/power/opp.txt
+
+Since we now have device tree entries for OMAP3+ cpu OPPs,
+The current code wrongly adds duplicate OPPs. So, dont register OPPs
+when booting using device tree.
+
+Signed-off-by: Nishanth Menon <nm@ti.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+---
+--- a/arch/arm/mach-omap2/opp.c
++++ b/arch/arm/mach-omap2/opp.c
+@@ -17,6 +17,7 @@
+  * GNU General Public License for more details.
+  */
+ #include <linux/module.h>
++#include <linux/of.h>
+ #include <linux/opp.h>
+ #include <linux/cpu.h>
+ 
+@@ -40,6 +41,9 @@ int __init omap_init_opp_table(struct om
+ {
+       int i, r;
+ 
++      if (of_have_populated_dt())
++              return -EINVAL;
++
+       if (!opp_def || !opp_def_size) {
+               pr_err("%s: invalid params!\n", __func__);
+               return -EINVAL;

diff --git a/target/linux/omap/patches-3.12/803-ARM_OMAP2plus_add_missing_lateinit_hook_for_calling_pm_late_init.patch b/target/linux/omap/patches-3.12/803-ARM_OMAP2plus_add_missing_lateinit_hook_for_calling_pm_late_init.patch
index 052d364..6db20da 100644 (file)
--- a/target/linux/omap/patches-3.12/803-ARM_OMAP2plus_add_missing_lateinit_hook_for_calling_pm_late_init.patch
+++ b/target/linux/omap/patches-3.12/803-ARM_OMAP2plus_add_missing_lateinit_hook_for_calling_pm_late_init.patch
@@ -19,11 +19,9 @@ Cc: Tony Lindgren <tony@atomide.com>
 Signed-off-by: Nishanth Menon <nm@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---
 Signed-off-by: Nishanth Menon <nm@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---

-diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
-index 3896b12..19f1652 100644

 --- a/arch/arm/mach-omap2/board-generic.c
 +++ b/arch/arm/mach-omap2/board-generic.c
 --- a/arch/arm/mach-omap2/board-generic.c
 +++ b/arch/arm/mach-omap2/board-generic.c

-@@ -146,6 +146,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
+@@ -180,6 +180,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM3

        .init_irq       = omap_intc_of_init,
        .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_generic_init,
        .init_irq       = omap_intc_of_init,
        .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap_generic_init,


@@ -31,7 +29,7 @@ index 3896b12..19f1652 100644
        .init_time      = omap3_gptimer_timer_init,
        .dt_compat      = am33xx_boards_compat,
        .restart        = am33xx_restart,
        .init_time      = omap3_gptimer_timer_init,
        .dt_compat      = am33xx_boards_compat,
        .restart        = am33xx_restart,

-@@ -185,6 +186,7 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")
+@@ -219,6 +220,7 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP

        .init_early     = omap5_init_early,
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,
        .init_early     = omap5_init_early,
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,


@@ -39,7 +37,7 @@ index 3896b12..19f1652 100644
        .init_time      = omap5_realtime_timer_init,
        .dt_compat      = omap5_boards_compat,
        .restart        = omap44xx_restart,
        .init_time      = omap5_realtime_timer_init,
        .dt_compat      = omap5_boards_compat,
        .restart        = omap44xx_restart,

-@@ -200,6 +202,7 @@ static const char *am43_boards_compat[] __initdata = {
+@@ -234,6 +236,7 @@ static const char *am43_boards_compat[]

  DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
        .map_io         = am33xx_map_io,
        .init_early     = am43xx_init_early,
  DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
        .map_io         = am33xx_map_io,
        .init_early     = am43xx_init_early,


@@ -47,7 +45,7 @@ index 3896b12..19f1652 100644
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,
        .init_time      = omap3_sync32k_timer_init,
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,
        .init_time      = omap3_sync32k_timer_init,

-@@ -218,6 +221,7 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)")
+@@ -252,6 +255,7 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA

        .smp            = smp_ops(omap4_smp_ops),
        .map_io         = omap5_map_io,
        .init_early     = dra7xx_init_early,
        .smp            = smp_ops(omap4_smp_ops),
        .map_io         = omap5_map_io,
        .init_early     = dra7xx_init_early,


@@ -55,8 +53,6 @@ index 3896b12..19f1652 100644
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,
        .init_time      = omap5_realtime_timer_init,
        .init_irq       = omap_gic_of_init,
        .init_machine   = omap_generic_init,
        .init_time      = omap5_realtime_timer_init,

-diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
-index c6aebf0..f7644fe 100644

 --- a/arch/arm/mach-omap2/common.h
 +++ b/arch/arm/mach-omap2/common.h
 @@ -98,6 +98,7 @@ void am35xx_init_early(void);
 --- a/arch/arm/mach-omap2/common.h
 +++ b/arch/arm/mach-omap2/common.h
 @@ -98,6 +98,7 @@ void am35xx_init_early(void);


@@ -79,8 +75,6 @@ index c6aebf0..f7644fe 100644
  
  #ifdef CONFIG_SOC_BUS
  void omap_soc_device_init(void);
  
  #ifdef CONFIG_SOC_BUS
  void omap_soc_device_init(void);

-diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
-index ff2113c..a2cbb44 100644

 --- a/arch/arm/mach-omap2/io.c
 +++ b/arch/arm/mach-omap2/io.c
 @@ -583,6 +583,11 @@ void __init am33xx_init_early(void)
 --- a/arch/arm/mach-omap2/io.c
 +++ b/arch/arm/mach-omap2/io.c
 @@ -583,6 +583,11 @@ void __init am33xx_init_early(void)


@@ -131,5 +125,3 @@ index ff2113c..a2cbb44 100644
  #endif
  
  
  #endif
  
  

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch b/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch
index 600fd1a..27b7854 100644 (file)
--- a/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch
+++ b/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch
@@ -14,11 +14,9 @@ Cc: Tony Lindgren <tony@atomide.com>
 Signed-off-by: Nishanth Menon <nm@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---
 Signed-off-by: Nishanth Menon <nm@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---

-diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
-index e742118..360b2da 100644

 --- a/arch/arm/mach-omap2/pm.c
 +++ b/arch/arm/mach-omap2/pm.c
 --- a/arch/arm/mach-omap2/pm.c
 +++ b/arch/arm/mach-omap2/pm.c

-@@ -266,7 +266,12 @@ static void __init omap4_init_voltages(void)
+@@ -266,7 +266,12 @@ static void __init omap4_init_voltages(v

  
  static inline void omap_init_cpufreq(void)
  {
  
  static inline void omap_init_cpufreq(void)
  {


@@ -32,7 +30,7 @@ index e742118..360b2da 100644
        platform_device_register_full(&devinfo);
  }
  
        platform_device_register_full(&devinfo);
  }
  

-@@ -300,10 +305,11 @@ int __init omap2_common_pm_late_init(void)
+@@ -300,10 +305,11 @@ int __init omap2_common_pm_late_init(voi

                /* Smartreflex device init */
                omap_devinit_smartreflex();
  
                /* Smartreflex device init */
                omap_devinit_smartreflex();
  


@@ -46,5 +44,3 @@ index e742118..360b2da 100644
  #ifdef CONFIG_SUSPEND
        suspend_set_ops(&omap_pm_ops);
  #endif
  #ifdef CONFIG_SUSPEND
        suspend_set_ops(&omap_pm_ops);
  #endif

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/805-ARM_dts_TWL4030_Add_missing_regulators.patch b/target/linux/omap/patches-3.12/805-ARM_dts_TWL4030_Add_missing_regulators.patch
index 22d6f95..5d37363 100644 (file)
--- a/target/linux/omap/patches-3.12/805-ARM_dts_TWL4030_Add_missing_regulators.patch
+++ b/target/linux/omap/patches-3.12/805-ARM_dts_TWL4030_Add_missing_regulators.patch
@@ -9,8 +9,6 @@ the missing ones and orders the regulators alphabetically.
 Signed-off-by: Sebastian Reichel <sre@debian.org>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---
 Signed-off-by: Sebastian Reichel <sre@debian.org>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---

-diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
-index ae6a17a..cb5afcd 100644

 --- a/arch/arm/boot/dts/twl4030.dtsi
 +++ b/arch/arm/boot/dts/twl4030.dtsi
 @@ -23,6 +23,22 @@
 --- a/arch/arm/boot/dts/twl4030.dtsi
 +++ b/arch/arm/boot/dts/twl4030.dtsi
 @@ -23,6 +23,22 @@


@@ -78,5 +76,3 @@ index ae6a17a..cb5afcd 100644
        vsim: regulator-vsim {
                compatible = "ti,twl4030-vsim";
                regulator-min-microvolt = <1800000>;
        vsim: regulator-vsim {
                compatible = "ti,twl4030-vsim";
                regulator-min-microvolt = <1800000>;

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/806-ARM_dts_TWL4030_Add_power_button_support.patch b/target/linux/omap/patches-3.12/806-ARM_dts_TWL4030_Add_power_button_support.patch
index a47a822..d89e4bf 100644 (file)
--- a/target/linux/omap/patches-3.12/806-ARM_dts_TWL4030_Add_power_button_support.patch
+++ b/target/linux/omap/patches-3.12/806-ARM_dts_TWL4030_Add_power_button_support.patch
@@ -8,8 +8,6 @@ Enable support for the power button.
 Signed-off-by: Sebastian Reichel <sre@debian.org>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---
 Signed-off-by: Sebastian Reichel <sre@debian.org>
 Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
 ---

-diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
-index cb5afcd..af7fa40 100644

 --- a/arch/arm/boot/dts/twl4030.dtsi
 +++ b/arch/arm/boot/dts/twl4030.dtsi
 @@ -133,4 +133,9 @@
 --- a/arch/arm/boot/dts/twl4030.dtsi
 +++ b/arch/arm/boot/dts/twl4030.dtsi
 @@ -133,4 +133,9 @@


@@ -22,5 +20,3 @@ index cb5afcd..af7fa40 100644
 +              interrupts = <8>;
 +      };
  };
 +              interrupts = <8>;
 +      };
  };

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/807-ARM_dts_AM33XX_Add_hwspinlock_node.patch b/target/linux/omap/patches-3.12/807-ARM_dts_AM33XX_Add_hwspinlock_node.patch
index 2815a70..20a660f 100644 (file)
--- a/target/linux/omap/patches-3.12/807-ARM_dts_AM33XX_Add_hwspinlock_node.patch
+++ b/target/linux/omap/patches-3.12/807-ARM_dts_AM33XX_Add_hwspinlock_node.patch
@@ -9,11 +9,9 @@ of SoCs.
 Signed-off-by: Suman Anna <s-anna@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---
 Signed-off-by: Suman Anna <s-anna@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 0ca13ad..9ae258e 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -288,6 +288,12 @@
+@@ -278,6 +278,12 @@

                        status = "disabled";
                };
  
                        status = "disabled";
                };
  


@@ -26,5 +24,3 @@ index 0ca13ad..9ae258e 100644
                wdt2: wdt@44e35000 {
                        compatible = "ti,omap3-wdt";
                        ti,hwmods = "wd_timer2";
                wdt2: wdt@44e35000 {
                        compatible = "ti,omap3-wdt";
                        ti,hwmods = "wd_timer2";

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/808-ARM_dts_AM33xx_Add_RNG_node.patch b/target/linux/omap/patches-3.12/808-ARM_dts_AM33xx_Add_RNG_node.patch
index 8b3603f..a84185b 100644 (file)
--- a/target/linux/omap/patches-3.12/808-ARM_dts_AM33xx_Add_RNG_node.patch
+++ b/target/linux/omap/patches-3.12/808-ARM_dts_AM33xx_Add_RNG_node.patch
@@ -10,9 +10,6 @@ for the RNG module.
 Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---
 Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---

-diff --git a/Documentation/devicetree/bindings/hwrng/omap_rng.txt b/Documentation/devicetree/bindings/hwrng/omap_rng.txt
-new file mode 100644
-index 0000000..6a62acd

 --- /dev/null
 +++ b/Documentation/devicetree/bindings/hwrng/omap_rng.txt
 @@ -0,0 +1,22 @@
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/hwrng/omap_rng.txt
 @@ -0,0 +1,22 @@


@@ -38,23 +35,18 @@ index 0000000..6a62acd
 +      reg = <0x48310000 0x2000>;
 +      interrupts = <111>;
 +};
 +      reg = <0x48310000 0x2000>;
 +      interrupts = <111>;
 +};

-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 9ae258e..fcb9c8e 100644

 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi
 --- a/arch/arm/boot/dts/am33xx.dtsi
 +++ b/arch/arm/boot/dts/am33xx.dtsi

-@@ -750,5 +750,12 @@
-                               <&edma 11>;
+@@ -770,5 +770,12 @@

                        dma-names = "tx", "rx";
                };
                        dma-names = "tx", "rx";
                };

-+
+ 

 +              rng: rng@48310000 {
 +                      compatible = "ti,omap4-rng";
 +                      ti,hwmods = "rng";
 +                      reg = <0x48310000 0x2000>;
 +                      interrupts = <111>;
 +              };
 +              rng: rng@48310000 {
 +                      compatible = "ti,omap4-rng";
 +                      ti,hwmods = "rng";
 +                      reg = <0x48310000 0x2000>;
 +                      interrupts = <111>;
 +              };

- 
++

        };
  };
        };
  };

---
-cgit v0.9.2

diff --git a/target/linux/omap/patches-3.12/900-arm-dts-am335x-evmsk-add-support-for-lcd-panel.patch b/target/linux/omap/patches-3.12/900-arm-dts-am335x-evmsk-add-support-for-lcd-panel.patch
deleted file mode 100644 (file)
index 0a2c1c2..0000000
--- a/target/linux/omap/patches-3.12/900-arm-dts-am335x-evmsk-add-support-for-lcd-panel.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 157c4071cb8a588c4e619b69447010a0ee68d844 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Thu, 17 Oct 2013 14:53:37 -0500
-Subject: [PATCH 568/752] arm: dts: am335x-evmsk: add support for lcd panel
-
-Add the necessary DT entries for probing the LCDC in fbdev and
-setting the correct timings for the NHD-4.3 LCD panel.
----
- arch/arm/boot/dts/am335x-evmsk.dts |   54 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 54 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index 354c0e5..ae18889 100644
---- a/arch/arm/boot/dts/am335x-evmsk.dts
-+++ b/arch/arm/boot/dts/am335x-evmsk.dts
-@@ -35,6 +35,39 @@
-               pinctrl-names = "default";
-               pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
- 
-+              lcd_pins_s0: lcd_pins_s0 {
-+                      pinctrl-single,pins = <
-+                              0x20 0x01       /* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */
-+                              0x24 0x01       /* gpmc_ad9.lcd_data17, OUTPUT | MODE1 */
-+                              0x28 0x01       /* gpmc_ad10.lcd_data18, OUTPUT | MODE1 */
-+                              0x2c 0x01       /* gpmc_ad11.lcd_data19, OUTPUT | MODE1 */
-+                              0x30 0x01       /* gpmc_ad12.lcd_data20, OUTPUT | MODE1 */
-+                              0x34 0x01       /* gpmc_ad13.lcd_data21, OUTPUT | MODE1 */
-+                              0x38 0x01       /* gpmc_ad14.lcd_data22, OUTPUT | MODE1 */
-+                              0x3c 0x01       /* gpmc_ad15.lcd_data23, OUTPUT | MODE1 */
-+                              0xa0 0x00       /* lcd_data0.lcd_data0, OUTPUT | MODE0 */
-+                              0xa4 0x00       /* lcd_data1.lcd_data1, OUTPUT | MODE0 */
-+                              0xa8 0x00       /* lcd_data2.lcd_data2, OUTPUT | MODE0 */
-+                              0xac 0x00       /* lcd_data3.lcd_data3, OUTPUT | MODE0 */
-+                              0xb0 0x00       /* lcd_data4.lcd_data4, OUTPUT | MODE0 */
-+                              0xb4 0x00       /* lcd_data5.lcd_data5, OUTPUT | MODE0 */
-+                              0xb8 0x00       /* lcd_data6.lcd_data6, OUTPUT | MODE0 */
-+                              0xbc 0x00       /* lcd_data7.lcd_data7, OUTPUT | MODE0 */
-+                              0xc0 0x00       /* lcd_data8.lcd_data8, OUTPUT | MODE0 */
-+                              0xc4 0x00       /* lcd_data9.lcd_data9, OUTPUT | MODE0 */
-+                              0xc8 0x00       /* lcd_data10.lcd_data10, OUTPUT | MODE0 */
-+                              0xcc 0x00       /* lcd_data11.lcd_data11, OUTPUT | MODE0 */
-+                              0xd0 0x00       /* lcd_data12.lcd_data12, OUTPUT | MODE0 */
-+                              0xd4 0x00       /* lcd_data13.lcd_data13, OUTPUT | MODE0 */
-+                              0xd8 0x00       /* lcd_data14.lcd_data14, OUTPUT | MODE0 */
-+                              0xdc 0x00       /* lcd_data15.lcd_data15, OUTPUT | MODE0 */
-+                              0xe0 0x00       /* lcd_vsync.lcd_vsync, OUTPUT | MODE0 */
-+                              0xe4 0x00       /* lcd_hsync.lcd_hsync, OUTPUT | MODE0 */
-+                              0xe8 0x00       /* lcd_pclk.lcd_pclk, OUTPUT | MODE0 */
-+                              0xec 0x00       /* lcd_ac_bias_en.lcd_ac_bias_en, OUTPUT | MODE0 */
-+                      >;
-+              };
-+
-               user_leds_s0: user_leds_s0 {
-                       pinctrl-single,pins = <
-                               0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad4.gpio1_4 */
-@@ -255,6 +288,27 @@
-                       };
-               };
- 
-+              lcdc: lcdc@4830e000 {
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&lcd_pins_s0>;
-+                      status = "okay";
-+                      display-timings {
-+                              480x272 {
-+                                      hactive         = <480>;
-+                                      vactive         = <272>;
-+                                      hback-porch     = <43>;
-+                                      hfront-porch    = <8>;
-+                                      hsync-len       = <4>;
-+                                      vback-porch     = <12>;
-+                                      vfront-porch    = <4>;
-+                                      vsync-len       = <10>;
-+                                      clock-frequency = <9000000>;
-+                                      hsync-active    = <0>;
-+                                      vsync-active    = <0>;
-+                              };
-+                      };
-+              };
-+
-               sound {
-                       compatible = "ti,da830-evm-audio";
-                       ti,model = "AM335x-EVMSK";
--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/901-arm-dts-am335x-sk-add-touchscreen-support.patch b/target/linux/omap/patches-3.12/901-arm-dts-am335x-sk-add-touchscreen-support.patch
deleted file mode 100644 (file)
index ed62006..0000000
--- a/target/linux/omap/patches-3.12/901-arm-dts-am335x-sk-add-touchscreen-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 588b7a5db74c02bcf0b3ac57b6391debffbff74c Mon Sep 17 00:00:00 2001
-From: Felipe Balbi <balbi@ti.com>
-Date: Mon, 21 Oct 2013 15:06:54 -0500
-Subject: [PATCH 582/752] arm: dts: am335x sk: add touchscreen support
-
-Add missing nodes for the touchscreen available
-on AM335x EVM SK.
-
-Signed-off-by: Felipe Balbi <balbi@ti.com>
----
- arch/arm/boot/dts/am335x-evmsk.dts |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
-index 7fae4e0..ddbf6ca 100644
---- a/arch/arm/boot/dts/am335x-evmsk.dts
-+++ b/arch/arm/boot/dts/am335x-evmsk.dts
-@@ -454,6 +454,16 @@
-       phy-mode = "rgmii-txid";
- };
- 
-+&tscadc {
-+      status = "okay";
-+      tsc {
-+              ti,wires = <4>;
-+              ti,x-plate-resistance = <200>;
-+              ti,coordinate-readouts = <5>;
-+              ti,wire-config = <0x00 0x11 0x22 0x33>;
-+      };
-+};
-+
- &gpio0 {
-       ti,no-reset;
- };
--- 
-1.7.10.4
-

diff --git a/target/linux/omap/patches-3.12/920-arm-dts-am335x-evmsk-add-support-for-lcd-panel.patch b/target/linux/omap/patches-3.12/920-arm-dts-am335x-evmsk-add-support-for-lcd-panel.patch
new file mode 100644 (file)
index 0000000..3ec48a5
--- /dev/null
+++ b/target/linux/omap/patches-3.12/920-arm-dts-am335x-evmsk-add-support-for-lcd-panel.patch
@@ -0,0 +1,81 @@
+From 157c4071cb8a588c4e619b69447010a0ee68d844 Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Thu, 17 Oct 2013 14:53:37 -0500
+Subject: [PATCH 568/752] arm: dts: am335x-evmsk: add support for lcd panel
+
+Add the necessary DT entries for probing the LCDC in fbdev and
+setting the correct timings for the NHD-4.3 LCD panel.
+---
+ arch/arm/boot/dts/am335x-evmsk.dts |   54 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 54 insertions(+)
+
+--- a/arch/arm/boot/dts/am335x-evmsk.dts
++++ b/arch/arm/boot/dts/am335x-evmsk.dts
+@@ -35,6 +35,39 @@
+               pinctrl-names = "default";
+               pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
+ 
++              lcd_pins_s0: lcd_pins_s0 {
++                      pinctrl-single,pins = <
++                              0x20 0x01       /* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */
++                              0x24 0x01       /* gpmc_ad9.lcd_data17, OUTPUT | MODE1 */
++                              0x28 0x01       /* gpmc_ad10.lcd_data18, OUTPUT | MODE1 */
++                              0x2c 0x01       /* gpmc_ad11.lcd_data19, OUTPUT | MODE1 */
++                              0x30 0x01       /* gpmc_ad12.lcd_data20, OUTPUT | MODE1 */
++                              0x34 0x01       /* gpmc_ad13.lcd_data21, OUTPUT | MODE1 */
++                              0x38 0x01       /* gpmc_ad14.lcd_data22, OUTPUT | MODE1 */
++                              0x3c 0x01       /* gpmc_ad15.lcd_data23, OUTPUT | MODE1 */
++                              0xa0 0x00       /* lcd_data0.lcd_data0, OUTPUT | MODE0 */
++                              0xa4 0x00       /* lcd_data1.lcd_data1, OUTPUT | MODE0 */
++                              0xa8 0x00       /* lcd_data2.lcd_data2, OUTPUT | MODE0 */
++                              0xac 0x00       /* lcd_data3.lcd_data3, OUTPUT | MODE0 */
++                              0xb0 0x00       /* lcd_data4.lcd_data4, OUTPUT | MODE0 */
++                              0xb4 0x00       /* lcd_data5.lcd_data5, OUTPUT | MODE0 */
++                              0xb8 0x00       /* lcd_data6.lcd_data6, OUTPUT | MODE0 */
++                              0xbc 0x00       /* lcd_data7.lcd_data7, OUTPUT | MODE0 */
++                              0xc0 0x00       /* lcd_data8.lcd_data8, OUTPUT | MODE0 */
++                              0xc4 0x00       /* lcd_data9.lcd_data9, OUTPUT | MODE0 */
++                              0xc8 0x00       /* lcd_data10.lcd_data10, OUTPUT | MODE0 */
++                              0xcc 0x00       /* lcd_data11.lcd_data11, OUTPUT | MODE0 */
++                              0xd0 0x00       /* lcd_data12.lcd_data12, OUTPUT | MODE0 */
++                              0xd4 0x00       /* lcd_data13.lcd_data13, OUTPUT | MODE0 */
++                              0xd8 0x00       /* lcd_data14.lcd_data14, OUTPUT | MODE0 */
++                              0xdc 0x00       /* lcd_data15.lcd_data15, OUTPUT | MODE0 */
++                              0xe0 0x00       /* lcd_vsync.lcd_vsync, OUTPUT | MODE0 */
++                              0xe4 0x00       /* lcd_hsync.lcd_hsync, OUTPUT | MODE0 */
++                              0xe8 0x00       /* lcd_pclk.lcd_pclk, OUTPUT | MODE0 */
++                              0xec 0x00       /* lcd_ac_bias_en.lcd_ac_bias_en, OUTPUT | MODE0 */
++                      >;
++              };
++
+               user_leds_s0: user_leds_s0 {
+                       pinctrl-single,pins = <
+                               0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad4.gpio1_4 */
+@@ -255,6 +288,27 @@
+                       };
+               };
+ 
++              lcdc: lcdc@4830e000 {
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&lcd_pins_s0>;
++                      status = "okay";
++                      display-timings {
++                              480x272 {
++                                      hactive         = <480>;
++                                      vactive         = <272>;
++                                      hback-porch     = <43>;
++                                      hfront-porch    = <8>;
++                                      hsync-len       = <4>;
++                                      vback-porch     = <12>;
++                                      vfront-porch    = <4>;
++                                      vsync-len       = <10>;
++                                      clock-frequency = <9000000>;
++                                      hsync-active    = <0>;
++                                      vsync-active    = <0>;
++                              };
++                      };
++              };
++
+               sound {
+                       compatible = "ti,da830-evm-audio";
+                       ti,model = "AM335x-EVMSK";

diff --git a/target/linux/omap/patches-3.12/921-arm-dts-am335x-sk-add-touchscreen-support.patch b/target/linux/omap/patches-3.12/921-arm-dts-am335x-sk-add-touchscreen-support.patch
new file mode 100644 (file)
index 0000000..225d272
--- /dev/null
+++ b/target/linux/omap/patches-3.12/921-arm-dts-am335x-sk-add-touchscreen-support.patch
@@ -0,0 +1,32 @@
+From 588b7a5db74c02bcf0b3ac57b6391debffbff74c Mon Sep 17 00:00:00 2001
+From: Felipe Balbi <balbi@ti.com>
+Date: Mon, 21 Oct 2013 15:06:54 -0500
+Subject: [PATCH 582/752] arm: dts: am335x sk: add touchscreen support
+
+Add missing nodes for the touchscreen available
+on AM335x EVM SK.
+
+Signed-off-by: Felipe Balbi <balbi@ti.com>
+---
+ arch/arm/boot/dts/am335x-evmsk.dts |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/am335x-evmsk.dts
++++ b/arch/arm/boot/dts/am335x-evmsk.dts
+@@ -513,6 +513,16 @@
+       vmmc-supply = <&vmmc_reg>;
+ };
+ 
++&tscadc {
++      status = "okay";
++      tsc {
++              ti,wires = <4>;
++              ti,x-plate-resistance = <200>;
++              ti,coordinate-readouts = <5>;
++              ti,wire-config = <0x00 0x11 0x22 0x33>;
++      };
++};
++
+ &gpio0 {
+       ti,no-reset-on-init;
+ };