Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: Add common support for omap3-evm

Looks like the main difference between the TMDSEVM3530 and
TMDSEVM3730 is just the omap processor:

http://www.ti.com/tool/tmdsevm3530
http://www.ti.com/tool/tmdsevm3730

So let's add a common file for the EVMs, and fix the description
for the omap3-evm.dst as that's clearly for the TMDSEVM3530
since it includes omap34xx.dtsi. It cannot support the TMDSEVM3730
properly, and we need a separate file for that in the following
patch.

Signed-off-by: Tony Lindgren <tony@atomide.com>

+62 -56
+60
arch/arm/boot/dts/omap3-evm-common.dtsi
··· 1 + /* 2 + * Common support for omap3 EVM boards 3 + */ 4 + 5 + / { 6 + cpus { 7 + cpu@0 { 8 + cpu0-supply = <&vcc>; 9 + }; 10 + }; 11 + 12 + leds { 13 + compatible = "gpio-leds"; 14 + ledb { 15 + label = "omap3evm::ledb"; 16 + gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */ 17 + linux,default-trigger = "default-on"; 18 + }; 19 + }; 20 + }; 21 + 22 + &i2c1 { 23 + clock-frequency = <2600000>; 24 + 25 + twl: twl@48 { 26 + reg = <0x48>; 27 + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ 28 + interrupt-parent = <&intc>; 29 + }; 30 + }; 31 + 32 + #include "twl4030.dtsi" 33 + #include "twl4030_omap3.dtsi" 34 + 35 + &i2c2 { 36 + clock-frequency = <400000>; 37 + }; 38 + 39 + &i2c3 { 40 + clock-frequency = <400000>; 41 + 42 + /* 43 + * TVP5146 Video decoder-in for analog input support. 44 + */ 45 + tvp5146@5c { 46 + compatible = "ti,tvp5146m2"; 47 + reg = <0x5c>; 48 + }; 49 + }; 50 + 51 + &twl_gpio { 52 + ti,use-leds; 53 + }; 54 + 55 + &usb_otg_hs { 56 + interface-type = <0>; 57 + usb-phy = <&usb2_phy>; 58 + mode = <3>; 59 + power = <50>; 60 + };
+2 -56
arch/arm/boot/dts/omap3-evm.dts
··· 8 8 /dts-v1/; 9 9 10 10 #include "omap34xx.dtsi" 11 + #include "omap3-evm-common.dtsi" 11 12 12 13 / { 13 - model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)"; 14 + model = "TI OMAP35XX EVM (TMDSEVM3530)"; 14 15 compatible = "ti,omap3-evm", "ti,omap3"; 15 - 16 - cpus { 17 - cpu@0 { 18 - cpu0-supply = <&vcc>; 19 - }; 20 - }; 21 16 22 17 memory { 23 18 device_type = "memory"; 24 19 reg = <0x80000000 0x10000000>; /* 256 MB */ 25 20 }; 26 - 27 - leds { 28 - compatible = "gpio-leds"; 29 - ledb { 30 - label = "omap3evm::ledb"; 31 - gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */ 32 - linux,default-trigger = "default-on"; 33 - }; 34 - }; 35 - }; 36 - 37 - &i2c1 { 38 - clock-frequency = <2600000>; 39 - 40 - twl: twl@48 { 41 - reg = <0x48>; 42 - interrupts = <7>; /* SYS_NIRQ cascaded to intc */ 43 - interrupt-parent = <&intc>; 44 - }; 45 - }; 46 - 47 - #include "twl4030.dtsi" 48 - #include "twl4030_omap3.dtsi" 49 - 50 - &i2c2 { 51 - clock-frequency = <400000>; 52 - }; 53 - 54 - &i2c3 { 55 - clock-frequency = <400000>; 56 - 57 - /* 58 - * TVP5146 Video decoder-in for analog input support. 59 - */ 60 - tvp5146@5c { 61 - compatible = "ti,tvp5146m2"; 62 - reg = <0x5c>; 63 - }; 64 - }; 65 - 66 - &twl_gpio { 67 - ti,use-leds; 68 - }; 69 - 70 - &usb_otg_hs { 71 - interface-type = <0>; 72 - usb-phy = <&usb2_phy>; 73 - mode = <3>; 74 - power = <50>; 75 21 };