Merge branch 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platf...
authorFelipe Balbi <balbi@ti.com>
Tue, 26 Mar 2013 11:24:43 +0000 (13:24 +0200)
committerFelipe Balbi <balbi@ti.com>
Tue, 26 Mar 2013 11:24:43 +0000 (13:24 +0200)
* 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree: (58 commits)
  ARM: dts: Fix the model and compatible for uevm and sevm boards
  ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
  ARM: OMAP5: clock: Initialize USB DPLL
  ARM: OMAP5: clock: Lock ABE dpll at boot time
  ARM: OMAP5: clock: Add missing OPT clock nodes for SCRM
  ARM: OMAP2+: hwmod: Introduce HWMOD_ACCESS_DISABLED flag.
  OMAP2+: hwmod: Report current state of hwmod on debugfs.
  ARM: OMAP: hwmod: Don't wakeup SW Conrolled clkdm when disabling module
  ARM: OMAP: hwmod: Fix the module disable sequence
  ARM: OMAP: hwmod: check of oh->cldm for get_pwrdm
  ARM/dts: omap5-uevm: Remove lpddr2 device node
  Revert "ARM/dts: omap5-panda: Remove lpddr2 device node"
  ARM: OMAP2+: mux: warn only when signal really not found
  ARM: OMAP2+: mux: warn only when GPIO really not found
  gpio/omap: add support for OMAP5 gpio banks
  ARM/dts: omap5-panda: Remove lpddr2 device node
  ARM: OMAP5: PM: handle device instance for OMAP5 for coldreset
  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()
  ...

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts

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/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/cclock54xx_data.c
arch/arm/mach-omap2/devices.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 edc6e4fdd07913a1139ebf5ac074302c0f95b80f,1cf8fe120b549c4e18bdd7f231a9984ccf428f3a..bca3a07703b5c69e55714f08f91c35e1ed6aeeb5
        };
  };
  
 +&mmc1 {
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +};
 +
 +&cpsw_emac0 {
 +      phy_id = <&davinci_mdio>, <0>;
 +};
 +
 +&cpsw_emac1 {
 +      phy_id = <&davinci_mdio>, <1>;
 +};
++
+ &sham {
+       status = "okay";
+ };
+ &aes {
+       status = "okay";
+ };
Simple merge
Simple merge
index 39667503efaf19641de2f2bc3ae63c0ccd53ce76,c5d2bb2a3cb51b41c1278b67a764c44583341b2b..df0078e35aa9410a08cc8b73b2cf4188fb9ea1e6
                        hw-caps-temp-alert;
                };
  
 +              omap_control_usb: omap-control-usb@4a002300 {
 +                      compatible = "ti,omap-control-usb";
 +                      reg = <0x4a002300 0x4>,
 +                            <0x4a002370 0x4>;
 +                      reg-names = "control_dev_conf", "phy_power_usb";
 +                      ti,type = <2>;
 +              };
 +
 +              omap_dwc3@4a020000 {
 +                      compatible = "ti,dwc3";
 +                      ti,hwmods = "usb_otg_ss";
 +                      reg = <0x4a020000 0x1ff>;
 +                      interrupts = <0 93 4>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      utmi-mode = <2>;
 +                      ranges;
 +                      dwc3@4a030000 {
 +                              compatible = "synopsys,dwc3";
 +                              reg = <0x4a030000 0xcfff>;
 +                              interrupts = <0 92 4>;
 +                              usb-phy = <&usb2_phy>, <&usb3_phy>;
 +                              tx-fifo-resize;
 +                      };
 +              };
 +
 +              ocp2scp {
 +                      compatible = "ti,omap-ocp2scp";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +                      ti,hwmods = "ocp2scp1";
 +                      usb2_phy: usb2phy@4a084000 {
 +                              compatible = "ti,omap-usb2";
 +                              reg = <0x4a084000 0x7c>;
 +                              ctrl-module = <&omap_control_usb>;
 +                      };
 +
 +                      usb3_phy: usb3phy@4a084400 {
 +                              compatible = "ti,omap-usb3";
 +                              reg = <0x4a084400 0x80>,
 +                                    <0x4a084800 0x64>,
 +                                    <0x4a084c00 0x40>;
 +                              reg-names = "phy_rx", "phy_tx", "pll_ctrl";
 +                              ctrl-module = <&omap_control_usb>;
 +                      };
 +              };
 +
 +              usbhstll: usbhstll@4a062000 {
 +                      compatible = "ti,usbhs-tll";
 +                      reg = <0x4a062000 0x1000>;
 +                      interrupts = <0 78 0x4>;
 +                      ti,hwmods = "usb_tll_hs";
 +              };
 +
 +              usbhshost: usbhshost@4a064000 {
 +                      compatible = "ti,usbhs-host";
 +                      reg = <0x4a064000 0x800>;
 +                      ti,hwmods = "usb_host_hs";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +
 +                      usbhsohci: ohci@4a064800 {
 +                              compatible = "ti,ohci-omap3", "usb-ohci";
 +                              reg = <0x4a064800 0x400>;
 +                              interrupt-parent = <&gic>;
 +                              interrupts = <0 76 0x4>;
 +                      };
 +
 +                      usbhsehci: ehci@4a064c00 {
 +                              compatible = "ti,ehci-omap", "usb-ehci";
 +                              reg = <0x4a064c00 0x400>;
 +                              interrupt-parent = <&gic>;
 +                              interrupts = <0 77 0x4>;
 +                      };
 +              };
 +
                wdt2: wdt@4ae14000 {
-                       compatible = "ti,omap5-wdt", "ti,omap3-wdt";
+                       compatible = "ti,omap5-wdt", "ti,omap4-wdt";
                        reg = <0x4ae14000 0x80>;
                        interrupts = <0 80 0x4>;
                        ti,hwmods = "wd_timer2";
Simple merge
Simple merge