Switch TI platform support code from using FreeBSD's custom-baked DTS

files to vendor-provided ones. It should make easier to adopt platform
code to new revisions of hardware and to use DTS overlays for various
Beaglebone extensions (shields/capes).

Original dts filenames were not changed, they're now wrappers over dts
files provided by TI. So make sure you update .dtb files on your
devices as part of kernel update

GPIO addressing was changed: instead of one global /dev/gpioc0 there
are per-bank instances of /dev/gpiocX. Each bank has 32 pins so for
instance pin 121 on /dev/gpioc0 in old addressing scheme is now pin 25
on /dev/gpioc3

On Pandaboard serial console devices was changed from /dev/ttyu0 to
/dev/ttyu2 so you'll have to update /etc/ttys to get login prompt
on serial port in multiuser mode. Single user mode serial console
should work as-is

Differential Revision:	https://reviews.freebsd.org/D2146
Reviewed by:	rpaulo, ian, Michal Meloun, Svatopluk Kraus

8 files changed, 136 insertions, 939 deletions

diff --git a/sys/boot/fdt/dts/arm/am335x-evm.dts b/sys/boot/fdt/dts/arm/am335x-evm.dts
index 30239f6..3e1c4c0 100644
--- a/sys/boot/fdt/dts/arm/am335x-evm.dts
+++ b/sys/boot/fdt/dts/arm/am335x-evm.dts
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
+ * Copyright (c) 2015 Oleksandr Tymoshenko
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,158 +26,4 @@
  * $FreeBSD$
  */
 
