Merge branch 'platform-base-3.8.y' into ti-linux-3.8.y
authorDan Murphy <dmurphy@ti.com>
Wed, 13 Mar 2013 14:06:57 +0000 (09:06 -0500)
committerDan Murphy <dmurphy@ti.com>
Wed, 13 Mar 2013 14:06:57 +0000 (09:06 -0500)
TI-Feature: platform_base
TI-Tree: http://git.ti.com/git/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* platform-base-3.8.y: (35 commits)
  crypto: omap-sham - Add SHA224 and SHA256 Support
  crypto: omap-sham - Add OMAP4/AM33XX SHAM Support
  crypto: omap-sham - Convert to dma_request_slave_channel_compat()
  crypto: omap-sham - Add Device Tree Support
  crypto: omap-sham - Remove usage of private DMA API
  crypto: omap-sham - Add code to use dmaengine API
  crypto: omap-sham - Add suspend/resume support
  crypto: omap-sham - Convert to use pm_runtime API
  crypto: omap-sham - Remove unnecessary pr_info noise
  crypto: omap-aes - Add CTR algorithm Support
  crypto: omap-aes - Add OMAP4/AM33XX AES Support
  crypto: omap-aes - Convert to dma_request_slave_channel_compat()
  crypto: omap-aes - Add Device Tree Support
  crypto: omap-aes - Remove usage of private DMA API
  crypto: omap-aes - Add code to use dmaengine API
  crypto: omap-aes - Add suspend/resume support
  crypto: omap-aes - Convert to use pm_runtime API
  crypto: omap-aes - Don't reset controller for every operation
  crypto: omap-aes - Remmove unnecessary pr_info noise
  ARM: dts: Add AES data and documentation for AM33XX
  ...

Conflicts:
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/mach-omap2/devices.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

index a154ce002a6d14722e62669d21f65258c63ef6f0,884544beefd9a17de9496615125e744a838f6c4d..bfed335e3f2b8921f6ce80ba4eba0d608a0e288d
        phy_id = <&davinci_mdio>, <1>;
  };
  
 +&mmc1 {
 +      status = "okay";
 +      vmmc-supply = <&ldo3_reg>;
 +};
++
+ &mmc2 {
+       status = "okay";
+       vmmc-supply = <&ldo3_reg>;
+ };
+ &edma {
+       ti,edma-xbar-event-map = <32 12>;
+ };
+ &sham {
+       status = "okay";
+ };
+ &aes {
+       status = "okay";
+ };
index 2907da6e85a521fa04986f3123ee1753dc53fb61,2f03ae8279c855459890536ca9d07b536f384745..71e51f5bb68bed312a93f5342ffc65c8bf558b82
        phy_id = <&davinci_mdio>, <1>;
  };
  
 +&mmc1 {
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};
++
+ &sham {
+       status = "okay";
+ };
+ &aes {
+       status = "okay";
+ };
index f050c4666b860243d98dfc028c3d0a8e8a0bff32,1cf8fe120b549c4e18bdd7f231a9984ccf428f3a..f07c147e4fe3ace8b54786e3030622e772814143
        };
  };
  
 +&mmc1 {
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};
++
+ &sham {
+       status = "okay";
+ };
+ &aes {
+       status = "okay";
++
+ };
Simple merge
index d1aebccd71c43fd0e7a8989e2e3cf8f376d90636,1e3c58425b62b21675df89bebf715fd9fe8f5ce2..37209ae01148105e34e912b77882dea41ee70bc9
@@@ -802,7 -615,8 +693,9 @@@ static int __init omap2_init_devices(vo
                omap_init_dmic();
                omap_init_mcpdm();
                omap_init_mcspi();
 +              omap_init_mcasp();
+               omap_init_sham();
+               omap_init_aes();
        }
        omap_init_sti();
        omap_init_rng();