Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 13:49:27 +0000 (08:49 -0500)
committerDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 13:49:27 +0000 (08:49 -0500)
TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
  ARM: dts: AM33XX: Enable system power off control in am335x-bone
  ARM: dts: AM33XX: Set pmic-shutdown-controller for BeagleBone
  rtc: OMAP: Add system pm_power_off to rtc driver
  ARM: dts: OMAP2+: Identify GPIO banks that are always powered
  ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards
  ARM: dts: Add OMAP3430 SDP NOR flash memory binding
  ARM: dts: Add NOR flash bindings for OMAP2420 H4
  ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
  ARM: dts: OMAP3: Add support for OMAP3430 SDP board
  ARM: dts: OMAP3: Add reg and interrupt properties for gpio
  ARM: dts: OMAP3+: Correct gpio #interrupts-cells property
  ARM: dts: Add OMAP2 gpio bindings
  ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5
  ARM: dts: OMAP2+: Add SDMA controller bindings and nodes
  ARM: dts: OMAP2+: Add PMU nodes
  ARM: OMAP2+: Prepare for device-tree PMU support
  ARM: dts: OMAP3: reduce GPMC mapped registers address space
  ARM: dts: OMAP3: Add GPMC controller

Conflicts:
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4.dtsi

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4-panda-es.dts
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/configs/omap2plus_defconfig

Simple merge
index aff549367724465beb82998f323a249fb05a5b7b,de925500ac89931c2462cce16c6a8c2c17e7cfd8..61e8a90c442381da9d88f6f7ed6a73ac6b78e5ec
                        ti,timer-secure;
                };
  
 +              usbhstll: usbhstll@48062000 {
 +                      compatible = "ti,usbhs-tll";
 +                      reg = <0x48062000 0x1000>;
 +                      interrupts = <78>;
 +                      ti,hwmods = "usb_tll_hs";
 +              };
 +
 +              usbhshost: usbhshost@48064000 {
 +                      compatible = "ti,usbhs-host";
 +                      reg = <0x48064000 0x400>;
 +                      ti,hwmods = "usb_host_hs";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +
 +                      usbhsohci: ohci@48064400 {
 +                              compatible = "ti,ohci-omap3", "usb-ohci";
 +                              reg = <0x48064400 0x400>;
 +                              interrupt-parent = <&intc>;
 +                              interrupts = <76>;
 +                      };
 +
 +                      usbhsehci: ehci@48064800 {
 +                              compatible = "ti,ehci-omap", "usb-ehci";
 +                              reg = <0x48064800 0x400>;
 +                              interrupt-parent = <&intc>;
 +                              interrupts = <77>;
 +                      };
 +              };
 +
 +              usb_otg_hs: usb_otg_hs@480ab000 {
 +                      compatible = "ti,omap3-musb";
 +                      reg = <0x480ab000 0x1000>;
 +                      interrupts = <0 92 0x4>, <0 93 0x4>;
 +                      interrupt-names = "mc", "dma";
 +                      ti,hwmods = "usb_otg_hs";
 +                      usb-phy = <&usb2_phy>;
 +                      multipoint = <1>;
 +                      num-eps = <16>;
 +                      ram-bits = <12>;
++                };
++
+               gpmc: gpmc@6e000000 {
+                       compatible = "ti,omap3430-gpmc";
+                       ti,hwmods = "gpmc";
+                       reg = <0x6e000000 0x02d0>;
+                       interrupts = <20>;
+                       gpmc,num-cs = <8>;
+                       gpmc,num-waitpins = <4>;
+                       #address-cells = <2>;
+                       #size-cells = <1>;
                };
        };
  };
Simple merge
index f55f146dde891543c97be345f5a3e466191c403e,76a2ec3dce4566a774d44ca7d844656e5d6d30db..ec0490a31715e6d8ab9cf18a3deab398fad298d8
                spi-max-frequency = <24000000>;
                reg = <0>;
                interrupt-parent = <&gpio2>;
-               interrupts = <2>; /* gpio line 34 */
+               interrupts = <2 8>; /* gpio line 34, low triggered */
                vdd-supply = <&vdd_eth>;
 +              enable-active-high;
        };
  };
  
index 4fc6322aa621e18d12d428c9fb6e9877e13841ae,4725ff7cb4bf88c6e27e2f6902eb89ff6b6ca25c..5e4984a58c40f82cb1cb59f86a5413a50ecb1fcb
                        pinctrl-single,function-mask = <0x7fff>;
                };
  
 +              dss {
 +                      compatible = "ti,omap4-dss";
 +                      ti,hwmods = "dss_core";
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +
 +                      dispc {
 +                              compatible = "ti,omap4-dispc";
 +                              ti,hwmods = "dss_dispc";
 +                      };
 +
 +                      dpi: dpi {
 +                              compatible = "ti,omap4-dpi";
 +                              video-source = <2>;
 +                      };
 +
 +                      dsi1: dsi@0 {
 +                              compatible = "ti,omap4-dsi";
 +                              ti,hwmods = "dss_dsi1";
 +                              reg = <0>;
 +                              vdds_dsi-supply = <&vcxio>;
 +                              video-source = <0>;
 +                      };
 +
 +                      dsi2: dsi@1 {
 +                              compatible = "ti,omap4-dsi";
 +                              ti,hwmods = "dss_dsi2";
 +                              reg = <1>;
 +                              vdds_dsi-supply = <&vcxio>;
 +                              video-source = <2>;
 +                      };
 +
 +                      hdmi: hdmi {
 +                              compatible = "ti,omap4-hdmi", "simple-bus";
 +                              ti,hwmods = "dss_hdmi";
 +                              vdda_hdmi_dac-supply = <&vdac>;
 +                              video-source = <1>;
 +                      };
++                };
++
+               sdma: dma-controller@4a056000 {
+                       compatible = "ti,omap4430-sdma";
+                       reg = <0x4a056000 0x1000>;
+                       interrupts = <0 12 0x4>,
+                                    <0 13 0x4>,
+                                    <0 14 0x4>,
+                                    <0 15 0x4>;
+                       #dma-cells = <1>;
+                       #dma-channels = <32>;
+                       #dma-requests = <127>;
                };
  
                gpio1: gpio@4a310000 {
Simple merge
index 9c9c8f5d0d808c1d8a93e8fde2a27682ad31b9f5,91c62b81e2f51e9d8318e8b6f4e138a082ab021b..61611251f26d54dcca9e5b5c06eb62eb0355526e
@@@ -233,15 -197,11 +233,16 @@@ CONFIG_SDIO_UART=
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
  CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_OMAP=y
  CONFIG_RTC_DRV_TWL92330=y
  CONFIG_RTC_DRV_TWL4030=y
 +CONFIG_RTC_DRV_PALMAS=y
  CONFIG_DMADEVICES=y
 +CONFIG_TI_EDMA=y
  CONFIG_DMA_OMAP=y
 +CONFIG_STAGING=y
 +CONFIG_DRM_OMAP=y
 +CONFIG_DRM_OMAP_NUM_CRTCS=3
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set