-/dts-v1/;
-
-/include/ "am335x.dtsi"
-
-/ {
-	model = "TMDXEVM3358";
-	compatible = "ti,am335x";
-
-	aliases {
-		soc = &SOC;
-		uart0 = &uart0;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = < 0x80000000 0x10000000 >;	/* 256MB RAM */
-	};
-
-	am335x {
- 		scm@44e10000 {
-			/* Set of triplets < padname, muxname, padstate> */
-			scm-pad-config =
-				/* I2C0 */
-				"I2C0_SDA", "I2C0_SDA","i2c",
-				"I2C0_SCL", "I2C0_SCL","i2c",
-				/* Ethernet */
-				"MII1_RX_ER", "gmii1_rxerr", "input_pulldown",
-				"MII1_TX_EN", "gmii1_txen", "output",
-				"MII1_RX_DV", "gmii1_rxdv", "input_pulldown",
-				"MII1_TXD3", "gmii1_txd3", "output",
-				"MII1_TXD2", "gmii1_txd2", "output",
-				"MII1_TXD1", "gmii1_txd1", "output",
-				"MII1_TXD0", "gmii1_txd0", "output",
-				"MII1_TX_CLK", "gmii1_txclk", "input_pulldown",
-				"MII1_RX_CLK", "gmii1_rxclk", "input_pulldown",
-				"MII1_RXD3", "gmii1_rxd3", "input_pulldown",
-				"MII1_RXD2", "gmii1_rxd2", "input_pulldown",
-				"MII1_RXD1", "gmii1_rxd1",  "input_pulldown",
-				"MII1_RXD0", "gmii1_rxd0",  "input_pulldown",
-				"MDIO", "mdio_data", "input_pullup",
-				"MDC", "mdio_clk", "output_pullup",
-				/* MMCSD0 */
-				"MMC0_CMD", "mmc0_cmd", "input_pullup",
-				"MMC0_CLK", "mmc0_clk", "input_pullup",
-				"MMC0_DAT0", "mmc0_dat0", "input_pullup",
-				"MMC0_DAT1", "mmc0_dat1", "input_pullup",
-				"MMC0_DAT2", "mmc0_dat2", "input_pullup",
-				"MMC0_DAT3", "mmc0_dat3", "input_pullup",
-				/* GPIO */
-				"GPMC_AD10", "gpio0_26", "input_pulldown",
-				"GPMC_AD11", "gpio0_27", "input_pulldown",
-				"GPMC_AD0", "gpio1_0", "input_pulldown",
-				"GPMC_AD1", "gpio1_1", "input_pulldown",
-				"GPMC_AD2", "gpio1_2", "input_pulldown",
-				"GPMC_AD3", "gpio1_3", "input_pulldown",
-				"GPMC_AD4", "gpio1_4", "input_pulldown",
-				"GPMC_AD5", "gpio1_5", "input_pulldown",
-				"GPMC_AD6", "gpio1_6", "input_pulldown",
-				"GPMC_AD7", "gpio1_7", "input_pulldown",
-				"GPMC_AD12", "gpio1_12", "input_pulldown",
-				"GPMC_AD13", "gpio1_13", "input_pulldown",
-				"GPMC_AD14", "gpio1_14", "input_pulldown",
-				"GPMC_AD15", "gpio1_15", "input_pulldown",
-				"GPMC_A0", "gpio1_16", "input_pulldown",
-				"GPMC_A1", "gpio1_17", "input_pulldown",
-				"GPMC_A5", "gpio1_21", "output", /* User LED 1 */
-				"GPMC_A6", "gpio1_22", "output", /* User LED 2 */
-				"GPMC_A7", "gpio1_23", "output", /* User LED 3 */
-				"GPMC_A8", "gpio1_24", "output", /* User LED 4 */
-				"GPMC_BEn1", "gpio1_28", "input_pulldown",
-				"GPMC_CSn0", "gpio1_29", "input_pulldown",
-				"GPMC_CSn1", "gpio1_30", "input_pulldown",
-				"GPMC_CSn2", "gpio1_31", "input_pulldown",
-				"MCASP0_FSR", "gpio3_19", "input_pulldown",
-				"MCASP0_AHCLKX", "gpio3_21", "input_pulldown",
-				/* TIMERs */
-				"GPMC_ADVn_ALE", "timer4", "output",
-				"GPMC_BEn0_CLE", "timer5", "output",
-				"GPMC_WEn", "timer6", "output",
-				"GPMC_OEn_REn", "timer7", "output",
-				/* USB0 and USB1 */
-				"USB0_DRVVBUS", "USB0_DRVVBUS", "output",
-				"USB1_DRVVBUS", "USB1_DRVVBUS", "output",
-				/* LCD */
-				"GPMC_AD8", "lcd_data23", "output",
-				"GPMC_AD9", "lcd_data22", "output",
-				"GPMC_AD10", "lcd_data21", "output",
-				"GPMC_AD11", "lcd_data20", "output",
-				"GPMC_AD12", "lcd_data19", "output",
-				"GPMC_AD13", "lcd_data18", "output",
-				"GPMC_AD14", "lcd_data17", "output",
-				"GPMC_AD15", "lcd_data16", "output",
-				"GPMC_CLK", "lcd_memory_clk", "output",
-				"LCD_DATA0", "lcd_data0", "output", 
-				"LCD_DATA1", "lcd_data1", "output", 
-				"LCD_DATA2", "lcd_data2", "output", 
-				"LCD_DATA3", "lcd_data3", "output", 
-				"LCD_DATA4", "lcd_data4", "output", 
-				"LCD_DATA5", "lcd_data5", "output", 
-				"LCD_DATA6", "lcd_data6", "output", 
-				"LCD_DATA7", "lcd_data7", "output", 
-				"LCD_DATA8", "lcd_data8", "output", 
-				"LCD_DATA9", "lcd_data9", "output", 
-				"LCD_DATA10", "lcd_data10", "output", 
-				"LCD_DATA11", "lcd_data11", "output", 
-				"LCD_DATA12", "lcd_data12", "output", 
-				"LCD_DATA13", "lcd_data13", "output", 
-				"LCD_DATA14", "lcd_data14", "output", 
-				"LCD_DATA15", "lcd_data15", "output", 
-				"LCD_VSYNC", "lcd_vsync", "output",
-				"LCD_HSYNC", "lcd_hsync", "output",
-				"LCD_PCLK", "lcd_pclk", "output",
-				"LCD_AC_BIAS_EN", "lcd_ac_bias_en", "output",
-				"ECAP0_IN_PWM0_OUT", "eCAP0_in_PWM0_out", "output";
-
- 		};
-
-		lcd@4830e000 {
-			panel_name = "TFC_S9700RTWV35TR_01B";
-			panel_width = <800>;
-			panel_height = <480>;
-			panel_hfp = <39>;
-			panel_hbp = <39>;
-			panel_hsw = <47>;
-			panel_vfp = <13>;
-			panel_vbp = <29>;
-			panel_vsw = <2>;
-			panel_pxl_clk = <30000000>;
-			panel_invert_pxl_clk = <0>;
-			panel_type = <1>; /* Active or passive, compatibility */
-			panel_max_bpp = <32>; /* compatibility */
-			panel_min_bpp =	<32>; /* compatibility */
-			panel_shade = <1>; /* compatibility */
-			ac_bias = <255>;
-			ac_bias_intrpt = <0>;
-			dma_burst_sz = <16>;
-			bpp = <32>;
-			fdd = <128>;
-			tft_alt_mode = <0>; /* compatiblity */
-			stn_565_mode = <0>; /* compatibility */
-			mono_8bit_mode = <0>; /* compatibilty */
-			invert_line_clock = <1>;
-			invert_frm_clock = <1>;
-			sync_edge = <0>;
-			sync_ctrl = <1>;
-			raster_order = <0>; /* compatibity */
-		};
-
-	};
-
-	chosen {
-		stdin = "uart0";
-		stdout = "uart0";
-	};
-};
+#include "am335x-evm.dts"
diff --git a/sys/boot/fdt/dts/arm/am335x.dtsi b/sys/boot/fdt/dts/arm/am335x.dtsi
deleted file mode 100644
index fea57e9..0000000
--- a/sys/boot/fdt/dts/arm/am335x.dtsi
+++ /dev/null
@@ -1,349 +0,0 @@
-/*-
- * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * $FreeBSD$
- */
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	interrupt-parent = <&AINTC>;
-
-	SOC: am335x {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		ranges;
-		bus-frequency = <0>;
-
-		AINTC: interrupt-controller@48200000 {
-			compatible = "ti,aintc";
-			interrupt-controller;
-			#address-cells = <0>;
-			#interrupt-cells = <1>;
-			reg =	< 0x48200000 0x1000 >;
-		};
-
-		pmu {
-			compatible = "arm,cortex-a8-pmu";
-			interrupts = <3>;
-		};
-
-		scm@44e10000 {
-			compatible = "ti,scm";
-			reg =	< 0x44e10000 0x2000 >;
-		};
-
-		prcm@44E00000 {
-			compatible = "am335x,prcm";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = < 0x44E00000 0x1300 >;
-		};
-
-		dmtimers@44E05000 {
-			compatible = "ti,am335x-dmtimer";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg =	< 0x44E05000 0x1000
-				  0x44E31000 0x1000
-				  0x48040000 0x1000
-				  0x48042000 0x1000
-				  0x48044000 0x1000
-				  0x48046000 0x1000
-				  0x48048000 0x1000
-				  0x4804A000 0x1000 >;
-			interrupts = < 66 67 68 69 92 93 94 95 >;
-			interrupt-parent = <&AINTC>;
-		};
-
-		rtc: rtc@44E3E000 {
-			compatible = "ti,da830-rtc";
-			reg = <0x44E3E000 0x1000>;
-			interrupts = < 75 76 >;
-			interrupt-parent = <&AINTC>;
-		};
-
-		adc0: adc@44E0D000 {
-			compatible = "ti,adc";
-			reg = <0x44E0D000 0x2000>;
-			interrupts = < 16 >;
-			interrupt-parent = <&AINTC>;
- 		};
-
-		wdt1@44E35000 {
-			compatible = "ti,omap3-wdt";
-			reg = <0x44E35000 0x1000>;
-			interrupts = <91>;
-			interrupt-parent = <&AINTC>;
-		};
- 		
-		GPIO: gpio {
-			#gpio-cells = <3>;
-			compatible = "ti,gpio";
-			gpio-controller;
-			reg =<	0x44E07000 0x1000
-				0x4804C000 0x1000
-				0x481AC000 0x1000
-				0x481AE000 0x1000 >;
-			interrupts = < 96 97 98 99 32 33 62 63 >;
-			interrupt-parent = <&AINTC>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		uart0: serial@44E09000 {
-			compatible = "ti,ns16550";
-			reg = <0x44E09000 0x1000>;
-			reg-shift = <2>;
-			interrupts = < 72 >;
-			interrupt-parent = <&AINTC>;
- 			clock-frequency = < 48000000 >;
-			uart-device-id = < 0 >;
- 		};
- 		
- 		uart1: serial@48022000 {
- 			compatible = "ti,ns16550";
- 			reg = <0x48022000 0x1000>;
- 			reg-shift = <2>;
- 			interrupts = < 73 >;
- 			interrupt-parent = <&AINTC>;
- 			clock-frequency = < 48000000 >; 
-			uart-device-id = < 1 >;
-			status = "disabled";
- 		};
- 		
- 		uart2: serial@48024000 {
- 			compatible = "ti,ns16550";
- 			reg = <0x48024000 0x1000>;
- 			reg-shift = <2>;
- 			interrupts = < 74 >;
- 			interrupt-parent = <&AINTC>;
- 			clock-frequency = < 48000000 >; 
-			uart-device-id = < 2 >;
-			status = "disabled";
- 		};
- 		
- 		uart3: serial@481a6000 {
- 			compatible = "ti,ns16550";
- 			reg = <0x481A6000 0x1000>;
- 			reg-shift = <2>;
- 			interrupts = < 44 >;
- 			interrupt-parent = <&AINTC>;
- 			clock-frequency = < 48000000 >; 
-			uart-device-id = < 3 >;
-			status = "disabled";
- 		};
- 
- 		uart4: serial@481a8000 {
- 			compatible = "ti,ns16550";
- 			reg = <0x481A8000 0x1000>;
- 			reg-shift = <2>;
- 			interrupts = < 45 >;
- 			interrupt-parent = <&AINTC>;
- 			clock-frequency = < 48000000 >; 
-			uart-device-id = < 4 >;
-			status = "disabled";
- 		};
- 
- 		uart5: serial@481aa000 {
- 			compatible = "ti,ns16550";
- 			reg = <0x481AA000 0x1000>;
- 			reg-shift = <2>;
- 			interrupts = < 46 >;
- 			interrupt-parent = <&AINTC>;
- 			clock-frequency = < 48000000 >; 
-			uart-device-id = < 5 >;
-			status = "disabled";
-  		};
-
-		edma3@49000000 {
-			compatible = "ti,edma3";
-			reg =<	0x49000000 0x100000	/* Channel Controller Regs */
-				0x49800000 0x100000	/* Transfer Controller 0 Regs */
-				0x49900000 0x100000	/* Transfer Controller 1 Regs */
-				0x49a00000 0x100000 >;	/* Transfer Controller 2 Regs */
-			interrupts = <12 13 14>;
-			interrupt-parent = <&AINTC>;
-		};
-
-		mmchs0@48060000 {
-			compatible = "ti,omap3-hsmmc", "ti,mmchs";
-			reg =<0x48060000 0x1000 >;
-			interrupts = <64>;
-			interrupt-parent = <&AINTC>;
-			mmchs-device-id = <0>;
-			mmchs-wp-gpio-pin = <0xffffffff>;
-			ti,dual-volt;
-		};
-
-		mmchs1@481D8000 {
-			compatible = "ti,omap3-hsmmc", "ti,mmchs";
-			reg =<0x481D8000 0x1000 >;
-			interrupts = <28>;
-			interrupt-parent = <&AINTC>;
-			mmchs-device-id = <1>;
-			mmchs-wp-gpio-pin = <0xffffffff>;
-			status = "disabled";
-		};
-
-		enet0: ethernet@4A100000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
-			compatible = "ti,cpsw";
-			reg = <0x4A100000 0x4000>;
-			interrupts = <40 41 42 43>;
-			interrupt-parent = <&AINTC>;
-			phy-handle = <&phy0>;
-			mdio@0 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "ti,cpsw-mdio";
-				phy0: ethernet-phy@0 {
-					reg = <0x0>;
-				};
-			};
-		};
-
-		i2c0: i2c@44e0b000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "ti,i2c";
-			reg =<	0x44e0b000 0x1000 >;
-			interrupts = <70>;
-			interrupt-parent = <&AINTC>;
-			i2c-device-id = <0>;
-		};
-
-		i2c1: i2c@4802a000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "ti,i2c";
-			reg =<  0x4802a000 0x1000 >;
-			interrupts = <71>;
-			interrupt-parent = <&AINTC>;
-			i2c-device-id = <1>;
-		};
-
-		i2c2: i2c@4819c000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "ti,i2c";
-			reg =<  0x4819c000 0x1000 >;
-			interrupts = <30>;
-			interrupt-parent = <&AINTC>;
-			i2c-device-id = <2>;
-		};
-
-		pwm@48300000 {
-			compatible = "ti,am335x-pwm";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = < 0x48300000 0x100	/* PWMSS0 */
-				0x48300100 0x80		/* eCAP0 */
-				0x48300180 0x80		/* eQEP0 */
-				0x48300200 0x60		/* ePWM0 */
-			>;
-			interrupts = <86 58>; /* ePWM0INT, ePWM0_TZINT */
-			interrupt-parent = <&AINTC>;
-			pwm-device-id = <0>;
-		};
-
-		pwm@48302000 {
-			compatible = "ti,am335x-pwm";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = < 0x48302000 0x100	/* PWMSS1 */
-				0x48302100 0x80		/* eCAP1 */
-				0x48302180 0x80		/* eQEP1 */
-				0x48302200 0x60		/* ePWM1 */
-			>;
-			interrupts = <87 59>; /* ePWM1INT, ePWM1_TZINT */
-			interrupt-parent = <&AINTC>;
-			pwm-device-id = <1>;
-		};
-
-		pwm@48304000 {
-			compatible = "ti,am335x-pwm";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = < 0x48304000 0x100	/* PWMSS2 */
-				0x48304100 0x80		/* eCAP2 */
-				0x48304180 0x80		/* eQEP2 */
-				0x48304200 0x60		/* ePWM2 */
-			>;
-			interrupts = <88 60>; /* ePWM2INT, ePWM2_TZINT */
-			interrupt-parent = <&AINTC>;
-			pwm-device-id = <2>;
-		};
-
-		lcd: lcd@4830e000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "ti,am335x-lcd";
-			reg =<	0x4830e000 0x1000 >;
-			interrupts = <36>;
-			interrupt-parent = <&AINTC>;
-		};
-
- 		usb@47400000 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "ti,musb-am33xx";
- 			reg =<	0x47400000 0x1000	/* USBSS */
- 				0x47401000 0x300	/* USB0 */
- 				0x47401300 0x100 	/* USB0_PHY */
- 				0x47401400 0x400 	/* USB0_CORE */
- 				0x47401800 0x300 	/* USB1 */
- 				0x47401B00 0x100 	/* USB1_PHY */
- 				0x47401C00 0x400 	/* USB1_CORE */
- 			>;
- 			interrupts = <17 18 19>;
- 			interrupt-parent = <&AINTC>;
- 			/* 1 - Host Mode, 0 - Device Mode */
- 			modemask = <2>;
- 		};
-
-		mbox0@480C8000 {
-			compatible = "am335x,system-mbox";
-			reg = < 0x480C8000 0x1000 >;
-			interrupts = <77>;
-			interrupt-parent = <&AINTC>;
-		};
-
-		spinlock0@480CA000 {
-			compatible = "am335x,spinlock";
-			reg = < 0x480CA000 0x1000 >;
-		};
-
-		pruss@4A300000 {
-			compatible = "ti,pruss-v2";
-			reg = <0x4A300000 0x80000>;
- 			interrupt-parent = <&AINTC>;
-			interrupts = <20 21 22 23 24 25 26 27>;
-		};
-	};
-};
diff --git a/sys/boot/fdt/dts/arm/beaglebone-black.dts b/sys/boot/fdt/dts/arm/beaglebone-black.dts
index 0f4198c..f5144dd 100644
--- a/sys/boot/fdt/dts/arm/beaglebone-black.dts
+++ b/sys/boot/fdt/dts/arm/beaglebone-black.dts
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
+ * Copyright (c) 2015 Oleksandr Tymoshenko <gonzo@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,161 +26,6 @@
  * $FreeBSD$
  */
 
