diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-12 00:40:07 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-12 00:40:07 +0200 |
| commit | c49f4984fd45be36502e903e7a5a6a4faff42931 (patch) | |
| tree | f53768edb35290e7b5be2daf5deb477d905a2298 /arch/arm/boot/dts/omap3.dtsi | |
| parent | Linux 3.12-rc4 (diff) | |
| parent | ARM: dts: dra7-evm: Add mmc2 node for eMMC support (diff) | |
| download | linux-c49f4984fd45be36502e903e7a5a6a4faff42931.tar.xz linux-c49f4984fd45be36502e903e7a5a6a4faff42931.zip | |
Merge tag 'for_3.13/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt
Add the minimal DTS support for DRA7xx based SoC core.
Add the initial support for N900 and gta04 phones.
Enable USB3 on OMAP5 evm board.
Add support for cryto accelerators
Add new IGEP AQUILA board
Add AM33XX EDMA support
Update HSUSB node to use the reset-gpios fmwk
Diffstat (limited to 'arch/arm/boot/dts/omap3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 7d95cda1fae4..16420ae16004 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -111,7 +111,7 @@ pinctrl-single,function-mask = <0x7f1f>; }; - omap3_pmx_wkup: pinmux@0x48002a00 { + omap3_pmx_wkup: pinmux@48002a00 { compatible = "ti,omap3-padconf", "pinctrl-single"; reg = <0x48002a00 0x5c>; #address-cells = <1>; |