-/dts-v1/;
 
-/include/ "am335x.dtsi"
-
-/ {
-	model = "beaglebone-black";
-	compatible = "beaglebone-black", "beaglebone", "ti,am335x";
-
-
-	aliases {
-		soc = &SOC;
-		uart0 = &uart0;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = < 0x80000000 0x20000000 >;	/* 512MB RAM */
-	};
-
-	am335x {
- 		scm@44e10000 {
-			/* Set of triplets < padname, muxname, padstate> */
-			scm-pad-config =
-				/* I2C0 */
-				"I2C0_SDA", "I2C0_SDA","i2c",
-				"I2C0_SCL", "I2C0_SCL","i2c",
-				/* I2C1 */
-				"SPI0_D1", "I2C1_SDA", "i2c",
-				"SPI0_CS0", "I2C1_SCL", "i2c",
-				/* I2C2 */
-				"UART1_CTSn", "I2C2_SDA", "i2c",
-				"UART1_RTSn", "I2C2_SCL", "i2c",
-				/* Ethernet */
-				"MII1_RX_ER", "gmii1_rxerr", "input_pulldown",
-				"MII1_TX_EN", "gmii1_txen", "output",
-				"MII1_RX_DV", "gmii1_rxdv", "input_pulldown",
-				"MII1_TXD3", "gmii1_txd3", "output",
-				"MII1_TXD2", "gmii1_txd2", "output",
-				"MII1_TXD1", "gmii1_txd1", "output",
-				"MII1_TXD0", "gmii1_txd0", "output",
-				"MII1_TX_CLK", "gmii1_txclk", "input_pulldown",
-				"MII1_RX_CLK", "gmii1_rxclk", "input_pulldown",
-				"MII1_RXD3", "gmii1_rxd3", "input_pulldown",
-				"MII1_RXD2", "gmii1_rxd2", "input_pulldown",
-				"MII1_RXD1", "gmii1_rxd1",  "input_pulldown",
-				"MII1_RXD0", "gmii1_rxd0",  "input_pulldown",
-				"MDIO", "mdio_data", "input_pullup",
-				"MDC", "mdio_clk", "output_pullup",
-				/* MMCSD0 */
-				"MMC0_CMD", "mmc0_cmd", "input_pullup",
-				"MMC0_CLK", "mmc0_clk", "input_pullup",
-				"MMC0_DAT0", "mmc0_dat0", "input_pullup",
-				"MMC0_DAT1", "mmc0_dat1", "input_pullup",
-				"MMC0_DAT2", "mmc0_dat2", "input_pullup",
-				"MMC0_DAT3", "mmc0_dat3", "input_pullup",
-				/* MMC1 */
-				"GPMC_CSn1", "mmc1_clk", "input_pullup",
-				"GPMC_CSn2", "mmc1_cmd", "input_pullup",
-				"GPMC_CSn3", "gpio2_0", "output_pullup", /* Reset */
-				"GPMC_AD0", "mmc1_dat0", "input_pullup",
-				"GPMC_AD1", "mmc1_dat1", "input_pullup",
-				"GPMC_AD2", "mmc1_dat2", "input_pullup",
-				"GPMC_AD3", "mmc1_dat3", "input_pullup",
-				"GPMC_AD4", "mmc1_dat4", "input_pullup",
-				"GPMC_AD5", "mmc1_dat5", "input_pullup",
-				"GPMC_AD6", "mmc1_dat6", "input_pullup",
-				"GPMC_AD7", "mmc1_dat7", "input_pullup",
-				/* GPIO */
-				"ECAP0_IN_PWM0_OUT", "gpio0_7", "input_pulldown",
-				"GPMC_AD10", "gpio0_26", "input_pulldown",
-				"GPMC_AD11", "gpio0_27", "input_pulldown",
-				"GPMC_AD12", "gpio1_12", "input_pulldown",
-				"GPMC_AD13", "gpio1_13", "input_pulldown",
-				"GPMC_AD14", "gpio1_14", "input_pulldown",
-				"GPMC_AD15", "gpio1_15", "input_pulldown",
-				"GPMC_A0", "gpio1_16", "input_pulldown",
-				"GPMC_A1", "gpio1_17", "input_pulldown",
-				"GPMC_A5", "gpio1_21", "output", /* User LED 1 */
-				"GPMC_A6", "gpio1_22", "output", /* User LED 2 */
-				"GPMC_A7", "gpio1_23", "output", /* User LED 3 */
-				"GPMC_A8", "gpio1_24", "output", /* User LED 4 */
-				"GPMC_BEn1", "gpio1_28", "input_pulldown",
-				"GPMC_CSn0", "gpio1_29", "input_pulldown",
-				"GPMC_CLK", "gpio2_1", "input_pulldown",
-				"LCD_DATA0", "gpio2_6", "input_pulldown", 
-				"LCD_DATA1", "gpio2_7", "input_pulldown", 
-				"LCD_DATA2", "gpio2_8", "input_pulldown", 
-				"LCD_DATA3", "gpio2_9", "input_pulldown", 
-				"LCD_DATA4", "gpio2_10", "input_pulldown", 
-				"LCD_DATA5", "gpio2_11", "input_pulldown", 
-				"LCD_DATA6", "gpio2_12", "input_pulldown", 
-				"LCD_DATA7", "gpio2_13", "input_pulldown", 
-				"LCD_VSYNC", "gpio2_22", "input_pulldown",
-				"LCD_HSYNC", "gpio2_23", "input_pulldown",
-				"LCD_PCLK", "gpio2_24", "input_pulldown",
-				"LCD_AC_BIAS_EN", "gpio2_25", "input_pulldown",
-				"MCASP0_FSR", "gpio3_19", "input_pulldown",
-				"MCASP0_AHCLKX", "gpio3_21", "input_pulldown",
-				/* TIMERs */
-				"GPMC_ADVn_ALE", "timer4", "output",
-				"GPMC_BEn0_CLE", "timer5", "output",
-				"GPMC_WEn", "timer6", "output",
-				"GPMC_OEn_REn", "timer7", "output",
-				/* USB0 and USB1 */
-				"USB0_DRVVBUS", "USB0_DRVVBUS", "output",
-				"USB1_DRVVBUS", "USB1_DRVVBUS", "output",
-				/* PWM */
-				"GPMC_A2", "ehrpwm1A", "output",
-				"GPMC_A3", "ehrpwm1B", "output",
-				"GPMC_AD8", "ehrpwm2A", "output",
-				"GPMC_AD9", "ehrpwm2B", "output";
- 		};
-
-		mmchs1@481D8000 {
-                	bus-width = <8>;
-			status = "okay";
-			non-removable;
-		};
- 
-		i2c@44e0b000 {
-			pmic@48 {
-				compatible = "ti,am335x-pmic";
-				reg = <0x48>;
-				interrupts = <7>; /* nNMI */
-				interrupt-parent = <&AINTC>;
-			};
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led1 {
-			gpios = <&GPIO 53 2 0>;
-			name = "led1";
-		};
-
-		led2 {
-			gpios = <&GPIO 54 2 0>;
-			name = "led2";
-		};
-
-		led3 {
-			gpios = <&GPIO 55 2 0>;
-			name = "led3";
-		};
-
-		led4 {
-			gpios = <&GPIO 56 2 0>;
-			name = "led4";
-		};
-	};
-
-	chosen {
-		stdin = "uart0";
-		stdout = "uart0";
-	};
-};
+#include "am335x-boneblack.dts"
+#include "beaglebone-common.dtsi"
diff --git a/sys/boot/fdt/dts/arm/beaglebone-common.dtsi b/sys/boot/fdt/dts/arm/beaglebone-common.dtsi
new file mode 100644
index 0000000..ec69d97
--- /dev/null
+++ b/sys/boot/fdt/dts/arm/beaglebone-common.dtsi
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2015 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
+ */
+
+/ {
+	ocp {
+		pruss@4A300000 {
+			compatible = "ti,pruss-v2";
+			reg = <0x4A300000 0x80000>;
+ 			interrupt-parent = <&intc>;
+			interrupts = <20 21 22 23 24 25 26 27>;
+		};
+
+	};
+
+};
+
+&tps {
+	interrupt-parent = <&intc>;
+	interrupts = <7>;
+};
diff --git a/sys/boot/fdt/dts/arm/beaglebone.dts b/sys/boot/fdt/dts/arm/beaglebone.dts
index 83b948f..18e849d 100644
--- a/sys/boot/fdt/dts/arm/beaglebone.dts
+++ b/sys/boot/fdt/dts/arm/beaglebone.dts
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
+ * Copyright (c) 2015 Oleksandr Tymoshenko <gonzo@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,120 +26,5 @@
  * $FreeBSD$
  */
 
-/dts-v1/;
-
-/include/ "am335x.dtsi"
-
-/ {
-	model = "beaglebone";
-	compatible = "beaglebone", "ti,am335x";
-
-	aliases {
-		soc = &SOC;
-		uart0 = &uart0;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = < 0x80000000 0x10000000 >;	/* 256MB RAM */
-	};
-
-	am335x {
- 		scm@44e10000 {
-			/* Set of triplets < padname, muxname, padstate> */
-			scm-pad-config =
-				/* I2C0 */
-				"I2C0_SDA", "I2C0_SDA","i2c",
-				"I2C0_SCL", "I2C0_SCL","i2c",
-				/* Ethernet */
-				"MII1_RX_ER", "gmii1_rxerr", "input_pulldown",
-				"MII1_TX_EN", "gmii1_txen", "output",
-				"MII1_RX_DV", "gmii1_rxdv", "input_pulldown",
-				"MII1_TXD3", "gmii1_txd3", "output",
-				"MII1_TXD2", "gmii1_txd2", "output",
-				"MII1_TXD1", "gmii1_txd1", "output",
-				"MII1_TXD0", "gmii1_txd0", "output",
-				"MII1_TX_CLK", "gmii1_txclk", "input_pulldown",
-				"MII1_RX_CLK", "gmii1_rxclk", "input_pulldown",
-				"MII1_RXD3", "gmii1_rxd3", "input_pulldown",
-				"MII1_RXD2", "gmii1_rxd2", "input_pulldown",
-				"MII1_RXD1", "gmii1_rxd1",  "input_pulldown",
-				"MII1_RXD0", "gmii1_rxd0",  "input_pulldown",
-				"MDIO", "mdio_data", "input_pullup",
-				"MDC", "mdio_clk", "output_pullup",
-				/* MMCSD0 */
-				"MMC0_CMD", "mmc0_cmd", "input_pullup",
-				"MMC0_CLK", "mmc0_clk", "input_pullup",
-				"MMC0_DAT0", "mmc0_dat0", "input_pullup",
-				"MMC0_DAT1", "mmc0_dat1", "input_pullup",
-				"MMC0_DAT2", "mmc0_dat2", "input_pullup",
-				"MMC0_DAT3", "mmc0_dat3", "input_pullup",
-				/* USB0 and USB1 */
-				"USB0_DRVVBUS", "USB0_DRVVBUS", "output",
-				"USB1_DRVVBUS", "USB1_DRVVBUS", "output",
-				/* GPIO */
-				"ECAP0_IN_PWM0_OUT", "gpio0_7", "input_pulldown",
-				"GPMC_AD10", "gpio0_26", "input_pulldown",
-				"GPMC_AD11", "gpio0_27", "input_pulldown",
-				"GPMC_AD0", "gpio1_0", "input_pulldown",
-				"GPMC_AD1", "gpio1_1", "input_pulldown",
-				"GPMC_AD2", "gpio1_2", "input_pulldown",
-				"GPMC_AD3", "gpio1_3", "input_pulldown",
-				"GPMC_AD4", "gpio1_4", "input_pulldown",
-				"GPMC_AD5", "gpio1_5", "input_pulldown",
-				"GPMC_AD6", "gpio1_6", "input_pulldown",
-				"GPMC_AD7", "gpio1_7", "input_pulldown",
-				"GPMC_AD12", "gpio1_12", "input_pulldown",
-				"GPMC_AD13", "gpio1_13", "input_pulldown",
-				"GPMC_AD14", "gpio1_14", "input_pulldown",
-				"GPMC_AD15", "gpio1_15", "input_pulldown",
-				"GPMC_A0", "gpio1_16", "input_pulldown",
-				"GPMC_A1", "gpio1_17", "input_pulldown",
-				"GPMC_A5", "gpio1_21", "output", /* User LED 1 */
-				"GPMC_A6", "gpio1_22", "output", /* User LED 2 */
-				"GPMC_A7", "gpio1_23", "output", /* User LED 3 */
-				"GPMC_A8", "gpio1_24", "output", /* User LED 4 */
-				"GPMC_BEn1", "gpio1_28", "input_pulldown",
-				"GPMC_CSn0", "gpio1_29", "input_pulldown",
-				"GPMC_CSn1", "gpio1_30", "input_pulldown",
-				"GPMC_CSn2", "gpio1_31", "input_pulldown",
-				"GPMC_CLK", "gpio2_1", "input_pulldown",
-				"LCD_DATA0", "gpio2_6", "input_pulldown", 
-				"LCD_DATA1", "gpio2_7", "input_pulldown", 
-				"LCD_DATA2", "gpio2_8", "input_pulldown", 
-				"LCD_DATA3", "gpio2_9", "input_pulldown", 
-				"LCD_DATA4", "gpio2_10", "input_pulldown", 
-				"LCD_DATA5", "gpio2_11", "input_pulldown", 
-				"LCD_DATA6", "gpio2_12", "input_pulldown", 
-				"LCD_DATA7", "gpio2_13", "input_pulldown", 
-				"LCD_VSYNC", "gpio2_22", "input_pulldown",
-				"LCD_HSYNC", "gpio2_23", "input_pulldown",
-				"LCD_PCLK", "gpio2_24", "input_pulldown",
-				"LCD_AC_BIAS_EN", "gpio2_25", "input_pulldown",
-				"MCASP0_FSR", "gpio3_19", "input_pulldown",
-				"MCASP0_AHCLKX", "gpio3_21", "input_pulldown",
-				/* TIMERs */
-				"GPMC_ADVn_ALE", "timer4", "output",
-				"GPMC_BEn0_CLE", "timer5", "output",
-				"GPMC_WEn", "timer6", "output",
-				"GPMC_OEn_REn", "timer7", "output",
-				/* PWM */
-				"GPMC_A2", "ehrpwm1A", "output",
-				"GPMC_A3", "ehrpwm1B", "output",
-				"GPMC_AD8", "ehrpwm2A", "output",
-				"GPMC_AD9", "ehrpwm2B", "output";
- 		};
- 
-		i2c@44e0b000 {
-			pmic@24 {
-				compatible = "ti,am335x-pmic";
-				reg = <0x48>;
-			};
-		};
-	};
-
-	chosen {
-		stdin = "uart0";
-		stdout = "uart0";
-	};
-};
+#include "am335x-bone.dts"
+#include "beaglebone-common.dtsi"
diff --git a/sys/boot/fdt/dts/arm/pandaboard-common.dtsi b/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
new file mode 100644
index 0000000..911c4526
--- /dev/null
+++ b/sys/boot/fdt/dts/arm/pandaboard-common.dtsi
@@ -0,0 +1,49 @@
+/*-
+ * Copyright (c) 2015 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
+ */
+
+&mmc1 {
+	non-removable; /* XXX need real solution */
+};
+
+&mmc5 {
+	status = "disabled";
+};
+
+/ {
+	ocp {
+		global-timer@48240600 {
+			compatible = "arm,cortex-a9-global-timer";
+			reg = <0x48240200 0x20>;
+			interrupts = <GIC_PPI 11 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_LEVEL_HIGH)>;
+		};
+	};
+	chosen {
+		stdin = "serial2";
+		stdout = "serial2";
+	};
+};
diff --git a/sys/boot/fdt/dts/arm/pandaboard-es.dts b/sys/boot/fdt/dts/arm/pandaboard-es.dts
new file mode 100644
index 0000000..6c3f4b5
--- /dev/null
+++ b/sys/boot/fdt/dts/arm/pandaboard-es.dts
@@ -0,0 +1,31 @@
+/*-
+ * Copyright (c) 2015 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
+ */
+
+
+#include "omap4-panda-es.dts"
+#include "pandaboard-common.dtsi"
diff --git a/sys/boot/fdt/dts/arm/pandaboard.dts b/sys/boot/fdt/dts/arm/pandaboard.dts
index c89bf88..b25ca63 100644
--- a/sys/boot/fdt/dts/arm/pandaboard.dts
+++ b/sys/boot/fdt/dts/arm/pandaboard.dts
@@ -1,9 +1,7 @@
 /*-
- * Copyright (c) 2011 The FreeBSD Foundation
+ * Copyright (c) 2015 Oleksandr Tymoshenko <gonzo@freebsd.org>
  * All rights reserved.
  *
- * Developed by Damjan Marion <damjan.marion@gmail.com>
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,159 +26,6 @@
  * $FreeBSD$
  */
 
-/dts-v1/;
-
-/ {
-	model = "pandaboard";
-	compatible = "pandaboard", "ti,omap4430";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	interrupt-parent = <&GIC>;
-
-	aliases {
-		soc = &SOC;
-		uart3 = &uart3;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = < 0x80000000 0x40000000 >;	/* 1GB RAM at 0x0 */
-	};
-
-	SOC: omap4430 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		ranges;
-		bus-frequency = <0>;
-
-		GIC: interrupt-controller@48241000 {
-			compatible = "arm,gic";
-			interrupt-controller;
-			#address-cells = <0>;
-			#interrupt-cells = <1>;
-			reg =	< 0x48241000 0x1000 >,	/* Distributor Registers */
-				< 0x48240100 0x0100 >;	/* CPU Interface Registers */
-		};
-
-		omap4_prcm@4a306000 {
-	   		compatible = "ti,omap4_prcm";
-   			reg =<  0x4a306000 0x2000
-			    0x4a004000 0x1000
-			    0x4a008000 0x8000>;
-		};
-				     
-		pl310@48242000 {
-			compatible = "arm,pl310";
-			reg = < 0x48242000 0x1000 >;
-			interrupts = < 32 >;
-			interrupt-parent = < &GIC >;
-		};
-		mp_tmr@48240200 {
-			compatible = "arm,mpcore-timers";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			reg =	< 0x48240200 0x100 >, /* Global Timer Registers */
-				< 0x48240600 0x100 >; /* Private Timer Registers */
-			interrupts = < 27 29 >;
-			interrupt-parent = < &GIC >;
-		};
-
-		uart3: serial@48020000 {
-			compatible = "ns16550";
-			reg = <0x48020000 0x1000>;
-			reg-shift = <2>;
-			interrupts = < 106 >;
-			interrupt-parent = <&GIC>;
-			clock-frequency = < 48000000 >; /* 48Mhz clock for all uarts */
-							/* (techref 17.3.1.1) */
-		};
-
-		scm@4a100000 {
-			compatible = "ti,scm";
-			reg =	< 0x4a100000 0x1000 >;
-			/* Set of triplets < padname, muxname, padstate> */
-			scm-pad-config = 
-				"ag19", "usbb1_ulpiphy_stp", "output",
-				"ae18", "usbb1_ulpiphy_clk", "input_pulldown",
-				"af19", "usbb1_ulpiphy_dir", "input_pulldown",
-				"ae19", "usbb1_ulpiphy_nxt", "input_pulldown",
-				"af18", "usbb1_ulpiphy_dat0", "input_pulldown",
-				"ag18", "usbb1_ulpiphy_dat1", "input_pulldown",
-				"ae17", "usbb1_ulpiphy_dat2", "input_pulldown",
-				"af17", "usbb1_ulpiphy_dat3", "input_pulldown",
-				"ah17", "usbb1_ulpiphy_dat4", "input_pulldown",
-				"ae16", "usbb1_ulpiphy_dat5", "input_pulldown",
-				"af16", "usbb1_ulpiphy_dat6", "input_pulldown",
-				"ag16", "usbb1_ulpiphy_dat7", "input_pulldown";
-		};
-
-		GPIO: gpio {
-			#gpio-cells = <3>;
-			compatible = "ti,gpio";
-			gpio-controller;
-			reg =<	0x4a310000 0x1000
-				0x48055000 0x1000
-				0x48057000 0x1000
-				0x48059000 0x1000
-				0x4805b000 0x1000
-				0x4805d000 0x1000>;
-			interrupts = <61 62 63 64 65 66>;
-			interrupt-parent = <&GIC>;
-		};
-
-		ehci {
-			compatible = "ti,usb-ehci", "usb-ehci";
-			/* 
-			 * USB port PHY configuration is a tuple: <mode, reset, gpio_pin>
-			 * mode is one of the following values:
-			 *   0 - unknown
-			 *   1 - PHY
-			 *   2 - TLL
-			 *   3 - HSIC
-			 *
-			 * reset indicates (if non-zero) if port reset is required 
-			 * gpio_pin - GPIO pin that is used to perform reset
-			 */
-			phy-config = <  1 0 0
-					0 0 0
-					0 0 0>;
-			reg = < 0x4a064c00 0x100	/* EHCI regs */
-				0x4a064000 0x700	/* UHH regs */
-				0x4a062000 0x1000>;	/* TLL regs */
-			interrupts = <109>;
-			interrupt-parent = <&GIC>;
-		};
-
-		I2C1: i2c@x48070000 {
-			compatible = "ti,i2c";
-			reg =<	0x48070000 0x100 >;
-			interrupts = <88>;
-			interrupt-parent = <&GIC>;
-			i2c-device-id = <1>;
-		};
-
-		sdma@x48070000 {
-			compatible = "ti,sdma";
-			reg =<	0x4A056000 0x1000 >;
-			interrupts = <44 45 46 47>;
-			interrupt-parent = <&GIC>;
-		};
-
-		mmc@x4809C000 {
-			compatible = "ti,mmchs";
-			reg =<0x4809C000 0x1000 >;
-			interrupts = <115>;
-			interrupt-parent = <&GIC>;
-			mmchs-device-id = <1>;
-			non-removable; /* XXX need real solution */
-		};
-
-	};
 
-	chosen {
-		stdin = "uart3";
-		stdout = "uart3";
-	};
-};
+#include "omap4-panda.dts"
+#include "pandaboard-common.dtsi"