D26552.diff
No OneTemporary
Actions

Size

209 KB

Referenced Files

None

Subscribers

None

D26552.diff
View Options

	diff --git a/sys/gnu/dts/arm/am335x-baltos.dtsi b/sys/gnu/dts/arm/am335x-baltos.dtsi
	--- a/sys/gnu/dts/arm/am335x-baltos.dtsi
	+++ b/sys/gnu/dts/arm/am335x-baltos.dtsi
	@@ -258,6 +258,18 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&cppi41dma {
	+ status = "okay";
	+};
	+
	#include "tps65910.dtsi"

	&tps {
	diff --git a/sys/gnu/dts/arm/am335x-bone-common.dtsi b/sys/gnu/dts/arm/am335x-bone-common.dtsi
	--- a/sys/gnu/dts/arm/am335x-bone-common.dtsi
	+++ b/sys/gnu/dts/arm/am335x-bone-common.dtsi
	@@ -191,16 +191,38 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "peripheral";
	interrupts-extended = <&intc 18 &tps 0>;
	interrupt-names = "mc", "vbus";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&i2c0 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c0_pins>;
	diff --git a/sys/gnu/dts/arm/am335x-boneblack-common.dtsi b/sys/gnu/dts/arm/am335x-boneblack-common.dtsi
	--- a/sys/gnu/dts/arm/am335x-boneblack-common.dtsi
	+++ b/sys/gnu/dts/arm/am335x-boneblack-common.dtsi
	@@ -131,11 +131,6 @@
	};

	/ {
	- memory@80000000 {
	- device_type = "memory";
	- reg = <0x80000000 0x20000000>; /* 512 MB */
	- };
	-
	clk_mcasp0_fixed: clk_mcasp0_fixed {
	#clock-cells = <0>;
	compatible = "fixed-clock";
	diff --git a/sys/gnu/dts/arm/am335x-boneblue.dts b/sys/gnu/dts/arm/am335x-boneblue.dts
	--- a/sys/gnu/dts/arm/am335x-boneblue.dts
	+++ b/sys/gnu/dts/arm/am335x-boneblue.dts
	@@ -278,16 +278,38 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "peripheral";
	interrupts-extended = <&intc 18 &tps 0>;
	interrupt-names = "mc", "vbus";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&i2c0 {
	baseboard_eeprom: baseboard_eeprom@50 {
	compatible = "atmel,24c256";
	diff --git a/sys/gnu/dts/arm/am335x-chiliboard.dts b/sys/gnu/dts/arm/am335x-chiliboard.dts
	--- a/sys/gnu/dts/arm/am335x-chiliboard.dts
	+++ b/sys/gnu/dts/arm/am335x-chiliboard.dts
	@@ -153,12 +153,30 @@
	};

	/* USB */
	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb1 {
	pinctrl-names = "default";
	pinctrl-0 = <&usb1_drvvbus>;
	+
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	/* microSD */
	&mmc1 {
	pinctrl-names = "default";
	diff --git a/sys/gnu/dts/arm/am335x-cm-t335.dts b/sys/gnu/dts/arm/am335x-cm-t335.dts
	--- a/sys/gnu/dts/arm/am335x-cm-t335.dts
	+++ b/sys/gnu/dts/arm/am335x-cm-t335.dts
	@@ -330,6 +330,26 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&epwmss0 {
	status = "okay";

	diff --git a/sys/gnu/dts/arm/am335x-evm.dts b/sys/gnu/dts/arm/am335x-evm.dts
	--- a/sys/gnu/dts/arm/am335x-evm.dts
	+++ b/sys/gnu/dts/arm/am335x-evm.dts
	@@ -113,7 +113,7 @@
	};
	};

	- backlight: backlight {
	+ backlight {
	compatible = "pwm-backlight";
	pwms = <&ecap0 0 50000 0>;
	brightness-levels = <0 51 53 56 62 75 101 152 255>;
	@@ -121,15 +121,35 @@
	};

	panel {
	- compatible = "tfc,s9700rtwv43tr-01b";
	-
	+ compatible = "ti,tilcdc,panel";
	+ status = "okay";
	pinctrl-names = "default";
	pinctrl-0 = <&lcd_pins_s0>;
	- backlight = <&backlight>;
	+ panel-info {
	+ ac-bias = <255>;
	+ ac-bias-intrpt = <0>;
	+ dma-burst-sz = <16>;
	+ bpp = <32>;
	+ fdd = <0x80>;
	+ sync-edge = <0>;
	+ sync-ctrl = <1>;
	+ raster-order = <0>;
	+ fifo-th = <0>;
	+ };

	- port {
	- panel_0: endpoint@0 {
	- remote-endpoint = <&lcdc_0>;
	+ display-timings {
	+ 800x480p62 {
	+ clock-frequency = <30000000>;
	+ hactive = <800>;
	+ vactive = <480>;
	+ hfront-porch = <39>;
	+ hback-porch = <39>;
	+ hsync-len = <47>;
	+ vback-porch = <29>;
	+ vfront-porch = <13>;
	+ vsync-len = <2>;
	+ hsync-active = <1>;
	+ vsync-active = <1>;
	};
	};
	};
	@@ -413,10 +433,35 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&i2c1 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c1_pins>;
	@@ -480,12 +525,6 @@
	status = "okay";

	blue-and-red-wiring = "crossed";
	-
	- port {
	- lcdc_0: endpoint@0 {
	- remote-endpoint = <&panel_0>;
	- };
	- };
	};

	&elm {
	diff --git a/sys/gnu/dts/arm/am335x-evmsk.dts b/sys/gnu/dts/arm/am335x-evmsk.dts
	--- a/sys/gnu/dts/arm/am335x-evmsk.dts
	+++ b/sys/gnu/dts/arm/am335x-evmsk.dts
	@@ -183,16 +183,36 @@
	};

	panel {
	- compatible = "newhaven,nhd-4.3-480272ef-atxl";
	-
	+ compatible = "ti,tilcdc,panel";
	pinctrl-names = "default", "sleep";
	pinctrl-0 = <&lcd_pins_default>;
	pinctrl-1 = <&lcd_pins_sleep>;
	backlight = <&lcd_bl>;
	-
	- port {
	- panel_0: endpoint@0 {
	- remote-endpoint = <&lcdc_0>;
	+ status = "okay";
	+ panel-info {
	+ ac-bias = <255>;
	+ ac-bias-intrpt = <0>;
	+ dma-burst-sz = <16>;
	+ bpp = <32>;
	+ fdd = <0x80>;
	+ sync-edge = <0>;
	+ sync-ctrl = <1>;
	+ raster-order = <0>;
	+ fifo-th = <0>;
	+ };
	+ display-timings {
	+ 480x272 {
	+ hactive = <480>;
	+ vactive = <272>;
	+ hback-porch = <43>;
	+ hfront-porch = <8>;
	+ hsync-len = <4>;
	+ vback-porch = <12>;
	+ vfront-porch = <4>;
	+ vsync-len = <10>;
	+ clock-frequency = <9000000>;
	+ hsync-active = <0>;
	+ vsync-active = <0>;
	};
	};
	};
	@@ -503,10 +523,35 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&epwmss2 {
	status = "okay";

	@@ -705,12 +750,6 @@
	status = "okay";

	blue-and-red-wiring = "crossed";
	-
	- port {
	- lcdc_0: endpoint@0 {
	- remote-endpoint = <&panel_0>;
	- };
	- };
	};

	&rtc {
	diff --git a/sys/gnu/dts/arm/am335x-guardian.dts b/sys/gnu/dts/arm/am335x-guardian.dts
	--- a/sys/gnu/dts/arm/am335x-guardian.dts
	+++ b/sys/gnu/dts/arm/am335x-guardian.dts
	@@ -115,6 +115,10 @@
	};
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&elm {
	status = "okay";
	};
	@@ -324,12 +328,30 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	&usb0 {
	dr_mode = "peripheral";
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	};

	&usb1 {
	dr_mode = "host";
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	};

	&am33xx_pinmux {
	diff --git a/sys/gnu/dts/arm/am335x-icev2.dts b/sys/gnu/dts/arm/am335x-icev2.dts
	--- a/sys/gnu/dts/arm/am335x-icev2.dts
	+++ b/sys/gnu/dts/arm/am335x-icev2.dts
	@@ -287,19 +287,6 @@
	gpio-controller;
	#gpio-cells = <2>;
	};
	-
	- /* osd9616p0899-10 */
	- display@3c {
	- compatible = "solomon,ssd1306fb-i2c";
	- reg = <0x3c>;
	- solomon,height = <16>;
	- solomon,width = <96>;
	- solomon,com-seq;
	- solomon,com-invdir;
	- solomon,page-offset = <0>;
	- solomon,prechargep1 = <2>;
	- solomon,prechargep2 = <13>;
	- };
	};

	&spi0 {
	diff --git a/sys/gnu/dts/arm/am335x-igep0033.dtsi b/sys/gnu/dts/arm/am335x-igep0033.dtsi
	--- a/sys/gnu/dts/arm/am335x-igep0033.dtsi
	+++ b/sys/gnu/dts/arm/am335x-igep0033.dtsi
	@@ -217,10 +217,35 @@
	pinctrl-0 = <&uart0_pins>;
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	#include "tps65910.dtsi"

	&tps {
	diff --git a/sys/gnu/dts/arm/am335x-lxm.dts b/sys/gnu/dts/arm/am335x-lxm.dts
	--- a/sys/gnu/dts/arm/am335x-lxm.dts
	+++ b/sys/gnu/dts/arm/am335x-lxm.dts
	@@ -283,14 +283,36 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "host";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&cpsw_emac0 {
	phy-handle = <&ethphy0>;
	phy-mode = "rmii";
	diff --git a/sys/gnu/dts/arm/am335x-moxa-uc-2100-common.dtsi b/sys/gnu/dts/arm/am335x-moxa-uc-2100-common.dtsi
	--- a/sys/gnu/dts/arm/am335x-moxa-uc-2100-common.dtsi
	+++ b/sys/gnu/dts/arm/am335x-moxa-uc-2100-common.dtsi
	@@ -111,10 +111,27 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	/* Power */
	&vbat {
	regulator-name = "vbat";
	diff --git a/sys/gnu/dts/arm/am335x-moxa-uc-8100-me-t.dts b/sys/gnu/dts/arm/am335x-moxa-uc-8100-me-t.dts
	--- a/sys/gnu/dts/arm/am335x-moxa-uc-8100-me-t.dts
	+++ b/sys/gnu/dts/arm/am335x-moxa-uc-8100-me-t.dts
	@@ -290,14 +290,36 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "host";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	#include "tps65910.dtsi"

	&tps {
	diff --git a/sys/gnu/dts/arm/am335x-netcan-plus-1xx.dts b/sys/gnu/dts/arm/am335x-netcan-plus-1xx.dts
	--- a/sys/gnu/dts/arm/am335x-netcan-plus-1xx.dts
	+++ b/sys/gnu/dts/arm/am335x-netcan-plus-1xx.dts
	@@ -1,87 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
	- */
	-
	-/*
	- * VScom OnRISC
	- * http://www.vscom.de
	- */
	-
	-/dts-v1/;
	-
	-#include "am335x-baltos.dtsi"
	-#include "am335x-baltos-leds.dtsi"
	-
	-/ {
	- model = "NetCAN";
	-
	- leds {
	- pinctrl-names = "default";
	- pinctrl-0 = <&user_leds_s0>;
	-
	- compatible = "gpio-leds";
	-
	- led@1 {
	- label = "can_data";
	- linux,default-trigger = "netdev";
	- gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
	- default-state = "off";
	- };
	- led@2 {
	- label = "can_error";
	- gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
	- default-state = "off";
	- };
	- };
	-};
	-
	-&am33xx_pinmux {
	- user_leds_s0: user_leds_s0 {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* CAN Data LED */
	- AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* CAN Error LED */
	- >;
	- };
	-
	- dcan1_pins: pinmux_dcan1_pins {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2) /* CAN TX */
	- AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE2) /* CAN RX */
	- >;
	- };
	-};
	-
	-&usb0_phy {
	- status = "okay";
	-};
	-
	-&usb0 {
	- status = "okay";
	- dr_mode = "host";
	-};
	-
	-&davinci_mdio {
	- phy0: ethernet-phy@0 {
	- reg = <1>;
	- };
	-};
	-
	-&cpsw_emac0 {
	- phy-mode = "rmii";
	- dual_emac_res_vlan = <1>;
	- phy-handle = <&phy0>;
	-};
	-
	-&cpsw_emac1 {
	- phy-mode = "rgmii-id";
	- dual_emac_res_vlan = <2>;
	- phy-handle = <&phy1>;
	-};
	-
	-&dcan1 {
	- pinctrl-names = "default";
	- pinctrl-0 = <&dcan1_pins>;
	-
	- status = "okay";
	-};
	diff --git a/sys/gnu/dts/arm/am335x-netcom-plus-2xx.dts b/sys/gnu/dts/arm/am335x-netcom-plus-2xx.dts
	--- a/sys/gnu/dts/arm/am335x-netcom-plus-2xx.dts
	+++ b/sys/gnu/dts/arm/am335x-netcom-plus-2xx.dts
	@@ -1,95 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
	- */
	-
	-/*
	- * VScom OnRISC
	- * http://www.vscom.de
	- */
	-
	-/dts-v1/;
	-
	-#include "am335x-baltos.dtsi"
	-#include "am335x-baltos-leds.dtsi"
	-
	-/ {
	- model = "NetCom Plus";
	-};
	-
	-&am33xx_pinmux {
	- uart1_pins: pinmux_uart1_pins {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0) /* RX */
	- AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0) /* TX */
	- AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE0) /* CTS */
	- AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0) /* RTS */
	- AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* DTR */
	- AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_INPUT_PULLDOWN, MUX_MODE7) /* DSR */
	- AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_INPUT_PULLDOWN, MUX_MODE7) /* DCD */
	- AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7) /* RI */
	- >;
	- };
	-
	- uart2_pins: pinmux_uart2_pins {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1) /* RX */
	- AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1) /* TX */
	- AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLDOWN, MUX_MODE2) /* CTS */
	- AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* RTS */
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* DTR */
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLDOWN, MUX_MODE7) /* DSR */
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLDOWN, MUX_MODE7) /* DCD */
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLDOWN, MUX_MODE7) /* RI */
	- >;
	- };
	-};
	-
	-&usb0_phy {
	- status = "okay";
	-};
	-
	-&usb0 {
	- status = "okay";
	- dr_mode = "host";
	-};
	-
	-&uart1 {
	- pinctrl-names = "default";
	- pinctrl-0 = <&uart1_pins>;
	- dtr-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
	- dsr-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
	- dcd-gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
	- rng-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
	-
	- status = "okay";
	-};
	-
	-&uart2 {
	- pinctrl-names = "default";
	- pinctrl-0 = <&uart2_pins>;
	- dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
	- dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
	- dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
	- rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
	-
	- status = "okay";
	-};
	-
	-&davinci_mdio {
	- phy0: ethernet-phy@0 {
	- reg = <1>;
	- };
	-};
	-
	-&cpsw_emac0 {
	- phy-mode = "rmii";
	- dual_emac_res_vlan = <1>;
	- phy-handle = <&phy0>;
	-};
	-
	-&cpsw_emac1 {
	- phy-mode = "rgmii-id";
	- dual_emac_res_vlan = <2>;
	- phy-handle = <&phy1>;
	-};
	diff --git a/sys/gnu/dts/arm/am335x-netcom-plus-8xx.dts b/sys/gnu/dts/arm/am335x-netcom-plus-8xx.dts
	--- a/sys/gnu/dts/arm/am335x-netcom-plus-8xx.dts
	+++ b/sys/gnu/dts/arm/am335x-netcom-plus-8xx.dts
	@@ -1,115 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
	- */
	-
	-/*
	- * VScom OnRISC
	- * http://www.vscom.de
	- */
	-
	-/dts-v1/;
	-
	-#include "am335x-baltos.dtsi"
	-
	-/ {
	- model = "NetCom Plus";
	-};
	-
	-&am33xx_pinmux {
	- pinctrl-names = "default";
	- pinctrl-0 = <&dip_switches>;
	-
	- dip_switches: pinmux_dip_switches {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLDOWN, MUX_MODE7)
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLDOWN, MUX_MODE7)
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLDOWN, MUX_MODE7)
	- AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLDOWN, MUX_MODE7)
	- >;
	- };
	-
	- tca6416_pins: pinmux_tca6416_pins {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT_PULLUP, MUX_MODE7)
	- >;
	- };
	-
	- i2c2_pins: pinmux_i2c2_pins {
	- pinctrl-single,pins = <
	- AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE3)
	- AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE3)
	- >;
	- };
	-};
	-
	-&usb0_phy {
	- status = "okay";
	-};
	-
	-&usb1_phy {
	- status = "okay";
	-};
	-
	-&usb0 {
	- status = "okay";
	- dr_mode = "host";
	-};
	-
	-&usb1 {
	- status = "okay";
	- dr_mode = "host";
	-};
	-
	-&i2c1 {
	- tca6416a: gpio@20 {
	- compatible = "ti,tca6416";
	- reg = <0x20>;
	- gpio-controller;
	- #gpio-cells = <2>;
	- interrupt-parent = <&gpio0>;
	- interrupts = <20 IRQ_TYPE_EDGE_RISING>;
	- pinctrl-names = "default";
	- pinctrl-0 = <&tca6416_pins>;
	- };
	-};
	-
	-&i2c2 {
	- pinctrl-names = "default";
	- pinctrl-0 = <&i2c2_pins>;
	-
	- status = "okay";
	- clock-frequency = <400000>;
	-
	- tca6416b: gpio@20 {
	- compatible = "ti,tca6416";
	- reg = <0x20>;
	- gpio-controller;
	- #gpio-cells = <2>;
	- };
	-
	- tca6416c: gpio@21 {
	- compatible = "ti,tca6416";
	- reg = <0x21>;
	- gpio-controller;
	- #gpio-cells = <2>;
	- };
	-};
	-
	-&davinci_mdio {
	- phy0: ethernet-phy@0 {
	- reg = <1>;
	- };
	-};
	-
	-&cpsw_emac0 {
	- phy-mode = "rmii";
	- dual_emac_res_vlan = <1>;
	- phy-handle = <&phy0>;
	-};
	-
	-&cpsw_emac1 {
	- phy-mode = "rgmii-id";
	- dual_emac_res_vlan = <2>;
	- phy-handle = <&phy1>;
	-};
	diff --git a/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts b/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts
	--- a/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts
	+++ b/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts
	@@ -384,16 +384,38 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "peripheral";
	interrupts-extended = <&intc 18 &tps 0>;
	interrupt-names = "mc", "vbus";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&i2c2 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c2_pins>;
	diff --git a/sys/gnu/dts/arm/am335x-pcm-953.dtsi b/sys/gnu/dts/arm/am335x-pcm-953.dtsi
	--- a/sys/gnu/dts/arm/am335x-pcm-953.dtsi
	+++ b/sys/gnu/dts/arm/am335x-pcm-953.dtsi
	@@ -237,6 +237,31 @@
	};

	/* USB */
	+&cppi41dma {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	diff --git a/sys/gnu/dts/arm/am335x-pdu001.dts b/sys/gnu/dts/arm/am335x-pdu001.dts
	--- a/sys/gnu/dts/arm/am335x-pdu001.dts
	+++ b/sys/gnu/dts/arm/am335x-pdu001.dts
	@@ -384,6 +384,34 @@
	};
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	+&usb1 {
	+ status = "okay";
	+};
	+
	+&cppi41dma {
	+ status = "okay";
	+};
	+
	/*
	* Disable soc's rtc as we have no VBAT for it. This makes the board
	* rtc (Microchip MCP79400) the default rtc device 'rtc0'.
	diff --git a/sys/gnu/dts/arm/am335x-pepper.dts b/sys/gnu/dts/arm/am335x-pepper.dts
	--- a/sys/gnu/dts/arm/am335x-pepper.dts
	+++ b/sys/gnu/dts/arm/am335x-pepper.dts
	@@ -552,18 +552,38 @@

	/* USB */
	&usb {
	+ status = "okay";
	+
	pinctrl-names = "default";
	pinctrl-0 = <&usb_pins>;
	};

	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "host";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&am33xx_pinmux {
	usb_pins: pinmux_usb {
	pinctrl-single,pins = <
	diff --git a/sys/gnu/dts/arm/am335x-pocketbeagle.dts b/sys/gnu/dts/arm/am335x-pocketbeagle.dts
	--- a/sys/gnu/dts/arm/am335x-pocketbeagle.dts
	+++ b/sys/gnu/dts/arm/am335x-pocketbeagle.dts
	@@ -206,10 +206,32 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "otg";
	};

	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};
	+
	+&cppi41dma {
	+ status = "okay";
	+};
	diff --git a/sys/gnu/dts/arm/am335x-regor.dtsi b/sys/gnu/dts/arm/am335x-regor.dtsi
	--- a/sys/gnu/dts/arm/am335x-regor.dtsi
	+++ b/sys/gnu/dts/arm/am335x-regor.dtsi
	@@ -200,3 +200,24 @@
	status = "okay";
	linux,rs485-enabled-at-boot-time;
	};
	+
	+/* USB */
	+&cppi41dma {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	diff --git a/sys/gnu/dts/arm/am335x-sancloud-bbe.dts b/sys/gnu/dts/arm/am335x-sancloud-bbe.dts
	--- a/sys/gnu/dts/arm/am335x-sancloud-bbe.dts
	+++ b/sys/gnu/dts/arm/am335x-sancloud-bbe.dts
	@@ -108,7 +108,7 @@

	&cpsw_emac0 {
	phy-handle = <&ethphy0>;
	- phy-mode = "rgmii-id";
	+ phy-mode = "rgmii-txid";
	};

	&i2c0 {
	diff --git a/sys/gnu/dts/arm/am335x-shc.dts b/sys/gnu/dts/arm/am335x-shc.dts
	--- a/sys/gnu/dts/arm/am335x-shc.dts
	+++ b/sys/gnu/dts/arm/am335x-shc.dts
	@@ -117,6 +117,10 @@
	status = "okay";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&davinci_mdio {
	pinctrl-names = "default", "sleep";
	pinctrl-0 = <&davinci_mdio_default>;
	@@ -354,7 +358,20 @@
	status = "okay";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	diff --git a/sys/gnu/dts/arm/am335x-sl50.dts b/sys/gnu/dts/arm/am335x-sl50.dts
	--- a/sys/gnu/dts/arm/am335x-sl50.dts
	+++ b/sys/gnu/dts/arm/am335x-sl50.dts
	@@ -512,14 +512,36 @@
	status = "disabled";
	};

	+&usb {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	+};
	+
	&usb0 {
	+ status = "okay";
	dr_mode = "otg";
	};

	&usb1 {
	+ status = "okay";
	dr_mode = "host";
	};

	+&cppi41dma {
	+ status = "okay";
	+};
	+
	&mmc1 {
	status = "okay";
	pinctrl-names = "default";
	diff --git a/sys/gnu/dts/arm/am335x-wega.dtsi b/sys/gnu/dts/arm/am335x-wega.dtsi
	--- a/sys/gnu/dts/arm/am335x-wega.dtsi
	+++ b/sys/gnu/dts/arm/am335x-wega.dtsi
	@@ -191,6 +191,32 @@
	status = "okay";
	};

	+/* USB */
	+&cppi41dma {
	+ status = "okay";
	+};
	+
	+&usb_ctrl_mod {
	+ status = "okay";
	+};
	+
	+&usb {
	+ status = "okay";
	+};
	+
	+&usb0 {
	+ status = "okay";
	+};
	+
	+&usb0_phy {
	+ status = "okay";
	+};
	+
	&usb1 {
	dr_mode = "host";
	+ status = "okay";
	+};
	+
	+&usb1_phy {
	+ status = "okay";
	};
	diff --git a/sys/gnu/dts/arm/am33xx-l4.dtsi b/sys/gnu/dts/arm/am33xx-l4.dtsi
	--- a/sys/gnu/dts/arm/am33xx-l4.dtsi
	+++ b/sys/gnu/dts/arm/am33xx-l4.dtsi
	@@ -129,6 +129,7 @@

	gpio0_target: target-module@7000 { /* 0x44e07000, ap 14 20.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio1";
	reg = <0x7000 0x4>,
	<0x7010 0x4>,
	<0x7114 0x4>;
	@@ -162,6 +163,7 @@

	target-module@9000 { /* 0x44e09000, ap 16 04.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart1";
	reg = <0x9050 0x4>,
	<0x9054 0x4>,
	<0x9058 0x4>;
	@@ -193,6 +195,7 @@

	target-module@b000 { /* 0x44e0b000, ap 18 48.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c1";
	reg = <0xb000 0x8>,
	<0xb010 0x8>,
	<0xb090 0x8>;
	@@ -225,6 +228,7 @@

	target-module@d000 { /* 0x44e0d000, ap 20 38.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "adc_tsc";
	reg = <0xd000 0x4>,
	<0xd010 0x4>;
	reg-names = "rev", "sysc";
	@@ -302,13 +306,6 @@
	};
	};

	- usb_ctrl_mod: control@620 {
	- compatible = "ti,am335x-usb-ctrl-module";
	- reg = <0x620 0x10>,
	- <0x648 0x4>;
	- reg-names = "phy_ctrl", "wakeup";
	- };
	-
	wkup_m3_ipc: wkup_m3_ipc@1324 {
	compatible = "ti,am3352-wkup-m3-ipc";
	reg = <0x1324 0x24>;
	@@ -371,6 +368,7 @@

	target-module@35000 { /* 0x44e35000, ap 29 50.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "wd_timer2";
	reg = <0x35000 0x4>,
	<0x35010 0x4>,
	<0x35014 0x4>;
	@@ -914,6 +912,7 @@

	target-module@22000 { /* 0x48022000, ap 10 12.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart2";
	reg = <0x22050 0x4>,
	<0x22054 0x4>,
	<0x22058 0x4>;
	@@ -945,6 +944,7 @@

	target-module@24000 { /* 0x48024000, ap 12 14.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart3";
	reg = <0x24050 0x4>,
	<0x24054 0x4>,
	<0x24058 0x4>;
	@@ -976,6 +976,7 @@

	target-module@2a000 { /* 0x4802a000, ap 14 2a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c2";
	reg = <0x2a000 0x8>,
	<0x2a010 0x8>,
	<0x2a090 0x8>;
	@@ -1008,6 +1009,7 @@

	target-module@30000 { /* 0x48030000, ap 77 08.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi0";
	reg = <0x30000 0x4>,
	<0x30110 0x4>,
	<0x30114 0x4>;
	@@ -1044,6 +1046,7 @@

	target-module@38000 { /* 0x48038000, ap 16 02.0 */
	compatible = "ti,sysc-omap4-simple", "ti,sysc";
	+ ti,hwmods = "mcasp0";
	reg = <0x38000 0x4>,
	<0x38004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1074,6 +1077,7 @@

	target-module@3c000 { /* 0x4803c000, ap 20 32.0 */
	compatible = "ti,sysc-omap4-simple", "ti,sysc";
	+ ti,hwmods = "mcasp1";
	reg = <0x3c000 0x4>,
	<0x3c004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1132,6 +1136,7 @@

	target-module@42000 { /* 0x48042000, ap 24 1c.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer3";
	reg = <0x42000 0x4>,
	<0x42010 0x4>,
	<0x42014 0x4>;
	@@ -1157,6 +1162,7 @@

	target-module@44000 { /* 0x48044000, ap 26 26.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer4";
	reg = <0x44000 0x4>,
	<0x44010 0x4>,
	<0x44014 0x4>;
	@@ -1183,6 +1189,7 @@

	target-module@46000 { /* 0x48046000, ap 28 28.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer5";
	reg = <0x46000 0x4>,
	<0x46010 0x4>,
	<0x46014 0x4>;
	@@ -1209,6 +1216,7 @@

	target-module@48000 { /* 0x48048000, ap 30 22.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer6";
	reg = <0x48000 0x4>,
	<0x48010 0x4>,
	<0x48014 0x4>;
	@@ -1235,6 +1243,7 @@

	target-module@4a000 { /* 0x4804a000, ap 85 60.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer7";
	reg = <0x4a000 0x4>,
	<0x4a010 0x4>,
	<0x4a014 0x4>;
	@@ -1261,6 +1270,7 @@

	target-module@4c000 { /* 0x4804c000, ap 32 36.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio2";
	reg = <0x4c000 0x4>,
	<0x4c010 0x4>,
	<0x4c114 0x4>;
	@@ -1302,6 +1312,7 @@

	target-module@60000 { /* 0x48060000, ap 36 0c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmc1";
	reg = <0x602fc 0x4>,
	<0x60110 0x4>,
	<0x60114 0x4>;
	@@ -1337,6 +1348,7 @@

	target-module@80000 { /* 0x48080000, ap 38 18.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "elm";
	reg = <0x80000 0x4>,
	<0x80010 0x4>,
	<0x80014 0x4>;
	@@ -1373,6 +1385,7 @@

	target-module@c8000 { /* 0x480c8000, ap 87 06.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox";
	reg = <0xc8000 0x4>,
	<0xc8010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1404,6 +1417,7 @@

	target-module@ca000 { /* 0x480ca000, ap 91 40.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spinlock";
	reg = <0xca000 0x4>,
	<0xca010 0x4>,
	<0xca014 0x4>;
	@@ -1492,6 +1506,7 @@

	target-module@9c000 { /* 0x4819c000, ap 46 5a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c3";
	reg = <0x9c000 0x8>,
	<0x9c010 0x8>,
	<0x9c090 0x8>;
	@@ -1524,6 +1539,7 @@

	target-module@a0000 { /* 0x481a0000, ap 79 24.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi1";
	reg = <0xa0000 0x4>,
	<0xa0110 0x4>,
	<0xa0114 0x4>;
	@@ -1576,6 +1592,7 @@

	target-module@a6000 { /* 0x481a6000, ap 48 16.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart4";
	reg = <0xa6050 0x4>,
	<0xa6054 0x4>,
	<0xa6058 0x4>;
	@@ -1605,6 +1622,7 @@

	target-module@a8000 { /* 0x481a8000, ap 50 20.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart5";
	reg = <0xa8050 0x4>,
	<0xa8054 0x4>,
	<0xa8058 0x4>;
	@@ -1634,6 +1652,7 @@

	target-module@aa000 { /* 0x481aa000, ap 52 1a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart6";
	reg = <0xaa050 0x4>,
	<0xaa054 0x4>,
	<0xaa058 0x4>;
	@@ -1663,6 +1682,7 @@

	target-module@ac000 { /* 0x481ac000, ap 54 38.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio3";
	reg = <0xac000 0x4>,
	<0xac010 0x4>,
	<0xac114 0x4>;
	@@ -1696,6 +1716,7 @@

	target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio4";
	reg = <0xae000 0x4>,
	<0xae010 0x4>,
	<0xae114 0x4>;
	@@ -1739,6 +1760,7 @@
	compatible = "ti,sysc-omap4", "ti,sysc";
	reg = <0xcc020 0x4>;
	reg-names = "rev";
	+ ti,hwmods = "d_can0";
	/* Domains (P, C): per_pwrdm, l4ls_clkdm */
	clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,
	<&dcan0_fck>;
	@@ -1762,6 +1784,7 @@
	compatible = "ti,sysc-omap4", "ti,sysc";
	reg = <0xd0020 0x4>;
	reg-names = "rev";
	+ ti,hwmods = "d_can1";
	/* Domains (P, C): per_pwrdm, l4ls_clkdm */
	clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,
	<&dcan1_fck>;
	@@ -1783,6 +1806,7 @@

	target-module@d8000 { /* 0x481d8000, ap 64 66.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmc2";
	reg = <0xd82fc 0x4>,
	<0xd8110 0x4>,
	<0xd8114 0x4>;
	@@ -1851,6 +1875,7 @@

	target-module@0 { /* 0x48300000, ap 66 48.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss0";
	reg = <0x0 0x4>,
	<0x4 0x4>;
	reg-names = "rev", "sysc";
	@@ -1903,6 +1928,7 @@

	target-module@2000 { /* 0x48302000, ap 68 52.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss1";
	reg = <0x2000 0x4>,
	<0x2004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1955,6 +1981,7 @@

	target-module@4000 { /* 0x48304000, ap 70 44.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss2";
	reg = <0x4000 0x4>,
	<0x4004 0x4>;
	reg-names = "rev", "sysc";
	@@ -2007,6 +2034,7 @@

	target-module@e000 { /* 0x4830e000, ap 72 4a.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "lcdc";
	reg = <0xe000 0x4>,
	<0xe054 0x4>;
	reg-names = "rev", "sysc";
	@@ -2033,6 +2061,7 @@

	target-module@10000 { /* 0x48310000, ap 76 4e.1 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "rng";
	reg = <0x11fe0 0x4>,
	<0x11fe4 0x4>;
	reg-names = "rev", "sysc";
	diff --git a/sys/gnu/dts/arm/am33xx.dtsi b/sys/gnu/dts/arm/am33xx.dtsi
	--- a/sys/gnu/dts/arm/am33xx.dtsi
	+++ b/sys/gnu/dts/arm/am33xx.dtsi
	@@ -236,6 +236,7 @@

	target-module@47810000 {
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmc3";
	reg = <0x478102fc 0x4>,
	<0x47810110 0x4>,
	<0x47810114 0x4>;
	@@ -263,38 +264,37 @@
	};
	};

	- usb: target-module@47400000 {
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x47400000 0x4>,
	- <0x47400010 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-mask = <(SYSC_OMAP4_FREEEMU \|
	- SYSC_OMAP2_SOFTRESET)>;
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>;
	- clock-names = "fck";
	+ usb: usb@47400000 {
	+ compatible = "ti,am33xx-usb";
	+ reg = <0x47400000 0x1000>;
	+ ranges;
	#address-cells = <1>;
	#size-cells = <1>;
	- ranges = <0x0 0x47400000 0x5000>;
	+ ti,hwmods = "usb_otg_hs";
	+ status = "disabled";
	+
	+ usb_ctrl_mod: control@44e10620 {
	+ compatible = "ti,am335x-usb-ctrl-module";
	+ reg = <0x44e10620 0x10
	+ 0x44e10648 0x4>;
	+ reg-names = "phy_ctrl", "wakeup";
	+ status = "disabled";
	+ };

	- usb0_phy: usb-phy@1300 {
	+ usb0_phy: usb-phy@47401300 {
	compatible = "ti,am335x-usb-phy";
	- reg = <0x1300 0x100>;
	+ reg = <0x47401300 0x100>;
	reg-names = "phy";
	+ status = "disabled";
	ti,ctrl_mod = <&usb_ctrl_mod>;
	#phy-cells = <0>;
	};

	- usb0: usb@1400 {
	+ usb0: usb@47401000 {
	compatible = "ti,musb-am33xx";
	- reg = <0x1400 0x400>,
	- <0x1000 0x200>;
	+ status = "disabled";
	+ reg = <0x47401400 0x400
	+ 0x47401000 0x200>;
	reg-names = "mc", "control";

	interrupts = <18>;
	@@ -330,18 +330,20 @@
	"tx14", "tx15";
	};

	- usb1_phy: usb-phy@1b00 {
	+ usb1_phy: usb-phy@47401b00 {
	compatible = "ti,am335x-usb-phy";
	- reg = <0x1b00 0x100>;
	+ reg = <0x47401b00 0x100>;
	reg-names = "phy";
	+ status = "disabled";
	ti,ctrl_mod = <&usb_ctrl_mod>;
	#phy-cells = <0>;
	};

	- usb1: usb@1800 {
	+ usb1: usb@47401800 {
	compatible = "ti,musb-am33xx";
	- reg = <0x1c00 0x400>,
	- <0x1800 0x200>;
	+ status = "disabled";
	+ reg = <0x47401c00 0x400
	+ 0x47401800 0x200>;
	reg-names = "mc", "control";
	interrupts = <19>;
	interrupt-names = "mc";
	@@ -376,35 +378,36 @@
	"tx14", "tx15";
	};

	- cppi41dma: dma-controller@2000 {
	+ cppi41dma: dma-controller@47402000 {
	compatible = "ti,am3359-cppi41";
	- reg = <0x0000 0x1000>,
	- <0x2000 0x1000>,
	- <0x3000 0x1000>,
	- <0x4000 0x4000>;
	+ reg = <0x47400000 0x1000
	+ 0x47402000 0x1000
	+ 0x47403000 0x1000
	+ 0x47404000 0x4000>;
	reg-names = "glue", "controller", "scheduler", "queuemgr";
	interrupts = <17>;
	interrupt-names = "glue";
	#dma-cells = <2>;
	#dma-channels = <30>;
	#dma-requests = <256>;
	+ status = "disabled";
	};
	};

	- ocmcram: sram@40300000 {
	+ ocmcram: ocmcram@40300000 {
	compatible = "mmio-sram";
	reg = <0x40300000 0x10000>; /* 64k */
	ranges = <0x0 0x40300000 0x10000>;
	#address-cells = <1>;
	#size-cells = <1>;

	- pm_sram_code: pm-code-sram@0 {
	+ pm_sram_code: pm-sram-code@0 {
	compatible = "ti,sram";
	reg = <0x0 0x1000>;
	protect-exec;
	};

	- pm_sram_data: pm-data-sram@1000 {
	+ pm_sram_data: pm-sram-data@1000 {
	compatible = "ti,sram";
	reg = <0x1000 0x1000>;
	pool;
	@@ -440,116 +443,26 @@
	status = "disabled";
	};

	- sham_target: target-module@53100000 {
	- compatible = "ti,sysc-omap3-sham", "ti,sysc";
	- reg = <0x53100100 0x4>,
	- <0x53100110 0x4>,
	- <0x53100114 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l3_clkdm */
	- clocks = <&l3_clkctrl AM3_L3_SHAM_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x53100000 0x1000>;
	-
	- sham: sham@0 {
	- compatible = "ti,omap4-sham";
	- reg = <0 0x200>;
	- interrupts = <109>;
	- dmas = <&edma 36 0>;
	- dma-names = "rx";
	- };
	- };
	-
	- aes_target: target-module@53500000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x53500080 0x4>,
	- <0x53500084 0x4>,
	- <0x53500088 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l3_clkdm */
	- clocks = <&l3_clkctrl AM3_L3_AES_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x53500000 0x1000>;
	-
	- aes: aes@0 {
	- compatible = "ti,omap4-aes";
	- reg = <0 0xa0>;
	- interrupts = <103>;
	- dmas = <&edma 6 0>,
	- <&edma 5 0>;
	- dma-names = "tx", "rx";
	- };
	+ sham: sham@53100000 {
	+ compatible = "ti,omap4-sham";
	+ ti,hwmods = "sham";
	+ reg = <0x53100000 0x200>;
	+ interrupts = <109>;
	+ dmas = <&edma 36 0>;
	+ dma-names = "rx";
	};

	- target-module@56000000 {
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x5600fe00 0x4>,
	- <0x5600fe10 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&gfx_l3_clkctrl AM3_GFX_L3_GFX_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_gfx 0>;
	- reset-names = "rstctrl";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x56000000 0x1000000>;
	-
	- /*
	- * Closed source PowerVR driver, no child device
	- * binding or driver in mainline
	- */
	+ aes: aes@53500000 {
	+ compatible = "ti,omap4-aes";
	+ ti,hwmods = "aes";
	+ reg = <0x53500000 0xa0>;
	+ interrupts = <103>;
	+ dmas = <&edma 6 0>,
	+ <&edma 5 0>;
	+ dma-names = "tx", "rx";
	};
	};
	};

	#include "am33xx-l4.dtsi"
	#include "am33xx-clocks.dtsi"
	-
	-&prcm {
	- prm_per: prm@c00 {
	- compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";
	- reg = <0xc00 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_wkup: prm@d00 {
	- compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";
	- reg = <0xd00 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_device: prm@f00 {
	- compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";
	- reg = <0xf00 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_gfx: prm@1100 {
	- compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1100 0x100>;
	- #reset-cells = <1>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/am3517.dtsi b/sys/gnu/dts/arm/am3517.dtsi
	--- a/sys/gnu/dts/arm/am3517.dtsi
	+++ b/sys/gnu/dts/arm/am3517.dtsi
	@@ -16,37 +16,6 @@
	can = &hecc;
	};

	- cpus {
	- cpu: cpu@0 {
	- /* Based on OMAP3630 variants OPP50 and OPP100 */
	- operating-points-v2 = <&cpu0_opp_table>;
	-
	- clock-latency = <300000>; /* From legacy driver */
	- };
	- };
	-
	- cpu0_opp_table: opp-table {
	- compatible = "operating-points-v2-ti-cpu";
	- syscon = <&scm_conf>;
	- /*
	- * AM3517 TRM only lists 600MHz @ 1.2V, but omap36xx
	- * appear to operate at 300MHz as well. Since AM3517 only
	- * lists one operating voltage, it will remain fixed at 1.2V
	- */
	- opp50-300000000 {
	- opp-hz = /bits/ 64 <300000000>;
	- opp-microvolt = <1200000>;
	- opp-supported-hw = <0xffffffff 0xffffffff>;
	- opp-suspend;
	- };
	-
	- opp100-600000000 {
	- opp-hz = /bits/ 64 <600000000>;
	- opp-microvolt = <1200000>;
	- opp-supported-hw = <0xffffffff 0xffffffff>;
	- };
	- };
	-
	ocp@68000000 {
	am35x_otg_hs: am35x_otg_hs@5c040000 {
	compatible = "ti,omap3-musb";
	@@ -74,7 +43,7 @@
	clock-names = "ick";
	};

	- davinci_mdio: mdio@5c030000 {
	+ davinci_mdio: ethernet@5c030000 {
	compatible = "ti,davinci_mdio";
	ti,hwmods = "davinci_mdio";
	status = "disabled";
	@@ -146,12 +115,6 @@
	};
	};

	-/* Not currently working, probably needs at least different clocks */
	-&rng_target {
	- status = "disabled";
	- /delete-property/ clocks;
	-};
	-
	/* Table Table 5-79 of the TRM shows 480ab000 is reserved */
	&usb_otg_hs {
	status = "disabled";
	diff --git a/sys/gnu/dts/arm/am3517_mt_ventoux.dts b/sys/gnu/dts/arm/am3517_mt_ventoux.dts
	--- a/sys/gnu/dts/arm/am3517_mt_ventoux.dts
	+++ b/sys/gnu/dts/arm/am3517_mt_ventoux.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TeeJet Mt.Ventoux";
	- compatible = "teejet,mt_ventoux", "ti,am3517", "ti,omap3";
	+ compatible = "teejet,mt_ventoux", "ti,omap3";

	memory@80000000 {
	device_type = "memory";
	diff --git a/sys/gnu/dts/arm/am3703.dtsi b/sys/gnu/dts/arm/am3703.dtsi
	--- a/sys/gnu/dts/arm/am3703.dtsi
	+++ b/sys/gnu/dts/arm/am3703.dtsi
	@@ -1,14 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de>
	- */
	-
	-#include "omap36xx.dtsi"
	-
	-&iva {
	- status = "disabled";
	-};
	-
	-&sgx_module {
	- status = "disabled";
	-};
	diff --git a/sys/gnu/dts/arm/am3715.dtsi b/sys/gnu/dts/arm/am3715.dtsi
	--- a/sys/gnu/dts/arm/am3715.dtsi
	+++ b/sys/gnu/dts/arm/am3715.dtsi
	@@ -1,10 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de>
	- */
	-
	-#include "omap36xx.dtsi"
	-
	-&iva {
	- status = "disabled";
	-};
	diff --git a/sys/gnu/dts/arm/am4372.dtsi b/sys/gnu/dts/arm/am4372.dtsi
	--- a/sys/gnu/dts/arm/am4372.dtsi
	+++ b/sys/gnu/dts/arm/am4372.dtsi
	@@ -230,6 +230,7 @@

	target-module@47810000 {
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmc3";
	reg = <0x478102fc 0x4>,
	<0x47810110 0x4>,
	<0x47810114 0x4>;
	@@ -256,92 +257,33 @@
	};
	};

	- sham_target: target-module@53100000 {
	- compatible = "ti,sysc-omap3-sham", "ti,sysc";
	- reg = <0x53100100 0x4>,
	- <0x53100110 0x4>,
	- <0x53100114 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l3_clkdm */
	- clocks = <&l3_clkctrl AM4_L3_SHAM_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x53100000 0x1000>;
	-
	- sham: sham@0 {
	- compatible = "ti,omap5-sham";
	- reg = <0 0x300>;
	- dmas = <&edma 36 0>;
	- dma-names = "rx";
	- interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
	- };
	+ sham: sham@53100000 {
	+ compatible = "ti,omap5-sham";
	+ ti,hwmods = "sham";
	+ reg = <0x53100000 0x300>;
	+ dmas = <&edma 36 0>;
	+ dma-names = "rx";
	+ interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
	};

	- aes_target: target-module@53501000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x53501080 0x4>,
	- <0x53501084 0x4>,
	- <0x53501088 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l3_clkdm */
	- clocks = <&l3_clkctrl AM4_L3_AES_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x53501000 0x1000>;
	-
	- aes: aes@0 {
	- compatible = "ti,omap4-aes";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&edma 6 0>,
	- <&edma 5 0>;
	- dma-names = "tx", "rx";
	- };
	+ aes: aes@53501000 {
	+ compatible = "ti,omap4-aes";
	+ ti,hwmods = "aes";
	+ reg = <0x53501000 0xa0>;
	+ interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&edma 6 0>,
	+ <&edma 5 0>;
	+ dma-names = "tx", "rx";
	};

	- des_target: target-module@53701000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x53701030 0x4>,
	- <0x53701034 0x4>,
	- <0x53701038 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l3_clkdm */
	- clocks = <&l3_clkctrl AM4_L3_DES_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x53701000 0x1000>;
	-
	- des: des@0 {
	- compatible = "ti,omap4-des";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&edma 34 0>,
	- <&edma 33 0>;
	- dma-names = "tx", "rx";
	- };
	+ des: des@53701000 {
	+ compatible = "ti,omap4-des";
	+ ti,hwmods = "des";
	+ reg = <0x53701000 0xa0>;
	+ interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&edma 34 0>,
	+ <&edma 33 0>;
	+ dma-names = "tx", "rx";
	};

	gpmc: gpmc@50000000 {
	@@ -364,34 +306,17 @@
	status = "disabled";
	};

	- target-module@47900000 {
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x47900000 0x4>,
	- <0x47900010 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- clocks = <&l3s_clkctrl AM4_L3S_QSPI_CLKCTRL 0>;
	- clock-names = "fck";
	+ qspi: spi@47900000 {
	+ compatible = "ti,am4372-qspi";
	+ reg = <0x47900000 0x100>,
	+ <0x30000000 0x4000000>;
	+ reg-names = "qspi_base", "qspi_mmap";
	#address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x47900000 0x1000>,
	- <0x30000000 0x30000000 0x4000000>;
	-
	- qspi: spi@0 {
	- compatible = "ti,am4372-qspi";
	- reg = <0 0x100>,
	- <0x30000000 0x4000000>;
	- reg-names = "qspi_base", "qspi_mmap";
	- clocks = <&dpll_per_m2_div4_ck>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <0>;
	- interrupts = <0 138 0x4>;
	- num-cs = <4>;
	- };
	+ #size-cells = <0>;
	+ ti,hwmods = "qspi";
	+ interrupts = <0 138 0x4>;
	+ num-cs = <4>;
	+ status = "disabled";
	};

	dss: dss@4832a000 {
	@@ -426,73 +351,27 @@
	};
	};

	- ocmcram: sram@40300000 {
	+ ocmcram: ocmcram@40300000 {
	compatible = "mmio-sram";
	reg = <0x40300000 0x40000>; /* 256k */
	ranges = <0x0 0x40300000 0x40000>;
	#address-cells = <1>;
	#size-cells = <1>;

	- pm_sram_code: pm-code-sram@0 {
	+ pm_sram_code: pm-sram-code@0 {
	compatible = "ti,sram";
	reg = <0x0 0x1000>;
	protect-exec;
	};

	- pm_sram_data: pm-data-sram@1000 {
	+ pm_sram_data: pm-sram-data@1000 {
	compatible = "ti,sram";
	reg = <0x1000 0x1000>;
	pool;
	};
	};
	-
	- target-module@56000000 {
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x5600fe00 0x4>,
	- <0x5600fe10 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&gfx_l3_clkctrl AM4_GFX_L3_GFX_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_gfx 0>;
	- reset-names = "rstctrl";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x56000000 0x1000000>;
	- };
	};
	};

	#include "am437x-l4.dtsi"
	#include "am43xx-clocks.dtsi"
	-
	-&prcm {
	- prm_gfx: prm@400 {
	- compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x400 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_per: prm@800 {
	- compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x800 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_wkup: prm@2000 {
	- compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x2000 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_device: prm@4000 {
	- compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x4000 0x100>;
	- #reset-cells = <1>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/am437x-gp-evm.dts b/sys/gnu/dts/arm/am437x-gp-evm.dts
	--- a/sys/gnu/dts/arm/am437x-gp-evm.dts
	+++ b/sys/gnu/dts/arm/am437x-gp-evm.dts
	@@ -86,7 +86,7 @@
	};

	lcd0: display {
	- compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";
	+ compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
	label = "lcd";

	backlight = <&lcd_bl>;
	diff --git a/sys/gnu/dts/arm/am437x-idk-evm.dts b/sys/gnu/dts/arm/am437x-idk-evm.dts
	--- a/sys/gnu/dts/arm/am437x-idk-evm.dts
	+++ b/sys/gnu/dts/arm/am437x-idk-evm.dts
	@@ -526,11 +526,11 @@
	* Supply voltage supervisor on board will not allow opp50 so
	* disable it and set opp100 as suspend OPP.
	*/
	- opp50-300000000 {
	+ opp50@300000000 {
	status = "disabled";
	};

	- opp100-600000000 {
	+ opp100@600000000 {
	opp-suspend;
	};
	};
	diff --git a/sys/gnu/dts/arm/am437x-l4.dtsi b/sys/gnu/dts/arm/am437x-l4.dtsi
	--- a/sys/gnu/dts/arm/am437x-l4.dtsi
	+++ b/sys/gnu/dts/arm/am437x-l4.dtsi
	@@ -132,6 +132,7 @@

	target-module@7000 { /* 0x44e07000, ap 14 20.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio1";
	reg = <0x7000 0x4>,
	<0x7010 0x4>,
	<0x7114 0x4>;
	@@ -166,6 +167,7 @@

	target-module@9000 { /* 0x44e09000, ap 16 04.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart1";
	reg = <0x9050 0x4>,
	<0x9054 0x4>,
	<0x9058 0x4>;
	@@ -193,6 +195,7 @@

	target-module@b000 { /* 0x44e0b000, ap 18 48.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c1";
	reg = <0xb000 0x8>,
	<0xb010 0x8>,
	<0xb090 0x8>;
	@@ -225,6 +228,7 @@

	target-module@d000 { /* 0x44e0d000, ap 20 38.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "adc_tsc";
	reg = <0xd000 0x4>,
	<0xd010 0x4>;
	reg-names = "rev", "sysc";
	@@ -369,6 +373,7 @@

	target-module@35000 { /* 0x44e35000, ap 28 50.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "wd_timer2";
	reg = <0x35000 0x4>,
	<0x35010 0x4>,
	<0x35014 0x4>;
	@@ -674,6 +679,7 @@

	target-module@22000 { /* 0x48022000, ap 8 0a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart2";
	reg = <0x22050 0x4>,
	<0x22054 0x4>,
	<0x22058 0x4>;
	@@ -702,6 +708,7 @@

	target-module@24000 { /* 0x48024000, ap 10 1c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart3";
	reg = <0x24050 0x4>,
	<0x24054 0x4>,
	<0x24058 0x4>;
	@@ -730,6 +737,7 @@

	target-module@2a000 { /* 0x4802a000, ap 12 22.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c2";
	reg = <0x2a000 0x8>,
	<0x2a010 0x8>,
	<0x2a090 0x8>;
	@@ -762,6 +770,7 @@

	target-module@30000 { /* 0x48030000, ap 65 08.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi0";
	reg = <0x30000 0x4>,
	<0x30110 0x4>,
	<0x30114 0x4>;
	@@ -808,6 +817,7 @@

	target-module@38000 { /* 0x48038000, ap 14 04.0 */
	compatible = "ti,sysc-omap4-simple", "ti,sysc";
	+ ti,hwmods = "mcasp0";
	reg = <0x38000 0x4>,
	<0x38004 0x4>;
	reg-names = "rev", "sysc";
	@@ -839,6 +849,7 @@

	target-module@3c000 { /* 0x4803c000, ap 16 2a.0 */
	compatible = "ti,sysc-omap4-simple", "ti,sysc";
	+ ti,hwmods = "mcasp1";
	reg = <0x3c000 0x4>,
	<0x3c004 0x4>;
	reg-names = "rev", "sysc";
	@@ -898,6 +909,7 @@

	target-module@42000 { /* 0x48042000, ap 20 24.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer3";
	reg = <0x42000 0x4>,
	<0x42010 0x4>,
	<0x42014 0x4>;
	@@ -924,6 +936,7 @@

	target-module@44000 { /* 0x48044000, ap 22 26.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer4";
	reg = <0x44000 0x4>,
	<0x44010 0x4>,
	<0x44014 0x4>;
	@@ -951,6 +964,7 @@

	target-module@46000 { /* 0x48046000, ap 24 28.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer5";
	reg = <0x46000 0x4>,
	<0x46010 0x4>,
	<0x46014 0x4>;
	@@ -978,6 +992,7 @@

	target-module@48000 { /* 0x48048000, ap 26 1a.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer6";
	reg = <0x48000 0x4>,
	<0x48010 0x4>,
	<0x48014 0x4>;
	@@ -1005,6 +1020,7 @@

	target-module@4a000 { /* 0x4804a000, ap 71 48.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer7";
	reg = <0x4a000 0x4>,
	<0x4a010 0x4>,
	<0x4a014 0x4>;
	@@ -1032,6 +1048,7 @@

	target-module@4c000 { /* 0x4804c000, ap 28 36.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio2";
	reg = <0x4c000 0x4>,
	<0x4c010 0x4>,
	<0x4c114 0x4>;
	@@ -1066,6 +1083,7 @@

	target-module@60000 { /* 0x48060000, ap 30 14.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmc1";
	reg = <0x602fc 0x4>,
	<0x60110 0x4>,
	<0x60114 0x4>;
	@@ -1100,6 +1118,7 @@

	target-module@80000 { /* 0x48080000, ap 32 18.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "elm";
	reg = <0x80000 0x4>,
	<0x80010 0x4>,
	<0x80014 0x4>;
	@@ -1130,6 +1149,7 @@

	target-module@c8000 { /* 0x480c8000, ap 73 06.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox";
	reg = <0xc8000 0x4>,
	<0xc8010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1161,6 +1181,7 @@

	target-module@ca000 { /* 0x480ca000, ap 77 38.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spinlock";
	reg = <0xca000 0x4>,
	<0xca010 0x4>,
	<0xca014 0x4>;
	@@ -1241,6 +1262,7 @@

	target-module@9c000 { /* 0x4819c000, ap 38 52.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c3";
	reg = <0x9c000 0x8>,
	<0x9c010 0x8>,
	<0x9c090 0x8>;
	@@ -1273,6 +1295,7 @@

	target-module@a0000 { /* 0x481a0000, ap 67 2c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi1";
	reg = <0xa0000 0x4>,
	<0xa0110 0x4>,
	<0xa0114 0x4>;
	@@ -1303,6 +1326,7 @@

	target-module@a2000 { /* 0x481a2000, ap 69 2e.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi2";
	reg = <0xa2000 0x4>,
	<0xa2110 0x4>,
	<0xa2114 0x4>;
	@@ -1333,6 +1357,7 @@

	target-module@a4000 { /* 0x481a4000, ap 92 62.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi3";
	reg = <0xa4000 0x4>,
	<0xa4110 0x4>,
	<0xa4114 0x4>;
	@@ -1363,6 +1388,7 @@

	target-module@a6000 { /* 0x481a6000, ap 40 16.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart4";
	reg = <0xa6050 0x4>,
	<0xa6054 0x4>,
	<0xa6058 0x4>;
	@@ -1391,6 +1417,7 @@

	target-module@a8000 { /* 0x481a8000, ap 42 20.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart5";
	reg = <0xa8050 0x4>,
	<0xa8054 0x4>,
	<0xa8058 0x4>;
	@@ -1419,6 +1446,7 @@

	target-module@aa000 { /* 0x481aa000, ap 44 12.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart6";
	reg = <0xaa050 0x4>,
	<0xaa054 0x4>,
	<0xaa058 0x4>;
	@@ -1447,6 +1475,7 @@

	target-module@ac000 { /* 0x481ac000, ap 46 30.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio3";
	reg = <0xac000 0x4>,
	<0xac010 0x4>,
	<0xac114 0x4>;
	@@ -1481,6 +1510,7 @@

	target-module@ae000 { /* 0x481ae000, ap 48 32.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio4";
	reg = <0xae000 0x4>,
	<0xae010 0x4>,
	<0xae114 0x4>;
	@@ -1515,6 +1545,7 @@

	target-module@c1000 { /* 0x481c1000, ap 94 68.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer8";
	reg = <0xc1000 0x4>,
	<0xc1010 0x4>,
	<0xc1014 0x4>;
	@@ -1543,6 +1574,7 @@
	compatible = "ti,sysc-omap4", "ti,sysc";
	reg = <0xcc020 0x4>;
	reg-names = "rev";
	+ ti,hwmods = "d_can0";
	/* Domains (P, C): per_pwrdm, l4ls_clkdm */
	clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;
	clock-names = "fck";
	@@ -1563,6 +1595,7 @@
	compatible = "ti,sysc-omap4", "ti,sysc";
	reg = <0xd0020 0x4>;
	reg-names = "rev";
	+ ti,hwmods = "d_can1";
	/* Domains (P, C): per_pwrdm, l4ls_clkdm */
	clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;
	clock-names = "fck";
	@@ -1581,6 +1614,7 @@

	target-module@d8000 { /* 0x481d8000, ap 54 5e.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmc2";
	reg = <0xd82fc 0x4>,
	<0xd8110 0x4>,
	<0xd8114 0x4>;
	@@ -1680,6 +1714,7 @@

	target-module@0 { /* 0x48300000, ap 56 40.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss0";
	reg = <0x0 0x4>,
	<0x4 0x4>;
	reg-names = "rev", "sysc";
	@@ -1732,6 +1767,7 @@

	target-module@2000 { /* 0x48302000, ap 58 4a.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss1";
	reg = <0x2000 0x4>,
	<0x2004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1784,6 +1820,7 @@

	target-module@4000 { /* 0x48304000, ap 60 44.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss2";
	reg = <0x4000 0x4>,
	<0x4004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1836,6 +1873,7 @@

	target-module@6000 { /* 0x48306000, ap 96 58.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss3";
	reg = <0x6000 0x4>,
	<0x6004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1877,6 +1915,7 @@

	target-module@8000 { /* 0x48308000, ap 98 54.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss4";
	reg = <0x8000 0x4>,
	<0x8004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1918,6 +1957,7 @@

	target-module@a000 { /* 0x4830a000, ap 100 60.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss5";
	reg = <0xa000 0x4>,
	<0xa004 0x4>;
	reg-names = "rev", "sysc";
	@@ -1959,6 +1999,7 @@

	target-module@10000 { /* 0x48310000, ap 64 4e.1 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "rng";
	reg = <0x11fe0 0x4>,
	<0x11fe4 0x4>;
	reg-names = "rev", "sysc";
	@@ -1997,6 +2038,7 @@

	target-module@20000 { /* 0x48320000, ap 82 34.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio5";
	reg = <0x20000 0x4>,
	<0x20010 0x4>,
	<0x20114 0x4>;
	@@ -2031,6 +2073,7 @@

	target-module@22000 { /* 0x48322000, ap 116 64.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio6";
	reg = <0x22000 0x4>,
	<0x22010 0x4>,
	<0x22114 0x4>;
	@@ -2065,6 +2108,7 @@

	target-module@26000 { /* 0x48326000, ap 86 66.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "vpfe0";
	reg = <0x26000 0x4>,
	<0x26104 0x4>;
	reg-names = "rev", "sysc";
	@@ -2091,6 +2135,7 @@

	target-module@28000 { /* 0x48328000, ap 75 0e.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "vpfe1";
	reg = <0x28000 0x4>,
	<0x28104 0x4>;
	reg-names = "rev", "sysc";
	@@ -2139,6 +2184,7 @@

	target-module@3d000 { /* 0x4833d000, ap 102 6e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer9";
	reg = <0x3d000 0x4>,
	<0x3d010 0x4>,
	<0x3d014 0x4>;
	@@ -2165,6 +2211,7 @@

	target-module@3f000 { /* 0x4833f000, ap 104 5c.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer10";
	reg = <0x3f000 0x4>,
	<0x3f010 0x4>,
	<0x3f014 0x4>;
	@@ -2191,6 +2238,7 @@

	target-module@41000 { /* 0x48341000, ap 106 76.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer11";
	reg = <0x41000 0x4>,
	<0x41010 0x4>,
	<0x41014 0x4>;
	@@ -2217,6 +2265,7 @@

	target-module@45000 { /* 0x48345000, ap 108 6a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spi4";
	reg = <0x45000 0x4>,
	<0x45110 0x4>,
	<0x45114 0x4>;
	@@ -2247,6 +2296,7 @@

	target-module@47000 { /* 0x48347000, ap 110 70.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "hdq1w";
	reg = <0x47000 0x4>,
	<0x47014 0x4>,
	<0x47018 0x4>;
	@@ -2331,6 +2381,7 @@

	target-module@a8000 { /* 0x483a8000, ap 125 6c.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "ocp2scp0";
	reg = <0xa8000 0x4>;
	reg-names = "rev";
	/* Domains (P, C): per_pwrdm, l4ls_clkdm */
	@@ -2412,6 +2463,7 @@

	target-module@e8000 { /* 0x483e8000, ap 129 78.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "ocp2scp1";
	reg = <0xe8000 0x4>;
	reg-names = "rev";
	/* Domains (P, C): per_pwrdm, l4ls_clkdm */
	diff --git a/sys/gnu/dts/arm/am437x-sk-evm.dts b/sys/gnu/dts/arm/am437x-sk-evm.dts
	--- a/sys/gnu/dts/arm/am437x-sk-evm.dts
	+++ b/sys/gnu/dts/arm/am437x-sk-evm.dts
	@@ -272,12 +272,6 @@
	>;
	};

	- clkout1_pin: pinmux_clkout1_pin {
	- pinctrl-single,pins = <
	- 0x270 (PIN_OUTPUT_PULLDOWN \| MUX_MODE3) /* XDMA_EVENT_INTR0/CLKOUT1 */
	- >;
	- };
	-
	cpsw_default: cpsw_default {
	pinctrl-single,pins = <
	/* Slave 1 */
	@@ -599,25 +593,6 @@
	pinctrl-0 = <&i2c1_pins>;
	clock-frequency = <400000>;

	- ov2659@30 {
	- compatible = "ovti,ov2659";
	- reg = <0x30>;
	- pinctrl-names = "default";
	- pinctrl-0 = <&clkout1_pin>;
	-
	- clocks = <&clkout1_mux_ck>;
	- clock-names = "xvclk";
	- assigned-clocks = <&clkout1_mux_ck>;
	- assigned-clock-parents = <&clkout1_osc_div_ck>;
	-
	- port {
	- ov2659_1: endpoint {
	- remote-endpoint = <&vpfe0_ep>;
	- link-frequencies = /bits/ 64 <70000000>;
	- };
	- };
	- };
	-
	edt-ft5306@38 {
	status = "okay";
	compatible = "edt,edt-ft5306", "edt,edt-ft5x06";
	@@ -902,7 +877,7 @@
	/* Camera port */
	port {
	vpfe0_ep: endpoint {
	- remote-endpoint = <&ov2659_1>;
	+ /* remote-endpoint = <&sensor>; add once we have it */
	ti,am437x-vpfe-interface = <0>;
	bus-width = <8>;
	hsync-active = <0>;
	diff --git a/sys/gnu/dts/arm/am43x-epos-evm.dts b/sys/gnu/dts/arm/am43x-epos-evm.dts
	--- a/sys/gnu/dts/arm/am43x-epos-evm.dts
	+++ b/sys/gnu/dts/arm/am43x-epos-evm.dts
	@@ -42,7 +42,7 @@
	};

	lcd0: display {
	- compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";
	+ compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
	label = "lcd";

	backlight = <&lcd_bl>;
	@@ -145,12 +145,6 @@
	system-clock-frequency = <12000000>;
	};
	};
	-
	- audio_mstrclk: clock {
	- compatible = "fixed-clock";
	- #clock-cells = <0>;
	- clock-frequency = <12000000>;
	- };
	};

	&am43xx_pinmux {
	@@ -702,21 +696,6 @@
	IOVDD-supply = <&dcdc4>; /* V3_3D -> DCDC4 */
	DVDD-supply = <&ldo1>; /* V1_8AUD -> V1_8D -> LDO1 */
	};
	-
	- ov2659@30 {
	- compatible = "ovti,ov2659";
	- reg = <0x30>;
	-
	- clocks = <&audio_mstrclk>;
	- clock-names = "xvclk";
	-
	- port {
	- ov2659_1: endpoint {
	- remote-endpoint = <&vpfe1_ep>;
	- link-frequencies = /bits/ 64 <70000000>;
	- };
	- };
	- };
	};

	&i2c2 {
	@@ -869,7 +848,6 @@
	pinctrl-names = "default", "sleep";
	pinctrl-0 = <&spi0_pins_default>;
	pinctrl-1 = <&spi0_pins_sleep>;
	- ti,pindir-d0-out-d1-in = <1>;
	};

	&spi1 {
	@@ -877,7 +855,6 @@
	pinctrl-names = "default", "sleep";
	pinctrl-0 = <&spi1_pins_default>;
	pinctrl-1 = <&spi1_pins_sleep>;
	- ti,pindir-d0-out-d1-in = <1>;
	};

	&usb2_phy1 {
	@@ -985,7 +962,7 @@

	port {
	vpfe1_ep: endpoint {
	- remote-endpoint = <&ov2659_1>;
	+ /* remote-endpoint = <&sensor>; add once we have it */
	ti,am437x-vpfe-interface = <0>;
	bus-width = <8>;
	hsync-active = <0>;
	diff --git a/sys/gnu/dts/arm/am43xx-clocks.dtsi b/sys/gnu/dts/arm/am43xx-clocks.dtsi
	--- a/sys/gnu/dts/arm/am43xx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/am43xx-clocks.dtsi
	@@ -704,60 +704,6 @@
	ti,bit-shift = <8>;
	reg = <0x2a48>;
	};
	-
	- clkout1_osc_div_ck: clkout1-osc-div-ck {
	- #clock-cells = <0>;
	- compatible = "ti,divider-clock";
	- clocks = <&sys_clkin_ck>;
	- ti,bit-shift = <20>;
	- ti,max-div = <4>;
	- reg = <0x4100>;
	- };
	-
	- clkout1_src2_mux_ck: clkout1-src2-mux-ck {
	- #clock-cells = <0>;
	- compatible = "ti,mux-clock";
	- clocks = <&clk_rc32k_ck>, <&sysclk_div>, <&dpll_ddr_m2_ck>,
	- <&dpll_per_m2_ck>, <&dpll_disp_m2_ck>,
	- <&dpll_mpu_m2_ck>;
	- reg = <0x4100>;
	- };
	-
	- clkout1_src2_pre_div_ck: clkout1-src2-pre-div-ck {
	- #clock-cells = <0>;
	- compatible = "ti,divider-clock";
	- clocks = <&clkout1_src2_mux_ck>;
	- ti,bit-shift = <4>;
	- ti,max-div = <8>;
	- reg = <0x4100>;
	- };
	-
	- clkout1_src2_post_div_ck: clkout1-src2-post-div-ck {
	- #clock-cells = <0>;
	- compatible = "ti,divider-clock";
	- clocks = <&clkout1_src2_pre_div_ck>;
	- ti,bit-shift = <8>;
	- ti,max-div = <32>;
	- ti,index-power-of-two;
	- reg = <0x4100>;
	- };
	-
	- clkout1_mux_ck: clkout1-mux-ck {
	- #clock-cells = <0>;
	- compatible = "ti,mux-clock";
	- clocks = <&clkout1_osc_div_ck>, <&clk_rc32k_ck>,
	- <&clkout1_src2_post_div_ck>, <&dpll_extdev_m2_ck>;
	- ti,bit-shift = <16>;
	- reg = <0x4100>;
	- };
	-
	- clkout1_ck: clkout1-ck {
	- #clock-cells = <0>;
	- compatible = "ti,gate-clock";
	- clocks = <&clkout1_mux_ck>;
	- ti,bit-shift = <23>;
	- reg = <0x4100>;
	- };
	};

	&prcm {
	diff --git a/sys/gnu/dts/arm/am571x-idk.dts b/sys/gnu/dts/arm/am571x-idk.dts
	--- a/sys/gnu/dts/arm/am571x-idk.dts
	+++ b/sys/gnu/dts/arm/am571x-idk.dts
	@@ -167,7 +167,11 @@

	&pcie1_rc {
	status = "okay";
	- gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;
	+ gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
	+};
	+
	+&pcie1_ep {
	+ gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
	};

	&mmc1 {
	@@ -182,30 +186,3 @@
	pinctrl-1 = <&mmc2_pins_hs>;
	pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;
	};
	-
	-&mac_sw {
	- pinctrl-names = "default", "sleep";
	- status = "okay";
	-};
	-
	-&cpsw_port1 {
	- phy-handle = <&ethphy0_sw>;
	- phy-mode = "rgmii";
	- ti,dual-emac-pvid = <1>;
	-};
	-
	-&cpsw_port2 {
	- phy-handle = <&ethphy1_sw>;
	- phy-mode = "rgmii";
	- ti,dual-emac-pvid = <2>;
	-};
	-
	-&davinci_mdio_sw {
	- ethphy0_sw: ethernet-phy@0 {
	- reg = <0>;
	- };
	-
	- ethphy1_sw: ethernet-phy@1 {
	- reg = <1>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/am572x-idk-common.dtsi b/sys/gnu/dts/arm/am572x-idk-common.dtsi
	--- a/sys/gnu/dts/arm/am572x-idk-common.dtsi
	+++ b/sys/gnu/dts/arm/am572x-idk-common.dtsi
	@@ -147,6 +147,10 @@
	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
	};

	+&pcie1_ep {
	+ gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
	+};
	+
	&mailbox5 {
	status = "okay";
	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
	diff --git a/sys/gnu/dts/arm/am572x-idk.dts b/sys/gnu/dts/arm/am572x-idk.dts
	--- a/sys/gnu/dts/arm/am572x-idk.dts
	+++ b/sys/gnu/dts/arm/am572x-idk.dts
	@@ -27,8 +27,3 @@
	pinctrl-1 = <&mmc2_pins_hs>;
	pinctrl-2 = <&mmc2_pins_ddr_rev20>;
	};
	-
	-&mac {
	- status = "okay";
	- dual_emac;
	-};
	diff --git a/sys/gnu/dts/arm/am574x-idk.dts b/sys/gnu/dts/arm/am574x-idk.dts
	--- a/sys/gnu/dts/arm/am574x-idk.dts
	+++ b/sys/gnu/dts/arm/am574x-idk.dts
	@@ -35,8 +35,3 @@
	pinctrl-1 = <&mmc2_pins_default>;
	pinctrl-2 = <&mmc2_pins_default>;
	};
	-
	-&mac {
	- status = "okay";
	- dual_emac;
	-};
	diff --git a/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi b/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi
	--- a/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi
	+++ b/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi
	@@ -29,27 +29,6 @@
	reg = <0x0 0x80000000 0x0 0x80000000>;
	};

	- main_12v0: fixedregulator-main_12v0 {
	- /* main supply */
	- compatible = "regulator-fixed";
	- regulator-name = "main_12v0";
	- regulator-min-microvolt = <12000000>;
	- regulator-max-microvolt = <12000000>;
	- regulator-always-on;
	- regulator-boot-on;
	- };
	-
	- evm_5v0: fixedregulator-evm_5v0 {
	- /* Output of TPS54531D */
	- compatible = "regulator-fixed";
	- regulator-name = "evm_5v0";
	- regulator-min-microvolt = <5000000>;
	- regulator-max-microvolt = <5000000>;
	- vin-supply = <&main_12v0>;
	- regulator-always-on;
	- regulator-boot-on;
	- };
	-
	vdd_3v3: fixedregulator-vdd_3v3 {
	compatible = "regulator-fixed";
	regulator-name = "vdd_3v3";
	@@ -568,6 +547,10 @@
	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
	};

	+&pcie1_ep {
	+ gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
	+};
	+
	&mcasp3 {
	#sound-dai-cells = <0>;
	assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
	diff --git a/sys/gnu/dts/arm/am57xx-beagle-x15-revb1.dts b/sys/gnu/dts/arm/am57xx-beagle-x15-revb1.dts
	--- a/sys/gnu/dts/arm/am57xx-beagle-x15-revb1.dts
	+++ b/sys/gnu/dts/arm/am57xx-beagle-x15-revb1.dts
	@@ -24,7 +24,7 @@
	};

	&mmc2 {
	- pinctrl-names = "default", "hs", "ddr_3_3v";
	+ pinctrl-names = "default", "hs", "ddr_1_8v";
	pinctrl-0 = <&mmc2_pins_default>;
	pinctrl-1 = <&mmc2_pins_hs>;
	pinctrl-2 = <&mmc2_pins_ddr_3_3v_rev11 &mmc2_iodelay_ddr_3_3v_rev11_conf>;
	diff --git a/sys/gnu/dts/arm/am57xx-beagle-x15-revc.dts b/sys/gnu/dts/arm/am57xx-beagle-x15-revc.dts
	--- a/sys/gnu/dts/arm/am57xx-beagle-x15-revc.dts
	+++ b/sys/gnu/dts/arm/am57xx-beagle-x15-revc.dts
	@@ -24,7 +24,7 @@
	};

	&mmc2 {
	- pinctrl-names = "default", "hs", "ddr_3_3v";
	+ pinctrl-names = "default", "hs", "ddr_1_8v";
	pinctrl-0 = <&mmc2_pins_default>;
	pinctrl-1 = <&mmc2_pins_hs>;
	pinctrl-2 = <&mmc2_pins_ddr_rev20>;
	diff --git a/sys/gnu/dts/arm/am57xx-idk-common.dtsi b/sys/gnu/dts/arm/am57xx-idk-common.dtsi
	--- a/sys/gnu/dts/arm/am57xx-idk-common.dtsi
	+++ b/sys/gnu/dts/arm/am57xx-idk-common.dtsi
	@@ -9,7 +9,6 @@
	aliases {
	rtc0 = &tps659038_rtc;
	rtc1 = &rtc;
	- display0 = &hdmi0;
	};

	chosen {
	@@ -97,48 +96,6 @@
	default-state = "off";
	};
	};
	-
	- hdmi0: connector@0 {
	- compatible = "hdmi-connector";
	- label = "hdmi";
	-
	- type = "a";
	-
	- port {
	- hdmi_connector_in: endpoint {
	- remote-endpoint = <&tpd12s015_out>;
	- };
	- };
	- };
	-
	- tpd12s015: encoder@0 {
	- compatible = "ti,tpd12s016", "ti,tpd12s015";
	-
	- gpios = <0>, /* optional CT_CP_HPD */
	- <0>, /* optional LS_OE */
	- <&gpio7 12 GPIO_ACTIVE_HIGH>; /* HPD */
	-
	- ports {
	- #address-cells = <1>;
	- #size-cells = <0>;
	-
	- port@0 {
	- reg = <0>;
	-
	- tpd12s015_in: endpoint@0 {
	- remote-endpoint = <&hdmi_out>;
	- };
	- };
	-
	- port@1 {
	- reg = <1>;
	-
	- tpd12s015_out: endpoint@0 {
	- remote-endpoint = <&hdmi_connector_in>;
	- };
	- };
	- };
	- };
	};

	&dra7_pmx_core {
	@@ -406,6 +363,11 @@
	ext-clk-src;
	};

	+&mac {
	+ status = "okay";
	+ dual_emac;
	+};
	+
	&cpsw_emac0 {
	phy-handle = <&ethphy0>;
	phy-mode = "rgmii";
	@@ -528,19 +490,3 @@
	&cpu0 {
	vdd-supply = <&smps12_reg>;
	};
	-
	-&hdmi {
	- status = "okay";
	-
	- vdda-supply = <&ldo4_reg>;
	-
	- port {
	- hdmi_out: endpoint {
	- remote-endpoint = <&tpd12s015_in>;
	- };
	- };
	-};
	-
	-&dss {
	- status = "okay";
	-};
	diff --git a/sys/gnu/dts/arm/dm3725.dtsi b/sys/gnu/dts/arm/dm3725.dtsi
	--- a/sys/gnu/dts/arm/dm3725.dtsi
	+++ b/sys/gnu/dts/arm/dm3725.dtsi
	@@ -1,10 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de>
	- */
	-
	-#include "omap36xx.dtsi"
	-
	-&sgx_module {
	- status = "disabled";
	-};
	diff --git a/sys/gnu/dts/arm/dra62x-j5eco-evm.dts b/sys/gnu/dts/arm/dra62x-j5eco-evm.dts
	--- a/sys/gnu/dts/arm/dra62x-j5eco-evm.dts
	+++ b/sys/gnu/dts/arm/dra62x-j5eco-evm.dts
	@@ -24,12 +24,12 @@

	&cpsw_emac0 {
	phy-handle = <&ethphy0>;
	- phy-mode = "rgmii-id";
	+ phy-mode = "rgmii";
	};

	&cpsw_emac1 {
	phy-handle = <&ethphy1>;
	- phy-mode = "rgmii-id";
	+ phy-mode = "rgmii";
	};

	&davinci_mdio {
	diff --git a/sys/gnu/dts/arm/dra7-evm-common.dtsi b/sys/gnu/dts/arm/dra7-evm-common.dtsi
	--- a/sys/gnu/dts/arm/dra7-evm-common.dtsi
	+++ b/sys/gnu/dts/arm/dra7-evm-common.dtsi
	@@ -4,7 +4,7 @@
	*/

	#include <dt-bindings/gpio/gpio.h>
	-#include <dt-bindings/clock/ti-dra7-atl.h>
	+#include <dt-bindings/clk/ti-dra7-atl.h>
	#include <dt-bindings/input/input.h>

	/ {
	diff --git a/sys/gnu/dts/arm/dra7-evm.dts b/sys/gnu/dts/arm/dra7-evm.dts
	--- a/sys/gnu/dts/arm/dra7-evm.dts
	+++ b/sys/gnu/dts/arm/dra7-evm.dts
	@@ -61,10 +61,10 @@
	regulator-max-microvolt = <1800000>;
	};

	- vsys_3v3: fixedregulator-vsys3v3 {
	+ evm_3v3: fixedregulator-evm3v3 {
	/* Output of Cntlr A of TPS43351-Q1 on dra7-evm */
	compatible = "regulator-fixed";
	- regulator-name = "vsys_3v3";
	+ regulator-name = "evm_3v3";
	regulator-min-microvolt = <3300000>;
	regulator-max-microvolt = <3300000>;
	vin-supply = <&evm_12v0>;
	diff --git a/sys/gnu/dts/arm/dra7-l4.dtsi b/sys/gnu/dts/arm/dra7-l4.dtsi
	--- a/sys/gnu/dts/arm/dra7-l4.dtsi
	+++ b/sys/gnu/dts/arm/dra7-l4.dtsi
	@@ -186,6 +186,7 @@

	target-module@56000 { /* 0x4a056000, ap 9 02.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "dma_system";
	reg = <0x56000 0x4>,
	<0x5602c 0x4>,
	<0x56028 0x4>;
	@@ -211,7 +212,7 @@
	ranges = <0x0 0x56000 0x1000>;

	sdma: dma-controller@0 {
	- compatible = "ti,omap4430-sdma", "ti,omap-sdma";
	+ compatible = "ti,omap4430-sdma";
	reg = <0x0 0x1000>;
	interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
	<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
	@@ -233,6 +234,7 @@

	target-module@80000 { /* 0x4a080000, ap 13 20.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "ocp2scp1";
	reg = <0x80000 0x4>,
	<0x80010 0x4>,
	<0x80014 0x4>;
	@@ -300,6 +302,7 @@

	target-module@90000 { /* 0x4a090000, ap 59 42.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "ocp2scp3";
	reg = <0x90000 0x4>,
	<0x90010 0x4>,
	<0x90014 0x4>;
	@@ -391,6 +394,7 @@

	target-module@d9000 { /* 0x4a0d9000, ap 17 72.0 */
	compatible = "ti,sysc-omap4-sr", "ti,sysc";
	+ ti,hwmods = "smartreflex_mpu";
	reg = <0xd9038 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
	@@ -410,6 +414,7 @@

	target-module@dd000 { /* 0x4a0dd000, ap 19 18.0 */
	compatible = "ti,sysc-omap4-sr", "ti,sysc";
	+ ti,hwmods = "smartreflex_core";
	reg = <0xdd038 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
	@@ -437,6 +442,7 @@

	target-module@f4000 { /* 0x4a0f4000, ap 23 04.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox1";
	reg = <0xf4000 0x4>,
	<0xf4010 0x4>;
	reg-names = "rev", "sysc";
	@@ -466,6 +472,7 @@

	target-module@f6000 { /* 0x4a0f6000, ap 25 78.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spinlock";
	reg = <0xf6000 0x4>,
	<0xf6010 0x4>,
	<0xf6014 0x4>;
	@@ -1227,6 +1234,7 @@

	target-module@3e000 { /* 0x4803e000, ap 11 56.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer9";
	reg = <0x3e000 0x4>,
	<0x3e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1741,6 +1749,7 @@

	target-module@78000 { /* 0x48078000, ap 39 0a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "elm";
	reg = <0x78000 0x4>,
	<0x78010 0x4>,
	<0x78014 0x4>;
	@@ -1834,6 +1843,7 @@

	target-module@86000 { /* 0x48086000, ap 41 5e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer10";
	reg = <0x86000 0x4>,
	<0x86010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1861,6 +1871,7 @@

	target-module@88000 { /* 0x48088000, ap 43 66.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer11";
	reg = <0x88000 0x4>,
	<0x88010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1888,6 +1899,7 @@

	target-module@90000 { /* 0x48090000, ap 55 12.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "rng";
	reg = <0x91fe0 0x4>,
	<0x91fe4 0x4>;
	reg-names = "rev", "sysc";
	@@ -2034,37 +2046,6 @@
	<0x00001000 0x000a5000 0x00001000>;
	};

	- des_target: target-module@a5000 { /* 0x480a5000 */
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0xa5030 0x4>,
	- <0xa5034 0x4>,
	- <0xa5038 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
	- clocks = <&l4sec_clkctrl DRA7_L4SEC_DES_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0xa5000 0x00001000>;
	-
	- des: des@0 {
	- compatible = "ti,omap4-des";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&sdma_xbar 117>, <&sdma_xbar 116>;
	- dma-names = "tx", "rx";
	- clocks = <&l3_iclk_div>;
	- clock-names = "fck";
	- };
	- };
	-
	target-module@a8000 { /* 0x480a8000, ap 59 1a.0 */
	compatible = "ti,sysc";
	status = "disabled";
	@@ -2109,6 +2090,7 @@

	target-module@b2000 { /* 0x480b2000, ap 37 52.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "hdq1w";
	reg = <0xb2000 0x4>,
	<0xb2014 0x4>,
	<0xb2018 0x4>;
	@@ -2511,6 +2493,7 @@

	target-module@3e000 { /* 0x4843e000, ap 25 30.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss0";
	reg = <0x3e000 0x4>,
	<0x3e004 0x4>;
	reg-names = "rev", "sysc";
	@@ -2557,6 +2540,7 @@

	target-module@40000 { /* 0x48440000, ap 27 38.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss1";
	reg = <0x40000 0x4>,
	<0x40004 0x4>;
	reg-names = "rev", "sysc";
	@@ -2603,6 +2587,7 @@

	target-module@42000 { /* 0x48442000, ap 29 20.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "epwmss2";
	reg = <0x42000 0x4>,
	<0x42004 0x4>;
	reg-names = "rev", "sysc";
	@@ -3074,7 +3059,7 @@

	davinci_mdio: mdio@1000 {
	compatible = "ti,cpsw-mdio","ti,davinci_mdio";
	- clocks = <&gmac_main_clk>;
	+ clocks = <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 0>;
	clock-names = "fck";
	#address-cells = <1>;
	#size-cells = <0>;
	@@ -3094,58 +3079,6 @@
	phys = <&phy_gmii_sel 2>;
	};
	};
	-
	- mac_sw: switch@0 {
	- compatible = "ti,dra7-cpsw-switch","ti,cpsw-switch";
	- reg = <0x0 0x4000>;
	- ranges = <0 0 0x4000>;
	- clocks = <&gmac_main_clk>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- syscon = <&scm_conf>;
	- status = "disabled";
	-
	- interrupts = <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
	- <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
	- <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
	- <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
	- interrupt-names = "rx_thresh", "rx", "tx", "misc";
	-
	- ethernet-ports {
	- #address-cells = <1>;
	- #size-cells = <0>;
	-
	- cpsw_port1: port@1 {
	- reg = <1>;
	- label = "port1";
	- mac-address = [ 00 00 00 00 00 00 ];
	- phys = <&phy_gmii_sel 1>;
	- };
	-
	- cpsw_port2: port@2 {
	- reg = <2>;
	- label = "port2";
	- mac-address = [ 00 00 00 00 00 00 ];
	- phys = <&phy_gmii_sel 2>;
	- };
	- };
	-
	- davinci_mdio_sw: mdio@1000 {
	- compatible = "ti,cpsw-mdio","ti,davinci_mdio";
	- clocks = <&gmac_main_clk>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <0>;
	- bus_freq = <1000000>;
	- reg = <0x1000 0x100>;
	- };
	-
	- cpts {
	- clocks = <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 25>;
	- clock-names = "cpts";
	- };
	- };
	};
	};
	};
	@@ -3266,6 +3199,7 @@

	target-module@2000 { /* 0x48802000, ap 95 7c.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox13";
	reg = <0x2000 0x4>,
	<0x2010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3344,6 +3278,7 @@

	target-module@20000 { /* 0x48820000, ap 5 08.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer5";
	reg = <0x20000 0x4>,
	<0x20010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3371,6 +3306,7 @@

	target-module@22000 { /* 0x48822000, ap 7 24.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer6";
	reg = <0x22000 0x4>,
	<0x22010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3398,6 +3334,7 @@

	target-module@24000 { /* 0x48824000, ap 9 26.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer7";
	reg = <0x24000 0x4>,
	<0x24010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3425,6 +3362,7 @@

	target-module@26000 { /* 0x48826000, ap 11 0c.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer8";
	reg = <0x26000 0x4>,
	<0x26010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3452,6 +3390,7 @@

	target-module@28000 { /* 0x48828000, ap 13 16.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer13";
	reg = <0x28000 0x4>,
	<0x28010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3474,12 +3413,12 @@
	clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER13_CLKCTRL 24>;
	clock-names = "fck";
	interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;
	- ti,timer-pwm;
	};
	};

	target-module@2a000 { /* 0x4882a000, ap 15 10.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer14";
	reg = <0x2a000 0x4>,
	<0x2a010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3502,12 +3441,12 @@
	clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER14_CLKCTRL 24>;
	clock-names = "fck";
	interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>;
	- ti,timer-pwm;
	};
	};

	target-module@2c000 { /* 0x4882c000, ap 17 02.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer15";
	reg = <0x2c000 0x4>,
	<0x2c010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3530,12 +3469,12 @@
	clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>;
	clock-names = "fck";
	interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
	- ti,timer-pwm;
	};
	};

	target-module@2e000 { /* 0x4882e000, ap 19 14.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer16";
	reg = <0x2e000 0x4>,
	<0x2e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3558,7 +3497,6 @@
	clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>;
	clock-names = "fck";
	interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
	- ti,timer-pwm;
	};
	};

	@@ -3590,6 +3528,7 @@

	target-module@3a000 { /* 0x4883a000, ap 33 3e.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox2";
	reg = <0x3a000 0x4>,
	<0x3a010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3620,6 +3559,7 @@

	target-module@3c000 { /* 0x4883c000, ap 35 3a.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox3";
	reg = <0x3c000 0x4>,
	<0x3c010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3650,6 +3590,7 @@

	target-module@3e000 { /* 0x4883e000, ap 37 46.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox4";
	reg = <0x3e000 0x4>,
	<0x3e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3680,6 +3621,7 @@

	target-module@40000 { /* 0x48840000, ap 39 64.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox5";
	reg = <0x40000 0x4>,
	<0x40010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3710,6 +3652,7 @@

	target-module@42000 { /* 0x48842000, ap 41 4e.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox6";
	reg = <0x42000 0x4>,
	<0x42010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3740,6 +3683,7 @@

	target-module@44000 { /* 0x48844000, ap 43 42.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox7";
	reg = <0x44000 0x4>,
	<0x44010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3770,6 +3714,7 @@

	target-module@46000 { /* 0x48846000, ap 45 48.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox8";
	reg = <0x46000 0x4>,
	<0x46010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3888,6 +3833,7 @@

	target-module@5e000 { /* 0x4885e000, ap 69 6c.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox9";
	reg = <0x5e000 0x4>,
	<0x5e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3918,6 +3864,7 @@

	target-module@60000 { /* 0x48860000, ap 71 4a.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox10";
	reg = <0x60000 0x4>,
	<0x60010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3948,6 +3895,7 @@

	target-module@62000 { /* 0x48862000, ap 73 74.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox11";
	reg = <0x62000 0x4>,
	<0x62010 0x4>;
	reg-names = "rev", "sysc";
	@@ -3978,6 +3926,7 @@

	target-module@64000 { /* 0x48864000, ap 67 52.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox12";
	reg = <0x64000 0x4>,
	<0x64010 0x4>;
	reg-names = "rev", "sysc";
	@@ -4180,88 +4129,35 @@
	};

	target-module@170000 { /* 0x48970000, ap 21 0a.0 */
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x170010 0x4>;
	- reg-names = "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&cam_clkctrl DRA7_CAM_VIP1_CLKCTRL 0>;
	- clock-names = "fck";
	+ compatible = "ti,sysc";
	+ status = "disabled";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x170000 0x10000>;
	- status = "disabled";
	};

	target-module@190000 { /* 0x48990000, ap 23 2e.0 */
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x190010 0x4>;
	- reg-names = "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&cam_clkctrl DRA7_CAM_VIP2_CLKCTRL 0>;
	- clock-names = "fck";
	+ compatible = "ti,sysc";
	+ status = "disabled";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x190000 0x10000>;
	- status = "disabled";
	};

	target-module@1b0000 { /* 0x489b0000, ap 25 34.0 */
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x1b0000 0x4>,
	- <0x1b0010 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&cam_clkctrl DRA7_CAM_VIP3_CLKCTRL 0>;
	- clock-names = "fck";
	+ compatible = "ti,sysc";
	+ status = "disabled";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x1b0000 0x10000>;
	- status = "disabled";
	};

	- target-module@1d0010 { /* 0x489d0000, ap 27 30.0 */
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x1d0010 0x4>;
	- reg-names = "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&vpe_clkctrl DRA7_VPE_VPE_CLKCTRL 0>;
	- clock-names = "fck";
	+ target-module@1d0000 { /* 0x489d0000, ap 27 30.0 */
	+ compatible = "ti,sysc";
	+ status = "disabled";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x1d0000 0x10000>;
	-
	- vpe: vpe@0 {
	- compatible = "ti,dra7-vpe";
	- reg = <0x0000 0x120>,
	- <0x0700 0x80>,
	- <0x5700 0x18>,
	- <0xd000 0x400>;
	- reg-names = "vpe_top",
	- "sc",
	- "csc",
	- "vpdma";
	- interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
	- };
	};
	};
	};
	@@ -4405,6 +4301,7 @@

	target-module@4000 { /* 0x4ae14000, ap 7 28.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "wd_timer2";
	reg = <0x4000 0x4>,
	<0x4010 0x4>,
	<0x4014 0x4>;
	@@ -4489,6 +4386,7 @@

	target-module@0 { /* 0x4ae20000, ap 19 08.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer12";
	reg = <0x0 0x4>,
	<0x10 0x4>;
	reg-names = "rev", "sysc";
	diff --git a/sys/gnu/dts/arm/dra7.dtsi b/sys/gnu/dts/arm/dra7.dtsi
	--- a/sys/gnu/dts/arm/dra7.dtsi
	+++ b/sys/gnu/dts/arm/dra7.dtsi
	@@ -148,7 +148,6 @@
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x0 0x0 0xc0000000>;
	- dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
	ti,hwmods = "l3_main_1", "l3_main_2";
	reg = <0x0 0x44000000 0x0 0x1000000>,
	<0x0 0x45000000 0x0 0x1000>;
	@@ -185,7 +184,6 @@
	device_type = "pci";
	ranges = <0x81000000 0 0 0x03000 0 0x00010000
	0x82000000 0 0x20013000 0x13000 0 0xffed000>;
	- dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
	bus-range = <0x00 0xff>;
	#interrupt-cells = <1>;
	num-lanes = <1>;
	@@ -240,7 +238,6 @@
	device_type = "pci";
	ranges = <0x81000000 0 0 0x03000 0 0x00010000
	0x82000000 0 0x30013000 0x13000 0 0xffed000>;
	- dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
	bus-range = <0x00 0xff>;
	#interrupt-cells = <1>;
	num-lanes = <1>;
	@@ -380,120 +377,44 @@
	ti,hwmods = "dmm";
	};

	- target-module@40d01000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x40d01000 0x4>,
	- <0x40d01010 0x4>,
	- <0x40d01014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&dsp1_clkctrl DRA7_DSP1_MMU0_DSP1_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_dsp1 1>;
	- reset-names = "rstctrl";
	- ranges = <0x0 0x40d01000 0x1000>;
	- #size-cells = <1>;
	- #address-cells = <1>;
	-
	- mmu0_dsp1: mmu@0 {
	- compatible = "ti,dra7-dsp-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,syscon-mmuconfig = <&dsp1_system 0x0>;
	- };
	+ mmu0_dsp1: mmu@40d01000 {
	+ compatible = "ti,dra7-dsp-iommu";
	+ reg = <0x40d01000 0x100>;
	+ interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu0_dsp1";
	+ #iommu-cells = <0>;
	+ ti,syscon-mmuconfig = <&dsp1_system 0x0>;
	+ status = "disabled";
	};

	- target-module@40d02000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x40d02000 0x4>,
	- <0x40d02010 0x4>,
	- <0x40d02014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&dsp1_clkctrl DRA7_DSP1_MMU0_DSP1_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_dsp1 1>;
	- reset-names = "rstctrl";
	- ranges = <0x0 0x40d02000 0x1000>;
	- #size-cells = <1>;
	- #address-cells = <1>;
	-
	- mmu1_dsp1: mmu@0 {
	- compatible = "ti,dra7-dsp-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,syscon-mmuconfig = <&dsp1_system 0x1>;
	- };
	+ mmu1_dsp1: mmu@40d02000 {
	+ compatible = "ti,dra7-dsp-iommu";
	+ reg = <0x40d02000 0x100>;
	+ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu1_dsp1";
	+ #iommu-cells = <0>;
	+ ti,syscon-mmuconfig = <&dsp1_system 0x1>;
	+ status = "disabled";
	};

	- target-module@58882000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x58882000 0x4>,
	- <0x58882010 0x4>,
	- <0x58882014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&ipu1_clkctrl DRA7_IPU1_MMU_IPU1_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_ipu 2>;
	- reset-names = "rstctrl";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x58882000 0x100>;
	-
	- mmu_ipu1: mmu@0 {
	- compatible = "ti,dra7-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,iommu-bus-err-back;
	- };
	+ mmu_ipu1: mmu@58882000 {
	+ compatible = "ti,dra7-iommu";
	+ reg = <0x58882000 0x100>;
	+ interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu_ipu1";
	+ #iommu-cells = <0>;
	+ ti,iommu-bus-err-back;
	+ status = "disabled";
	};

	- target-module@55082000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x55082000 0x4>,
	- <0x55082010 0x4>,
	- <0x55082014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&ipu2_clkctrl DRA7_IPU2_MMU_IPU2_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_core 2>;
	- reset-names = "rstctrl";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x55082000 0x100>;
	-
	- mmu_ipu2: mmu@0 {
	- compatible = "ti,dra7-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,iommu-bus-err-back;
	- };
	+ mmu_ipu2: mmu@55082000 {
	+ compatible = "ti,dra7-iommu";
	+ reg = <0x55082000 0x100>;
	+ interrupts = <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu_ipu2";
	+ #iommu-cells = <0>;
	+ ti,iommu-bus-err-back;
	+ status = "disabled";
	};

	abb_mpu: regulator-abb-mpu {
	@@ -676,24 +597,6 @@
	status = "disabled";
	};

	- target-module@56000000 {
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x5600fe00 0x4>,
	- <0x5600fe10 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- clocks = <&gpu_clkctrl DRA7_GPU_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x56000000 0x2000000>;
	- };
	-
	crossbar_mpu: crossbar@4a002a48 {
	compatible = "ti,irq-crossbar";
	reg = <0x4a002a48 0x130>;
	@@ -749,96 +652,48 @@
	};
	};

	- aes1_target: target-module@4b500000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x4b500080 0x4>,
	- <0x4b500084 0x4>,
	- <0x4b500088 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l4sec_clkdm */
	- clocks = <&l4sec_clkctrl DRA7_L4SEC_AES1_CLKCTRL 0>;
	+ aes1: aes@4b500000 {
	+ compatible = "ti,omap4-aes";
	+ ti,hwmods = "aes1";
	+ reg = <0x4b500000 0xa0>;
	+ interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&edma_xbar 111 0>, <&edma_xbar 110 0>;
	+ dma-names = "tx", "rx";
	+ clocks = <&l3_iclk_div>;
	clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x4b500000 0x1000>;
	-
	- aes1: aes@0 {
	- compatible = "ti,omap4-aes";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&edma_xbar 111 0>, <&edma_xbar 110 0>;
	- dma-names = "tx", "rx";
	- clocks = <&l3_iclk_div>;
	- clock-names = "fck";
	- };
	};

	- aes2_target: target-module@4b700000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x4b700080 0x4>,
	- <0x4b700084 0x4>,
	- <0x4b700088 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): per_pwrdm, l4sec_clkdm */
	- clocks = <&l4sec_clkctrl DRA7_L4SEC_AES2_CLKCTRL 0>;
	+ aes2: aes@4b700000 {
	+ compatible = "ti,omap4-aes";
	+ ti,hwmods = "aes2";
	+ reg = <0x4b700000 0xa0>;
	+ interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&edma_xbar 114 0>, <&edma_xbar 113 0>;
	+ dma-names = "tx", "rx";
	+ clocks = <&l3_iclk_div>;
	clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x4b700000 0x1000>;
	-
	- aes2: aes@0 {
	- compatible = "ti,omap4-aes";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&edma_xbar 114 0>, <&edma_xbar 113 0>;
	- dma-names = "tx", "rx";
	- clocks = <&l3_iclk_div>;
	- clock-names = "fck";
	- };
	};

	- sham_target: target-module@4b101000 {
	- compatible = "ti,sysc-omap3-sham", "ti,sysc";
	- reg = <0x4b101100 0x4>,
	- <0x4b101110 0x4>,
	- <0x4b101114 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
	- clocks = <&l4sec_clkctrl DRA7_L4SEC_SHAM_CLKCTRL 0>;
	+ des: des@480a5000 {
	+ compatible = "ti,omap4-des";
	+ ti,hwmods = "des";
	+ reg = <0x480a5000 0xa0>;
	+ interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&sdma_xbar 117>, <&sdma_xbar 116>;
	+ dma-names = "tx", "rx";
	+ clocks = <&l3_iclk_div>;
	+ clock-names = "fck";
	+ };
	+
	+ sham: sham@53100000 {
	+ compatible = "ti,omap5-sham";
	+ ti,hwmods = "sham";
	+ reg = <0x4b101000 0x300>;
	+ interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&edma_xbar 119 0>;
	+ dma-names = "rx";
	+ clocks = <&l3_iclk_div>;
	clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x4b101000 0x1000>;
	-
	- sham: sham@0 {
	- compatible = "ti,omap5-sham";
	- reg = <0 0x300>;
	- interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&edma_xbar 119 0>;
	- dma-names = "rx";
	- clocks = <&l3_iclk_div>;
	- clock-names = "fck";
	- };
	};

	opp_supply_mpu: opp-supply@4a003b20 {
	@@ -908,54 +763,3 @@

	#include "dra7-l4.dtsi"
	#include "dra7xx-clocks.dtsi"
	-
	-&prm {
	- prm_dsp1: prm@400 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x400 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_ipu: prm@500 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x500 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_core: prm@700 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x700 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_iva: prm@f00 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0xf00 0x100>;
	- };
	-
	- prm_dsp2: prm@1b00 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1b00 0x40>;
	- #reset-cells = <1>;
	- };
	-
	- prm_eve1: prm@1b40 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1b40 0x40>;
	- };
	-
	- prm_eve2: prm@1b80 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1b80 0x40>;
	- };
	-
	- prm_eve3: prm@1bc0 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1bc0 0x40>;
	- };
	-
	- prm_eve4: prm@1c00 {
	- compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1c00 0x60>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/dra72-evm-common.dtsi b/sys/gnu/dts/arm/dra72-evm-common.dtsi
	--- a/sys/gnu/dts/arm/dra72-evm-common.dtsi
	+++ b/sys/gnu/dts/arm/dra72-evm-common.dtsi
	@@ -6,7 +6,7 @@

	#include "dra72x.dtsi"
	#include <dt-bindings/gpio/gpio.h>
	-#include <dt-bindings/clock/ti-dra7-atl.h>
	+#include <dt-bindings/clk/ti-dra7-atl.h>

	/ {
	compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7";
	@@ -187,12 +187,6 @@
	gpio = <&gpio5 8 GPIO_ACTIVE_HIGH>;
	enable-active-high;
	};
	-
	- clk_ov5640_fixed: clock {
	- compatible = "fixed-clock";
	- #clock-cells = <0>;
	- clock-frequency = <24000000>;
	- };
	};

	&dra7_pmx_core {
	@@ -275,23 +269,6 @@
	line-name = "vin6_sel_s0";
	};
	};
	-
	- ov5640@3c {
	- compatible = "ovti,ov5640";
	- reg = <0x3c>;
	-
	- clocks = <&clk_ov5640_fixed>;
	- clock-names = "xclk";
	-
	- port {
	- csi2_cam0: endpoint {
	- remote-endpoint = <&csi2_phy0>;
	- clock-lanes = <0>;
	- data-lanes = <1 2>;
	- };
	- };
	- };
	-
	};

	&uart1 {
	@@ -603,11 +580,3 @@
	&pcie1_rc {
	status = "okay";
	};
	-
	-&csi2_0 {
	- csi2_phy0: endpoint {
	- remote-endpoint = <&csi2_cam0>;
	- clock-lanes = <0>;
	- data-lanes = <1 2>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/dra72x.dtsi b/sys/gnu/dts/arm/dra72x.dtsi
	--- a/sys/gnu/dts/arm/dra72x.dtsi
	+++ b/sys/gnu/dts/arm/dra72x.dtsi
	@@ -17,48 +17,6 @@
	};
	};

	-&l4_per2 {
	- target-module@5b000 { /* 0x4845b000, ap 59 46.0 */
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x5b000 0x4>,
	- <0x5b010 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- clocks = <&cam_clkctrl DRA7_CAM_VIP2_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x5b000 0x1000>;
	-
	- cal: cal@0 {
	- compatible = "ti,dra72-cal";
	- reg = <0x0000 0x400>,
	- <0x0800 0x40>,
	- <0x0900 0x40>;
	- reg-names = "cal_top",
	- "cal_rx_core0",
	- "cal_rx_core1";
	- interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
	- ti,camerrx-control = <&scm_conf 0xE94>;
	-
	- ports {
	- #address-cells = <1>;
	- #size-cells = <0>;
	-
	- csi2_0: port@0 {
	- reg = <0>;
	- };
	- csi2_1: port@1 {
	- reg = <1>;
	- };
	- };
	- };
	- };
	-};
	-
	&dss {
	reg = <0x58000000 0x80>,
	<0x58004054 0x4>,
	diff --git a/sys/gnu/dts/arm/dra74x.dtsi b/sys/gnu/dts/arm/dra74x.dtsi
	--- a/sys/gnu/dts/arm/dra74x.dtsi
	+++ b/sys/gnu/dts/arm/dra74x.dtsi
	@@ -66,63 +66,24 @@
	};
	};

	- target-module@41501000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x41501000 0x4>,
	- <0x41501010 0x4>,
	- <0x41501014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&dsp2_clkctrl DRA7_DSP2_MMU0_DSP2_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_dsp2 1>;
	- reset-names = "rstctrl";
	- ranges = <0x0 0x41501000 0x1000>;
	- #size-cells = <1>;
	- #address-cells = <1>;
	-
	- mmu0_dsp2: mmu@0 {
	- compatible = "ti,dra7-dsp-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,syscon-mmuconfig = <&dsp2_system 0x0>;
	- };
	+ mmu0_dsp2: mmu@41501000 {
	+ compatible = "ti,dra7-dsp-iommu";
	+ reg = <0x41501000 0x100>;
	+ interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu0_dsp2";
	+ #iommu-cells = <0>;
	+ ti,syscon-mmuconfig = <&dsp2_system 0x0>;
	+ status = "disabled";
	};

	- target-module@41502000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x41502000 0x4>,
	- <0x41502010 0x4>,
	- <0x41502014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	-
	- clocks = <&dsp2_clkctrl DRA7_DSP2_MMU0_DSP2_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_dsp2 1>;
	- reset-names = "rstctrl";
	- ranges = <0x0 0x41502000 0x1000>;
	- #size-cells = <1>;
	- #address-cells = <1>;
	-
	- mmu1_dsp2: mmu@0 {
	- compatible = "ti,dra7-dsp-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,syscon-mmuconfig = <&dsp2_system 0x1>;
	- };
	+ mmu1_dsp2: mmu@41502000 {
	+ compatible = "ti,dra7-dsp-iommu";
	+ reg = <0x41502000 0x100>;
	+ interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu1_dsp2";
	+ #iommu-cells = <0>;
	+ ti,syscon-mmuconfig = <&dsp2_system 0x1>;
	+ status = "disabled";
	};
	};
	};
	diff --git a/sys/gnu/dts/arm/dra76-evm.dts b/sys/gnu/dts/arm/dra76-evm.dts
	--- a/sys/gnu/dts/arm/dra76-evm.dts
	+++ b/sys/gnu/dts/arm/dra76-evm.dts
	@@ -13,13 +13,6 @@
	model = "TI DRA762 EVM";
	compatible = "ti,dra76-evm", "ti,dra762", "ti,dra7";

	- aliases {
	- display0 = &hdmi0;
	-
	- sound0 = &sound0;
	- sound1 = &hdmi;
	- };
	-
	memory@0 {
	device_type = "memory";
	reg = <0x0 0x80000000 0x0 0x80000000>;
	@@ -123,54 +116,6 @@
	regulator-min-microvolt = <1800000>;
	regulator-max-microvolt = <1800000>;
	};
	-
	- clk_ov5640_fixed: clock {
	- compatible = "fixed-clock";
	- #clock-cells = <0>;
	- clock-frequency = <24000000>;
	- };
	-
	- hdmi0: connector {
	- compatible = "hdmi-connector";
	- label = "hdmi";
	-
	- type = "a";
	-
	- port {
	- hdmi_connector_in: endpoint {
	- remote-endpoint = <&tpd12s015_out>;
	- };
	- };
	- };
	-
	- tpd12s015: encoder {
	- compatible = "ti,tpd12s015";
	-
	- gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>, /* gpio7_30, CT CP HPD */
	- <&gpio7 31 GPIO_ACTIVE_HIGH>, /* gpio7_31, LS OE */
	- <&gpio7 12 GPIO_ACTIVE_HIGH>; /* gpio7_12/sp1_cs2, HPD */
	-
	- ports {
	- #address-cells = <1>;
	- #size-cells = <0>;
	-
	- port@0 {
	- reg = <0>;
	-
	- tpd12s015_in: endpoint {
	- remote-endpoint = <&hdmi_out>;
	- };
	- };
	-
	- port@1 {
	- reg = <1>;
	-
	- tpd12s015_out: endpoint {
	- remote-endpoint = <&hdmi_connector_in>;
	- };
	- };
	- };
	- };
	};

	&i2c1 {
	@@ -372,27 +317,6 @@
	};
	};

	-&i2c5 {
	- status = "okay";
	- clock-frequency = <400000>;
	-
	- ov5640@3c {
	- compatible = "ovti,ov5640";
	- reg = <0x3c>;
	-
	- clocks = <&clk_ov5640_fixed>;
	- clock-names = "xclk";
	-
	- port {
	- csi2_cam0: endpoint {
	- remote-endpoint = <&csi2_phy0>;
	- clock-lanes = <0>;
	- data-lanes = <1 2>;
	- };
	- };
	- };
	-};
	-
	&cpu0 {
	vdd-supply = <&buck10_reg>;
	};
	@@ -487,23 +411,6 @@
	phy-supply = <&ldo3_reg>;
	};

	-&dss {
	- status = "ok";
	- vdda_video-supply = <&ldo5_reg>;
	-};
	-
	-&hdmi {
	- status = "ok";
	-
	- vdda-supply = <&ldo1_reg>;
	-
	- port {
	- hdmi_out: endpoint {
	- remote-endpoint = <&tpd12s015_in>;
	- };
	- };
	-};
	-
	&qspi {
	spi-max-frequency = <96000000>;
	m25p80@0 {
	@@ -540,11 +447,3 @@
	max-bitrate = <5000000>;
	};
	};
	-
	-&csi2_0 {
	- csi2_phy0: endpoint {
	- remote-endpoint = <&csi2_cam0>;
	- clock-lanes = <0>;
	- data-lanes = <1 2>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/dra76x.dtsi b/sys/gnu/dts/arm/dra76x.dtsi
	--- a/sys/gnu/dts/arm/dra76x.dtsi
	+++ b/sys/gnu/dts/arm/dra76x.dtsi
	@@ -41,48 +41,6 @@

	};

	-&l4_per3 {
	- target-module@1b0000 { /* 0x489b0000, ap 25 34.0 */
	- compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x1b0000 0x4>,
	- <0x1b0010 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- clocks = <&cam_clkctrl DRA7_CAM_VIP3_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x1b0000 0x10000>;
	-
	- cal: cal@0 {
	- compatible = "ti,dra76-cal";
	- reg = <0x0000 0x400>,
	- <0x0800 0x40>,
	- <0x0900 0x40>;
	- reg-names = "cal_top",
	- "cal_rx_core0",
	- "cal_rx_core1";
	- interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
	- ti,camerrx-control = <&scm_conf 0x6dc>;
	-
	- ports {
	- #address-cells = <1>;
	- #size-cells = <0>;
	-
	- csi2_0: port@0 {
	- reg = <0>;
	- };
	- csi2_1: port@1 {
	- reg = <1>;
	- };
	- };
	- };
	- };
	-};
	-
	/* MCAN interrupts are hard-wired to irqs 67, 68 */
	&crossbar_mpu {
	ti,irqs-skip = <10 67 68 133 139 140>;
	@@ -128,8 +86,3 @@
	&usb4_tm {
	status = "disabled";
	};
	-
	-&mmc3 {
	- /* dra76x is not affected by i887 */
	- max-frequency = <96000000>;
	-};
	diff --git a/sys/gnu/dts/arm/dra7xx-clocks.dtsi b/sys/gnu/dts/arm/dra7xx-clocks.dtsi
	--- a/sys/gnu/dts/arm/dra7xx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/dra7xx-clocks.dtsi
	@@ -796,6 +796,16 @@
	clock-div = <1>;
	};

	+ ipu1_gfclk_mux: ipu1_gfclk_mux@520 {
	+ #clock-cells = <0>;
	+ compatible = "ti,mux-clock";
	+ clocks = <&dpll_abe_m2x2_ck>, <&dpll_core_h22x2_ck>;
	+ ti,bit-shift = <24>;
	+ reg = <0x0520>;
	+ assigned-clocks = <&ipu1_gfclk_mux>;
	+ assigned-clock-parents = <&dpll_core_h22x2_ck>;
	+ };
	+
	dummy_ck: dummy_ck {
	#clock-cells = <0>;
	compatible = "fixed-clock";
	@@ -1554,8 +1564,6 @@
	compatible = "ti,clkctrl";
	reg = <0x20 0x4>;
	#clock-cells = <2>;
	- assigned-clocks = <&ipu1_clkctrl DRA7_IPU1_MMU_IPU1_CLKCTRL 24>;
	- assigned-clock-parents = <&dpll_core_h22x2_ck>;
	};

	ipu_clkctrl: ipu-clkctrl@50 {
	@@ -1583,10 +1591,10 @@

	rtc_cm: rtc-cm@700 {
	compatible = "ti,omap4-cm";
	- reg = <0x700 0x60>;
	+ reg = <0x700 0x100>;
	#address-cells = <1>;
	#size-cells = <1>;
	- ranges = <0 0x700 0x60>;
	+ ranges = <0 0x700 0x100>;

	rtc_clkctrl: rtc-clkctrl@20 {
	compatible = "ti,clkctrl";
	@@ -1595,20 +1603,6 @@
	};
	};

	- vpe_cm: vpe-cm@760 {
	- compatible = "ti,omap4-cm";
	- reg = <0x760 0xc>;
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x760 0xc>;
	-
	- vpe_clkctrl: vpe-clkctrl@0 {
	- compatible = "ti,clkctrl";
	- reg = <0x0 0xc>;
	- #clock-cells = <2>;
	- };
	- };
	-
	};

	&cm_core {
	@@ -1726,20 +1720,6 @@
	};
	};

	- cam_cm: cam-cm@1000 {
	- compatible = "ti,omap4-cm";
	- reg = <0x1000 0x100>;
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x1000 0x100>;
	-
	- cam_clkctrl: cam-clkctrl@20 {
	- compatible = "ti,clkctrl";
	- reg = <0x20 0x2c>;
	- #clock-cells = <2>;
	- };
	- };
	-
	dss_cm: dss-cm@1100 {
	compatible = "ti,omap4-cm";
	reg = <0x1100 0x100>;
	@@ -1754,20 +1734,6 @@
	};
	};

	- gpu_cm: gpu-cm@1200 {
	- compatible = "ti,omap4-cm";
	- reg = <0x1200 0x100>;
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x1200 0x100>;
	-
	- gpu_clkctrl: gpu-clkctrl@20 {
	- compatible = "ti,clkctrl";
	- reg = <0x20 0x4>;
	- #clock-cells = <2>;
	- };
	- };
	-
	l3init_cm: l3init-cm@1300 {
	compatible = "ti,omap4-cm";
	reg = <0x1300 0x100>;
	diff --git a/sys/gnu/dts/arm/omap2.dtsi b/sys/gnu/dts/arm/omap2.dtsi
	--- a/sys/gnu/dts/arm/omap2.dtsi
	+++ b/sys/gnu/dts/arm/omap2.dtsi
	@@ -8,7 +8,6 @@
	* kind, whether express or implied.
	*/

	-#include <dt-bindings/bus/ti-sysc.h>
	#include <dt-bindings/gpio/gpio.h>
	#include <dt-bindings/interrupt-controller/irq.h>
	#include <dt-bindings/pinctrl/omap.h>
	@@ -80,37 +79,17 @@
	reg = <0x480FE000 0x1000>;
	};

	- target-module@48056000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x48056000 0x4>,
	- <0x4805602c 0x4>,
	- <0x48056028 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_EMUFREE \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,syss-mask = <1>;
	- clocks = <&core_l3_ck>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x48056000 0x1000>;
	-
	- sdma: dma-controller@0 {
	- compatible = "ti,omap2420-sdma", "ti,omap-sdma";
	- reg = <0 0x1000>;
	- interrupts = <12>,
	- <13>,
	- <14>,
	- <15>;
	- #dma-cells = <1>;
	- dma-channels = <32>;
	- dma-requests = <64>;
	- };
	+ sdma: dma-controller@48056000 {
	+ compatible = "ti,omap2430-sdma", "ti,omap2420-sdma";
	+ ti,hwmods = "dma";
	+ reg = <0x48056000 0x1000>;
	+ interrupts = <12>,
	+ <13>,
	+ <14>,
	+ <15>;
	+ #dma-cells = <1>;
	+ dma-channels = <32>;
	+ dma-requests = <64>;
	};

	i2c1: i2c@48070000 {
	diff --git a/sys/gnu/dts/arm/omap2430.dtsi b/sys/gnu/dts/arm/omap2430.dtsi
	--- a/sys/gnu/dts/arm/omap2430.dtsi
	+++ b/sys/gnu/dts/arm/omap2430.dtsi
	@@ -309,10 +309,6 @@
	};
	};

	-&sdma {
	- compatible = "ti,omap2430-sdma", "ti,omap-sdma";
	-};
	-
	&i2c1 {
	compatible = "ti,omap2430-i2c";
	};
	diff --git a/sys/gnu/dts/arm/omap3-beagle-xm.dts b/sys/gnu/dts/arm/omap3-beagle-xm.dts
	--- a/sys/gnu/dts/arm/omap3-beagle-xm.dts
	+++ b/sys/gnu/dts/arm/omap3-beagle-xm.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TI OMAP3 BeagleBoard xM";
	- compatible = "ti,omap3-beagle-xm", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";

	cpus {
	cpu@0 {
	diff --git a/sys/gnu/dts/arm/omap3-beagle.dts b/sys/gnu/dts/arm/omap3-beagle.dts
	--- a/sys/gnu/dts/arm/omap3-beagle.dts
	+++ b/sys/gnu/dts/arm/omap3-beagle.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TI OMAP3 BeagleBoard";
	- compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3";
	+ compatible = "ti,omap3-beagle", "ti,omap3";

	cpus {
	cpu@0 {
	diff --git a/sys/gnu/dts/arm/omap3-cm-t3530.dts b/sys/gnu/dts/arm/omap3-cm-t3530.dts
	--- a/sys/gnu/dts/arm/omap3-cm-t3530.dts
	+++ b/sys/gnu/dts/arm/omap3-cm-t3530.dts
	@@ -9,7 +9,7 @@

	/ {
	model = "CompuLab CM-T3530";
	- compatible = "compulab,omap3-cm-t3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
	+ compatible = "compulab,omap3-cm-t3530", "ti,omap34xx", "ti,omap3";

	/* Regulator to trigger the reset signal of the Wifi module */
	mmc2_sdio_reset: regulator-mmc2-sdio-reset {
	diff --git a/sys/gnu/dts/arm/omap3-cm-t3730.dts b/sys/gnu/dts/arm/omap3-cm-t3730.dts
	--- a/sys/gnu/dts/arm/omap3-cm-t3730.dts
	+++ b/sys/gnu/dts/arm/omap3-cm-t3730.dts
	@@ -9,7 +9,7 @@

	/ {
	model = "CompuLab CM-T3730";
	- compatible = "compulab,omap3-cm-t3730", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";

	wl12xx_vmmc2: wl12xx_vmmc2 {
	compatible = "regulator-fixed";
	diff --git a/sys/gnu/dts/arm/omap3-devkit8000-lcd43.dts b/sys/gnu/dts/arm/omap3-devkit8000-lcd43.dts
	--- a/sys/gnu/dts/arm/omap3-devkit8000-lcd43.dts
	+++ b/sys/gnu/dts/arm/omap3-devkit8000-lcd43.dts
	@@ -11,7 +11,7 @@
	#include "omap3-devkit8000-lcd-common.dtsi"
	/ {
	model = "TimLL OMAP3 Devkit8000 with 4.3'' LCD panel";
	- compatible = "timll,omap3-devkit8000", "ti,omap3430", "ti,omap3";
	+ compatible = "timll,omap3-devkit8000", "ti,omap3";

	lcd0: display {
	panel-timing {
	diff --git a/sys/gnu/dts/arm/omap3-devkit8000-lcd70.dts b/sys/gnu/dts/arm/omap3-devkit8000-lcd70.dts
	--- a/sys/gnu/dts/arm/omap3-devkit8000-lcd70.dts
	+++ b/sys/gnu/dts/arm/omap3-devkit8000-lcd70.dts
	@@ -11,7 +11,7 @@
	#include "omap3-devkit8000-lcd-common.dtsi"
	/ {
	model = "TimLL OMAP3 Devkit8000 with 7.0'' LCD panel";
	- compatible = "timll,omap3-devkit8000", "ti,omap3430", "ti,omap3";
	+ compatible = "timll,omap3-devkit8000", "ti,omap3";

	lcd0: display {
	panel-timing {
	diff --git a/sys/gnu/dts/arm/omap3-devkit8000.dts b/sys/gnu/dts/arm/omap3-devkit8000.dts
	--- a/sys/gnu/dts/arm/omap3-devkit8000.dts
	+++ b/sys/gnu/dts/arm/omap3-devkit8000.dts
	@@ -7,7 +7,7 @@
	#include "omap3-devkit8000-common.dtsi"
	/ {
	model = "TimLL OMAP3 Devkit8000";
	- compatible = "timll,omap3-devkit8000", "ti,omap3430", "ti,omap3";
	+ compatible = "timll,omap3-devkit8000", "ti,omap3";

	aliases {
	display1 = &dvi0;
	diff --git a/sys/gnu/dts/arm/omap3-echo.dts b/sys/gnu/dts/arm/omap3-echo.dts
	--- a/sys/gnu/dts/arm/omap3-echo.dts
	+++ b/sys/gnu/dts/arm/omap3-echo.dts
	@@ -1,461 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/*
	- * Copyright (C) 2019 André Hentschel <nerv@dawncrow.de>
	- */
	-/dts-v1/;
	-
	-#include "dm3725.dtsi"
	-
	-#include <dt-bindings/input/input.h>
	-
	-/ {
	- model = "Amazon Echo (first generation)";
	- compatible = "amazon,omap3-echo", "ti,omap3630", "ti,omap3";
	-
	- cpus {
	- cpu@0 {
	- cpu0-supply = <&vdd1_reg>;
	- };
	- };
	-
	- memory@80000000 {
	- device_type = "memory";
	- reg = <0x80000000 0xc600000>; /* 198 MB */
	- };
	-
	- vcc5v: fixedregulator0 {
	- compatible = "regulator-fixed";
	- regulator-name = "vcc5v";
	- regulator-min-microvolt = <5000000>;
	- regulator-max-microvolt = <5000000>;
	- regulator-boot-on;
	- regulator-always-on;
	- };
	-
	- vcc3v3: fixedregulator1 {
	- compatible = "regulator-fixed";
	- regulator-name = "vcc3v3";
	- regulator-min-microvolt = <3300000>;
	- regulator-max-microvolt = <3300000>;
	- regulator-boot-on;
	- regulator-always-on;
	- };
	-
	- vcc1v8: fixedregulator2 {
	- compatible = "regulator-fixed";
	- regulator-name = "vcc1v8";
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <1800000>;
	- regulator-boot-on;
	- regulator-always-on;
	- };
	-
	- sdio_pwrseq: sdio-pwrseq {
	- compatible = "mmc-pwrseq-simple";
	- reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
	- post-power-on-delay-ms = <40>;
	- };
	-
	- gpio-keys {
	- compatible = "gpio-keys";
	-
	- pinctrl-names = "default";
	- pinctrl-0 = <&button_pins>;
	-
	- mute-button {
	- label = "mute";
	- linux,code = <KEY_MUTE>;
	- gpios = <&gpio3 6 GPIO_ACTIVE_LOW>; /* GPIO_70 */
	- wakeup-source;
	- };
	-
	- help-button {
	- label = "help";
	- linux,code = <KEY_HELP>;
	- gpios = <&gpio3 8 GPIO_ACTIVE_LOW>; /* GPIO_72 */
	- wakeup-source;
	- };
	- };
	-
	- rotary: rotary-encoder {
	- compatible = "rotary-encoder";
	- gpios = <
	- &gpio3 5 GPIO_ACTIVE_HIGH /* GPIO_69 */
	- &gpio3 12 GPIO_ACTIVE_HIGH /* GPIO_76 */
	- >;
	- linux,axis = <REL_X>;
	- rotary-encoder,relative-axis;
	- };
	-};
	-
	-&i2c1 {
	- clock-frequency = <400000>;
	-
	- tps: tps@2d {
	- reg = <0x2d>;
	- };
	-};
	-
	-&i2c2 {
	- clock-frequency = <400000>;
	-
	- lp5523A: lp5523A@32 {
	- compatible = "national,lp5523";
	- label = "q1";
	- reg = <0x32>;
	- clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
	- enable-gpio = <&gpio4 13 GPIO_ACTIVE_HIGH>; /* GPIO_109 */
	-
	- chan0 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan1 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan2 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan3 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan4 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan5 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan6 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan7 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan8 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- };
	-
	- lp5523B: lp5523B@33 {
	- compatible = "national,lp5523";
	- label = "q3";
	- reg = <0x33>;
	- clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
	-
	- chan0 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan1 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan2 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan3 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan4 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan5 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan6 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan7 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan8 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- };
	-
	- lp5523C: lp5523C@34 {
	- compatible = "national,lp5523";
	- label = "q4";
	- reg = <0x34>;
	- clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
	-
	- chan0 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan1 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan2 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan3 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan4 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan5 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan6 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan7 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan8 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- };
	-
	- lp5523D: lp552D@35 {
	- compatible = "national,lp5523";
	- label = "q2";
	- reg = <0x35>;
	- clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */
	-
	- chan0 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan1 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan2 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan3 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan4 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan5 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan6 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan7 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- chan8 {
	- led-cur = /bits/ 8 <12>;
	- max-cur = /bits/ 8 <15>;
	- };
	- };
	-};
	-
	-#include "tps65910.dtsi"
	-
	-&omap3_pmx_core {
	- tps_pins: pinmux_tps_pins {
	- pinctrl-single,pins = <
	- OMAP3_CORE1_IOPAD(0x21e0, PIN_INPUT_PULLUP \| PIN_OFF_INPUT_PULLUP \| PIN_OFF_OUTPUT_LOW \| PIN_OFF_WAKEUPENABLE \| MUX_MODE0) /* sys_nirq.sys_nirq */
	- >;
	- };
	-
	- button_pins: pinmux_button_pins {
	- pinctrl-single,pins = <
	- OMAP3_CORE1_IOPAD(0x20dc, PIN_INPUT \| MUX_MODE4) /* dss_data0.gpio_70 */
	- OMAP3_CORE1_IOPAD(0x20e0, PIN_INPUT \| MUX_MODE4) /* dss_data2.gpio_72 */
	- >;
	- };
	-
	- mmc1_pins: pinmux_mmc1_pins {
	- pinctrl-single,pins = <
	- OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
	- OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
	- OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
	- OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
	- OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
	- OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
	- >;
	- };
	-
	- mmc2_pins: pinmux_mmc2_pins {
	- pinctrl-single,pins = <
	- OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */
	- OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */
	- OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */
	- OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
	- OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */
	- OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */
	- OMAP3_CORE1_IOPAD(0x2164, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat4.sdmmc2_dat4 */
	- OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat5.sdmmc2_dat5 */
	- OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat6.sdmmc2_dat6 */
	- OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP \| MUX_MODE0) /* sdmmc2_dat7.sdmmc2_dat7 */
	- >;
	- };
	-};
	-
	-&omap3_pmx_core2 {
	- mmc3_pins: pinmux_mmc3_pins {
	- pinctrl-single,pins = <
	- OMAP3630_CORE2_IOPAD(0x25d8, PIN_INPUT_PULLUP \| MUX_MODE2) /* etk_clk.sdmmc3_clk */
	- OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP \| MUX_MODE2) /* etk_ctl.sdmmc3_cmd */
	- OMAP3630_CORE2_IOPAD(0x25e2, PIN_INPUT_PULLUP \| MUX_MODE2) /* etk_d3.sdmmc3_dat3 */
	- OMAP3630_CORE2_IOPAD(0x25e4, PIN_INPUT_PULLUP \| MUX_MODE2) /* etk_d4.sdmmc3_dat0 */
	- OMAP3630_CORE2_IOPAD(0x25e6, PIN_INPUT_PULLUP \| MUX_MODE2) /* etk_d5.sdmmc3_dat1 */
	- OMAP3630_CORE2_IOPAD(0x25e8, PIN_INPUT_PULLUP \| MUX_MODE2) /* etk_d6.sdmmc3_dat2 */
	- >;
	- };
	-};
	-
	-&mmc1 {
	- status = "okay";
	- bus-width = <4>;
	- pinctrl-names = "default";
	- pinctrl-0 = <&mmc1_pins>;
	- vmmc-supply = <&vmmc_reg>;
	-};
	-
	-&mmc2 {
	- status = "okay";
	- bus-width = <8>;
	- pinctrl-names = "default";
	- pinctrl-0 = <&mmc2_pins>;
	- vmmc-supply = <&vmmc_reg>;
	-};
	-
	-&mmc3 {
	- status = "okay";
	- bus-width = <4>;
	- pinctrl-names = "default";
	- pinctrl-0 = <&mmc3_pins>;
	- non-removable;
	- disable-wp;
	- mmc-pwrseq = <&sdio_pwrseq>;
	- vmmc-supply = <&vcc3v3>;
	- vqmmc-supply = <&vcc1v8>;
	-};
	-
	-&tps {
	- pinctrl-names = "default";
	- pinctrl-0 = <&tps_pins>;
	-
	- interrupts = <7>; /* SYS_NIRQ cascaded to intc */
	- interrupt-parent = <&intc>;
	-
	- ti,en-ck32k-xtal;
	- ti,system-power-controller;
	-
	- vcc1-supply = <&vcc5v>;
	- vcc2-supply = <&vcc5v>;
	- vcc3-supply = <&vcc5v>;
	- vcc4-supply = <&vcc5v>;
	- vcc5-supply = <&vcc5v>;
	- vcc6-supply = <&vcc5v>;
	- vcc7-supply = <&vcc5v>;
	- vccio-supply = <&vcc5v>;
	-
	- regulators {
	-
	- vio_reg: regulator@1 {
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <1800000>;
	- regulator-always-on;
	- };
	-
	- vdd1_reg: regulator@2 {
	- regulator-name = "vdd_mpu";
	- regulator-min-microvolt = <600000>;
	- regulator-max-microvolt = <1500000>;
	- regulator-boot-on;
	- regulator-always-on;
	- };
	-
	- vdd2_reg: regulator@3 {
	- regulator-name = "vdd_dsp";
	- regulator-min-microvolt = <600000>;
	- regulator-max-microvolt = <1500000>;
	- regulator-always-on;
	- };
	-
	- vdd3_reg: regulator@4 {
	- regulator-name = "vdd_core";
	- regulator-min-microvolt = <5000000>;
	- regulator-max-microvolt = <5000000>;
	- regulator-always-on;
	- };
	-
	- vdig1_reg: regulator@5 {
	- regulator-min-microvolt = <1200000>;
	- regulator-max-microvolt = <2700000>;
	- regulator-always-on;
	- };
	-
	- vdig2_reg: regulator@6 {
	- regulator-min-microvolt = <1000000>;
	- regulator-max-microvolt = <1800000>;
	- regulator-always-on;
	- };
	-
	- vpll_reg: regulator@7 {
	- regulator-min-microvolt = <1000000>;
	- regulator-max-microvolt = <2500000>;
	- regulator-always-on;
	- };
	-
	- vdac_reg: regulator@8 {
	- regulator-min-microvolt = <1100000>;
	- regulator-max-microvolt = <3300000>;
	- regulator-always-on;
	- };
	-
	- vaux1_reg: regulator@9 {
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <2850000>;
	- regulator-always-on;
	- };
	-
	- vaux2_reg: regulator@10 {
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <3300000>;
	- regulator-always-on;
	- };
	-
	- vaux33_reg: regulator@11 {
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <3300000>;
	- regulator-always-on;
	- };
	-
	- vmmc_reg: regulator@12 {
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <3000000>;
	- regulator-always-on;
	- };
	- };
	-};
	diff --git a/sys/gnu/dts/arm/omap3-gta04.dtsi b/sys/gnu/dts/arm/omap3-gta04.dtsi
	--- a/sys/gnu/dts/arm/omap3-gta04.dtsi
	+++ b/sys/gnu/dts/arm/omap3-gta04.dtsi
	@@ -11,7 +11,7 @@

	/ {
	model = "OMAP3 GTA04";
	- compatible = "ti,omap3-gta04", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3";

	cpus {
	cpu@0 {
	diff --git a/sys/gnu/dts/arm/omap3-ha-lcd.dts b/sys/gnu/dts/arm/omap3-ha-lcd.dts
	--- a/sys/gnu/dts/arm/omap3-ha-lcd.dts
	+++ b/sys/gnu/dts/arm/omap3-ha-lcd.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TI OMAP3 HEAD acoustics LCD-baseboard with TAO3530 SOM";
	- compatible = "headacoustics,omap3-ha-lcd", "technexion,omap3-tao3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
	+ compatible = "headacoustics,omap3-ha-lcd", "technexion,omap3-tao3530", "ti,omap34xx", "ti,omap3";
	};

	&omap3_pmx_core {
	diff --git a/sys/gnu/dts/arm/omap3-ha.dts b/sys/gnu/dts/arm/omap3-ha.dts
	--- a/sys/gnu/dts/arm/omap3-ha.dts
	+++ b/sys/gnu/dts/arm/omap3-ha.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TI OMAP3 HEAD acoustics baseboard with TAO3530 SOM";
	- compatible = "headacoustics,omap3-ha", "technexion,omap3-tao3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
	+ compatible = "headacoustics,omap3-ha", "technexion,omap3-tao3530", "ti,omap34xx", "ti,omap3";
	};

	&omap3_pmx_core {
	diff --git a/sys/gnu/dts/arm/omap3-igep0020-rev-f.dts b/sys/gnu/dts/arm/omap3-igep0020-rev-f.dts
	--- a/sys/gnu/dts/arm/omap3-igep0020-rev-f.dts
	+++ b/sys/gnu/dts/arm/omap3-igep0020-rev-f.dts
	@@ -10,7 +10,7 @@

	/ {
	model = "IGEPv2 Rev. F (TI OMAP AM/DM37x)";
	- compatible = "isee,omap3-igep0020-rev-f", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "isee,omap3-igep0020-rev-f", "ti,omap36xx", "ti,omap3";

	/* Regulator to trigger the WL_EN signal of the Wifi module */
	lbep5clwmc_wlen: regulator-lbep5clwmc-wlen {
	@@ -49,11 +49,3 @@
	interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* gpio 177 */
	};
	};
	-
	-&uart2 {
	- bluetooth {
	- compatible = "ti,wl1835-st";
	- enable-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; /* gpio 137 */
	- max-speed = <300000>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/omap3-igep0020.dts b/sys/gnu/dts/arm/omap3-igep0020.dts
	--- a/sys/gnu/dts/arm/omap3-igep0020.dts
	+++ b/sys/gnu/dts/arm/omap3-igep0020.dts
	@@ -10,7 +10,7 @@

	/ {
	model = "IGEPv2 Rev. C (TI OMAP AM/DM37x)";
	- compatible = "isee,omap3-igep0020", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";

	vmmcsdio_fixed: fixedregulator-mmcsdio {
	compatible = "regulator-fixed";
	diff --git a/sys/gnu/dts/arm/omap3-igep0030-rev-g.dts b/sys/gnu/dts/arm/omap3-igep0030-rev-g.dts
	--- a/sys/gnu/dts/arm/omap3-igep0030-rev-g.dts
	+++ b/sys/gnu/dts/arm/omap3-igep0030-rev-g.dts
	@@ -10,7 +10,7 @@

	/ {
	model = "IGEP COM MODULE Rev. G (TI OMAP AM/DM37x)";
	- compatible = "isee,omap3-igep0030-rev-g", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "isee,omap3-igep0030-rev-g", "ti,omap36xx", "ti,omap3";

	/* Regulator to trigger the WL_EN signal of the Wifi module */
	lbep5clwmc_wlen: regulator-lbep5clwmc-wlen {
	@@ -71,11 +71,3 @@
	interrupts = <8 IRQ_TYPE_EDGE_RISING>; /* gpio 136 */
	};
	};
	-
	-&uart2 {
	- bluetooth {
	- compatible = "ti,wl1835-st";
	- enable-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; /* gpio 137 */
	- max-speed = <300000>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/omap3-igep0030.dts b/sys/gnu/dts/arm/omap3-igep0030.dts
	--- a/sys/gnu/dts/arm/omap3-igep0030.dts
	+++ b/sys/gnu/dts/arm/omap3-igep0030.dts
	@@ -10,7 +10,7 @@

	/ {
	model = "IGEP COM MODULE Rev. E (TI OMAP AM/DM37x)";
	- compatible = "isee,omap3-igep0030", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";

	vmmcsdio_fixed: fixedregulator-mmcsdio {
	compatible = "regulator-fixed";
	diff --git a/sys/gnu/dts/arm/omap3-ldp.dts b/sys/gnu/dts/arm/omap3-ldp.dts
	--- a/sys/gnu/dts/arm/omap3-ldp.dts
	+++ b/sys/gnu/dts/arm/omap3-ldp.dts
	@@ -10,7 +10,7 @@

	/ {
	model = "TI OMAP3430 LDP (Zoom1 Labrador)";
	- compatible = "ti,omap3-ldp", "ti,omap3430", "ti,omap3";
	+ compatible = "ti,omap3-ldp", "ti,omap3";

	memory@80000000 {
	device_type = "memory";
	diff --git a/sys/gnu/dts/arm/omap3-lilly-a83x.dtsi b/sys/gnu/dts/arm/omap3-lilly-a83x.dtsi
	--- a/sys/gnu/dts/arm/omap3-lilly-a83x.dtsi
	+++ b/sys/gnu/dts/arm/omap3-lilly-a83x.dtsi
	@@ -7,7 +7,7 @@

	/ {
	model = "INCOstartec LILLY-A83X module (DM3730)";
	- compatible = "incostartec,omap3-lilly-a83x", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "incostartec,omap3-lilly-a83x", "ti,omap36xx", "ti,omap3";

	chosen {
	bootargs = "console=ttyO0,115200n8 vt.global_cursor_default=0 consoleblank=0";
	diff --git a/sys/gnu/dts/arm/omap3-lilly-dbb056.dts b/sys/gnu/dts/arm/omap3-lilly-dbb056.dts
	--- a/sys/gnu/dts/arm/omap3-lilly-dbb056.dts
	+++ b/sys/gnu/dts/arm/omap3-lilly-dbb056.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "INCOstartec LILLY-DBB056 (DM3730)";
	- compatible = "incostartec,omap3-lilly-dbb056", "incostartec,omap3-lilly-a83x", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "incostartec,omap3-lilly-dbb056", "incostartec,omap3-lilly-a83x", "ti,omap36xx", "ti,omap3";
	};

	&twl {
	diff --git a/sys/gnu/dts/arm/omap3-n9.dts b/sys/gnu/dts/arm/omap3-n9.dts
	--- a/sys/gnu/dts/arm/omap3-n9.dts
	+++ b/sys/gnu/dts/arm/omap3-n9.dts
	@@ -12,7 +12,7 @@

	/ {
	model = "Nokia N9";
	- compatible = "nokia,omap3-n9", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
	};

	&i2c2 {
	diff --git a/sys/gnu/dts/arm/omap3-n900.dts b/sys/gnu/dts/arm/omap3-n900.dts
	--- a/sys/gnu/dts/arm/omap3-n900.dts
	+++ b/sys/gnu/dts/arm/omap3-n900.dts
	@@ -155,12 +155,6 @@
	pwms = <&pwm9 0 26316 0>; /* 38000 Hz */
	};

	- rom_rng: rng {
	- compatible = "nokia,n900-rom-rng";
	- clocks = <&rng_ick>;
	- clock-names = "ick";
	- };
	-
	/* controlled (enabled/disabled) directly by bcm2048 and wl1251 */
	vctcxo: vctcxo {
	compatible = "fixed-clock";
	@@ -482,11 +476,6 @@
	regulator-always-on;
	};

	-/* First two dma channels are reserved on secure omap3 */
	-&sdma {
	- dma-channel-mask = <0xfffffffc>;
	-};
	-
	&twl {
	twl_audio: audio {
	compatible = "ti,twl4030-audio";
	@@ -854,46 +843,34 @@
	compatible = "ti,omap2-onenand";
	reg = <0 0 0x20000>; /* CS0, offset 0, IO size 128K */

	- /*
	- * These timings are based on CONFIG_OMAP_GPMC_DEBUG=y reported
	- * bootloader set values when booted with v5.1
	- * (OneNAND Manufacturer: Samsung):
	- *
	- * cs0 GPMC_CS_CONFIG1: 0xfb001202
	- * cs0 GPMC_CS_CONFIG2: 0x00111100
	- * cs0 GPMC_CS_CONFIG3: 0x00020200
	- * cs0 GPMC_CS_CONFIG4: 0x11001102
	- * cs0 GPMC_CS_CONFIG5: 0x03101616
	- * cs0 GPMC_CS_CONFIG6: 0x90060000
	- */
	gpmc,sync-read;
	gpmc,sync-write;
	gpmc,burst-length = <16>;
	gpmc,burst-read;
	gpmc,burst-wrap;
	gpmc,burst-write;
	- gpmc,device-width = <2>;
	- gpmc,mux-add-data = <2>;
	+ gpmc,device-width = <2>; /* GPMC_DEVWIDTH_16BIT */
	+ gpmc,mux-add-data = <2>; /* GPMC_MUX_AD */
	gpmc,cs-on-ns = <0>;
	- gpmc,cs-rd-off-ns = <102>;
	- gpmc,cs-wr-off-ns = <102>;
	+ gpmc,cs-rd-off-ns = <87>;
	+ gpmc,cs-wr-off-ns = <87>;
	gpmc,adv-on-ns = <0>;
	- gpmc,adv-rd-off-ns = <12>;
	- gpmc,adv-wr-off-ns = <12>;
	- gpmc,oe-on-ns = <12>;
	- gpmc,oe-off-ns = <102>;
	+ gpmc,adv-rd-off-ns = <10>;
	+ gpmc,adv-wr-off-ns = <10>;
	+ gpmc,oe-on-ns = <15>;
	+ gpmc,oe-off-ns = <87>;
	gpmc,we-on-ns = <0>;
	- gpmc,we-off-ns = <102>;
	- gpmc,rd-cycle-ns = <132>;
	- gpmc,wr-cycle-ns = <132>;
	- gpmc,access-ns = <96>;
	- gpmc,page-burst-access-ns = <18>;
	+ gpmc,we-off-ns = <87>;
	+ gpmc,rd-cycle-ns = <112>;
	+ gpmc,wr-cycle-ns = <112>;
	+ gpmc,access-ns = <81>;
	+ gpmc,page-burst-access-ns = <15>;
	gpmc,bus-turnaround-ns = <0>;
	gpmc,cycle2cycle-delay-ns = <0>;
	gpmc,wait-monitoring-ns = <0>;
	- gpmc,clk-activation-ns = <6>;
	- gpmc,wr-data-mux-bus-ns = <36>;
	- gpmc,wr-access-ns = <96>;
	+ gpmc,clk-activation-ns = <5>;
	+ gpmc,wr-data-mux-bus-ns = <30>;
	+ gpmc,wr-access-ns = <81>;
	gpmc,sync-clk-ps = <15000>;

	/*
	@@ -1036,11 +1013,6 @@
	};
	};

	-/* RNG not directly accessible on n900, see omap3-rom-rng instead */
	-&rng_target {
	- status = "disabled";
	-};
	-
	&usb_otg_hs {
	interface-type = <0>;
	usb-phy = <&usb2_phy>;
	diff --git a/sys/gnu/dts/arm/omap3-n950-n9.dtsi b/sys/gnu/dts/arm/omap3-n950-n9.dtsi
	--- a/sys/gnu/dts/arm/omap3-n950-n9.dtsi
	+++ b/sys/gnu/dts/arm/omap3-n950-n9.dtsi
	@@ -11,6 +11,13 @@
	cpus {
	cpu@0 {
	cpu0-supply = <&vcc>;
	+ operating-points = <
	+ /* kHz uV */
	+ 300000 1012500
	+ 600000 1200000
	+ 800000 1325000
	+ 1000000 1375000
	+ >;
	};
	};

	diff --git a/sys/gnu/dts/arm/omap3-n950.dts b/sys/gnu/dts/arm/omap3-n950.dts
	--- a/sys/gnu/dts/arm/omap3-n950.dts
	+++ b/sys/gnu/dts/arm/omap3-n950.dts
	@@ -12,7 +12,7 @@

	/ {
	model = "Nokia N950";
	- compatible = "nokia,omap3-n950", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";

	keys {
	compatible = "gpio-keys";
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-alto35.dts b/sys/gnu/dts/arm/omap3-overo-storm-alto35.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-alto35.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-alto35.dts
	@@ -14,5 +14,5 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Alto35";
	- compatible = "gumstix,omap3-overo-alto35", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-alto35", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-chestnut43.dts b/sys/gnu/dts/arm/omap3-overo-storm-chestnut43.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-chestnut43.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-chestnut43.dts
	@@ -14,7 +14,7 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Chestnut43";
	- compatible = "gumstix,omap3-overo-chestnut43", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-chestnut43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};

	&omap3_pmx_core2 {
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-gallop43.dts b/sys/gnu/dts/arm/omap3-overo-storm-gallop43.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-gallop43.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-gallop43.dts
	@@ -14,7 +14,7 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Gallop43";
	- compatible = "gumstix,omap3-overo-gallop43", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-gallop43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};

	&omap3_pmx_core2 {
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-palo35.dts b/sys/gnu/dts/arm/omap3-overo-storm-palo35.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-palo35.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-palo35.dts
	@@ -14,7 +14,7 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Palo35";
	- compatible = "gumstix,omap3-overo-palo35", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-palo35", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};

	&omap3_pmx_core2 {
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-palo43.dts b/sys/gnu/dts/arm/omap3-overo-storm-palo43.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-palo43.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-palo43.dts
	@@ -14,7 +14,7 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Palo43";
	- compatible = "gumstix,omap3-overo-palo43", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-palo43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};

	&omap3_pmx_core2 {
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-summit.dts b/sys/gnu/dts/arm/omap3-overo-storm-summit.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-summit.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-summit.dts
	@@ -14,7 +14,7 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Summit";
	- compatible = "gumstix,omap3-overo-summit", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-summit", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};

	&omap3_pmx_core2 {
	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-tobi.dts b/sys/gnu/dts/arm/omap3-overo-storm-tobi.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-tobi.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-tobi.dts
	@@ -14,6 +14,6 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi";
	- compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};

	diff --git a/sys/gnu/dts/arm/omap3-overo-storm-tobiduo.dts b/sys/gnu/dts/arm/omap3-overo-storm-tobiduo.dts
	--- a/sys/gnu/dts/arm/omap3-overo-storm-tobiduo.dts
	+++ b/sys/gnu/dts/arm/omap3-overo-storm-tobiduo.dts
	@@ -14,5 +14,5 @@

	/ {
	model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on TobiDuo";
	- compatible = "gumstix,omap3-overo-tobiduo", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "gumstix,omap3-overo-tobiduo", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
	};
	diff --git a/sys/gnu/dts/arm/omap3-pandora-1ghz.dts b/sys/gnu/dts/arm/omap3-pandora-1ghz.dts
	--- a/sys/gnu/dts/arm/omap3-pandora-1ghz.dts
	+++ b/sys/gnu/dts/arm/omap3-pandora-1ghz.dts
	@@ -16,7 +16,7 @@
	/ {
	model = "Pandora Handheld Console 1GHz";

	- compatible = "openpandora,omap3-pandora-1ghz", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "openpandora,omap3-pandora-1ghz", "ti,omap36xx", "ti,omap3";
	};

	&omap3_pmx_core2 {
	diff --git a/sys/gnu/dts/arm/omap3-pandora-common.dtsi b/sys/gnu/dts/arm/omap3-pandora-common.dtsi
	--- a/sys/gnu/dts/arm/omap3-pandora-common.dtsi
	+++ b/sys/gnu/dts/arm/omap3-pandora-common.dtsi
	@@ -226,17 +226,6 @@
	gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* GPIO_164 */
	};

	- /* wl1251 wifi+bt module */
	- wlan_en: fixed-regulator-wg7210_en {
	- compatible = "regulator-fixed";
	- regulator-name = "vwlan";
	- regulator-min-microvolt = <1800000>;
	- regulator-max-microvolt = <1800000>;
	- startup-delay-us = <50000>;
	- enable-active-high;
	- gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;
	- };
	-
	/* wg7210 (wifi+bt module) 32k clock buffer */
	wg7210_32k: fixed-regulator-wg7210_32k {
	compatible = "regulator-fixed";
	@@ -533,30 +522,9 @@
	/wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;/ /* GPIO_127 */
	};

	+/* mmc3 is probed using pdata-quirks to pass wl1251 card data */
	&mmc3 {
	- vmmc-supply = <&wlan_en>;
	-
	- bus-width = <4>;
	- non-removable;
	- ti,non-removable;
	- cap-power-off-card;
	-
	- pinctrl-names = "default";
	- pinctrl-0 = <&mmc3_pins>;
	-
	- #address-cells = <1>;
	- #size-cells = <0>;
	-
	- wlan: wifi@1 {
	- compatible = "ti,wl1251";
	-
	- reg = <1>;
	-
	- interrupt-parent = <&gpio1>;
	- interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_21 */
	-
	- ti,wl1251-has-eeprom;
	- };
	+ status = "disabled";
	};

	/* bluetooth*/
	diff --git a/sys/gnu/dts/arm/omap3-sbc-t3530.dts b/sys/gnu/dts/arm/omap3-sbc-t3530.dts
	--- a/sys/gnu/dts/arm/omap3-sbc-t3530.dts
	+++ b/sys/gnu/dts/arm/omap3-sbc-t3530.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "CompuLab SBC-T3530 with CM-T3530";
	- compatible = "compulab,omap3-sbc-t3530", "compulab,omap3-cm-t3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
	+ compatible = "compulab,omap3-sbc-t3530", "compulab,omap3-cm-t3530", "ti,omap34xx", "ti,omap3";

	aliases {
	display0 = &dvi0;
	diff --git a/sys/gnu/dts/arm/omap3-sbc-t3730.dts b/sys/gnu/dts/arm/omap3-sbc-t3730.dts
	--- a/sys/gnu/dts/arm/omap3-sbc-t3730.dts
	+++ b/sys/gnu/dts/arm/omap3-sbc-t3730.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "CompuLab SBC-T3730 with CM-T3730";
	- compatible = "compulab,omap3-sbc-t3730", "compulab,omap3-cm-t3730", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "compulab,omap3-sbc-t3730", "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";

	aliases {
	display0 = &dvi0;
	diff --git a/sys/gnu/dts/arm/omap3-sniper.dts b/sys/gnu/dts/arm/omap3-sniper.dts
	--- a/sys/gnu/dts/arm/omap3-sniper.dts
	+++ b/sys/gnu/dts/arm/omap3-sniper.dts
	@@ -9,7 +9,7 @@

	/ {
	model = "LG Optimus Black";
	- compatible = "lg,omap3-sniper", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "lg,omap3-sniper", "ti,omap36xx", "ti,omap3";

	cpus {
	cpu@0 {
	diff --git a/sys/gnu/dts/arm/omap3-tao3530.dtsi b/sys/gnu/dts/arm/omap3-tao3530.dtsi
	--- a/sys/gnu/dts/arm/omap3-tao3530.dtsi
	+++ b/sys/gnu/dts/arm/omap3-tao3530.dtsi
	@@ -222,7 +222,7 @@
	pinctrl-0 = <&mmc1_pins>;
	vmmc-supply = <&vmmc1>;
	vqmmc-supply = <&vsim>;
	- cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;
	+ cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
	bus-width = <8>;
	};

	diff --git a/sys/gnu/dts/arm/omap3-thunder.dts b/sys/gnu/dts/arm/omap3-thunder.dts
	--- a/sys/gnu/dts/arm/omap3-thunder.dts
	+++ b/sys/gnu/dts/arm/omap3-thunder.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TI OMAP3 Thunder baseboard with TAO3530 SOM";
	- compatible = "technexion,omap3-thunder", "technexion,omap3-tao3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
	+ compatible = "technexion,omap3-thunder", "technexion,omap3-tao3530", "ti,omap34xx", "ti,omap3";
	};

	&omap3_pmx_core {
	diff --git a/sys/gnu/dts/arm/omap3-zoom3.dts b/sys/gnu/dts/arm/omap3-zoom3.dts
	--- a/sys/gnu/dts/arm/omap3-zoom3.dts
	+++ b/sys/gnu/dts/arm/omap3-zoom3.dts
	@@ -9,7 +9,7 @@

	/ {
	model = "TI Zoom3";
	- compatible = "ti,omap3-zoom3", "ti,omap3630", "ti,omap36xx", "ti,omap3";
	+ compatible = "ti,omap3-zoom3", "ti,omap36xx", "ti,omap3";

	cpus {
	cpu@0 {
	diff --git a/sys/gnu/dts/arm/omap3.dtsi b/sys/gnu/dts/arm/omap3.dtsi
	--- a/sys/gnu/dts/arm/omap3.dtsi
	+++ b/sys/gnu/dts/arm/omap3.dtsi
	@@ -8,7 +8,6 @@
	* kind, whether express or implied.
	*/

	-#include <dt-bindings/bus/ti-sysc.h>
	#include <dt-bindings/gpio/gpio.h>
	#include <dt-bindings/interrupt-controller/irq.h>
	#include <dt-bindings/pinctrl/omap.h>
	@@ -206,41 +205,17 @@
	reg = <0x48200000 0x1000>;
	};

	- target-module@48056000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x48056000 0x4>,
	- <0x4805602c 0x4>,
	- <0x48056028 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_EMUFREE \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-midle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,syss-mask = <1>;
	- /* Domains (V, P, C): core, core_pwrdm, core_l3_clkdm */
	- clocks = <&core_l3_ick>;
	- clock-names = "ick";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x48056000 0x1000>;
	-
	- sdma: dma-controller@0 {
	- compatible = "ti,omap3430-sdma", "ti,omap-sdma";
	- reg = <0x0 0x1000>;
	- interrupts = <12>,
	- <13>,
	- <14>,
	- <15>;
	- #dma-cells = <1>;
	- dma-channels = <32>;
	- dma-requests = <96>;
	- };
	+ sdma: dma-controller@48056000 {
	+ compatible = "ti,omap3630-sdma", "ti,omap3430-sdma";
	+ reg = <0x48056000 0x1000>;
	+ interrupts = <12>,
	+ <13>,
	+ <14>,
	+ <15>;
	+ #dma-cells = <1>;
	+ dma-channels = <32>;
	+ dma-requests = <96>;
	+ ti,hwmods = "dma";
	};

	gpio1: gpio@48310000 {
	@@ -527,30 +502,6 @@
	status = "disabled";
	};

	- /* Likely needs to be tagged disabled on HS devices */
	- rng_target: target-module@480a0000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x480a003c 0x4>,
	- <0x480a0040 0x4>,
	- <0x480a0044 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- ti,syss-mask = <1>;
	- clocks = <&rng_ick>;
	- clock-names = "ick";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0x480a0000 0x2000>;
	-
	- rng: rng@0 {
	- compatible = "ti,omap2-rng";
	- reg = <0x0 0x2000>;
	- interrupts = <52>;
	- };
	- };
	-
	mcbsp2: mcbsp@49022000 {
	compatible = "ti,omap3-mcbsp";
	reg = <0x49022000 0xff>,
	diff --git a/sys/gnu/dts/arm/omap3430-sdp.dts b/sys/gnu/dts/arm/omap3430-sdp.dts
	--- a/sys/gnu/dts/arm/omap3430-sdp.dts
	+++ b/sys/gnu/dts/arm/omap3430-sdp.dts
	@@ -8,7 +8,7 @@

	/ {
	model = "TI OMAP3430 SDP";
	- compatible = "ti,omap3430-sdp", "ti,omap3430", "ti,omap3";
	+ compatible = "ti,omap3430-sdp", "ti,omap3";

	memory@80000000 {
	device_type = "memory";
	diff --git a/sys/gnu/dts/arm/omap34xx-omap36xx-clocks.dtsi b/sys/gnu/dts/arm/omap34xx-omap36xx-clocks.dtsi
	--- a/sys/gnu/dts/arm/omap34xx-omap36xx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/omap34xx-omap36xx-clocks.dtsi
	@@ -260,6 +260,6 @@
	<&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>,
	<&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, <&icr_ick>,
	<&des2_ick>, <&mspro_ick>, <&mailboxes_ick>,
	- <&rng_ick>, <&mspro_fck>;
	+ <&mspro_fck>;
	};
	};
	diff --git a/sys/gnu/dts/arm/omap34xx.dtsi b/sys/gnu/dts/arm/omap34xx.dtsi
	--- a/sys/gnu/dts/arm/omap34xx.dtsi
	+++ b/sys/gnu/dts/arm/omap34xx.dtsi
	@@ -16,67 +16,19 @@
	/ {
	cpus {
	cpu: cpu@0 {
	- /* OMAP343x/OMAP35xx variants OPP1-6 */
	- operating-points-v2 = <&cpu0_opp_table>;
	-
	+ /* OMAP343x/OMAP35xx variants OPP1-5 */
	+ operating-points = <
	+ /* kHz uV */
	+ 125000 975000
	+ 250000 1075000
	+ 500000 1200000
	+ 550000 1270000
	+ 600000 1350000
	+ >;
	clock-latency = <300000>; /* From legacy driver */
	};
	};

	- /* see Documentation/devicetree/bindings/opp/opp.txt */
	- cpu0_opp_table: opp-table {
	- compatible = "operating-points-v2-ti-cpu";
	- syscon = <&scm_conf>;
	-
	- opp1-125000000 {
	- opp-hz = /bits/ 64 <125000000>;
	- /*
	- * we currently only select the max voltage from table
	- * Table 3-3 of the omap3530 Data sheet (SPRS507F).
	- * Format is: <target min max>
	- */
	- opp-microvolt = <975000 975000 975000>;
	- /*
	- * first value is silicon revision bit mask
	- * second one 720MHz Device Identification bit mask
	- */
	- opp-supported-hw = <0xffffffff 3>;
	- };
	-
	- opp2-250000000 {
	- opp-hz = /bits/ 64 <250000000>;
	- opp-microvolt = <1075000 1075000 1075000>;
	- opp-supported-hw = <0xffffffff 3>;
	- opp-suspend;
	- };
	-
	- opp3-500000000 {
	- opp-hz = /bits/ 64 <500000000>;
	- opp-microvolt = <1200000 1200000 1200000>;
	- opp-supported-hw = <0xffffffff 3>;
	- };
	-
	- opp4-550000000 {
	- opp-hz = /bits/ 64 <550000000>;
	- opp-microvolt = <1275000 1275000 1275000>;
	- opp-supported-hw = <0xffffffff 3>;
	- };
	-
	- opp5-600000000 {
	- opp-hz = /bits/ 64 <600000000>;
	- opp-microvolt = <1350000 1350000 1350000>;
	- opp-supported-hw = <0xffffffff 3>;
	- };
	-
	- opp6-720000000 {
	- opp-hz = /bits/ 64 <720000000>;
	- opp-microvolt = <1350000 1350000 1350000>;
	- /* only high-speed grade omap3530 devices */
	- opp-supported-hw = <0xffffffff 2>;
	- turbo-mode;
	- };
	- };
	-
	ocp@68000000 {
	omap3_pmx_core2: pinmux@480025d8 {
	compatible = "ti,omap3-padconf", "pinctrl-single";
	diff --git a/sys/gnu/dts/arm/omap36xx-clocks.dtsi b/sys/gnu/dts/arm/omap36xx-clocks.dtsi
	--- a/sys/gnu/dts/arm/omap36xx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/omap36xx-clocks.dtsi
	@@ -105,7 +105,3 @@
	<&mcbsp4_ick>, <&uart4_fck>;
	};
	};
	-
	-&dpll4_m4_ck {
	- ti,max-div = <31>;
	-};
	diff --git a/sys/gnu/dts/arm/omap36xx.dtsi b/sys/gnu/dts/arm/omap36xx.dtsi
	--- a/sys/gnu/dts/arm/omap36xx.dtsi
	+++ b/sys/gnu/dts/arm/omap36xx.dtsi
	@@ -19,67 +19,18 @@
	};

	cpus {
	- /* OMAP3630/OMAP37xx variants OPP50 to OPP130 and OPP1G */
	+ /* OMAP3630/OMAP37xx 'standard device' variants OPP50 to OPP130 */
	cpu: cpu@0 {
	- operating-points-v2 = <&cpu0_opp_table>;
	-
	- vbb-supply = <&abb_mpu_iva>;
	- clock-latency = <300000>; /* From omap-cpufreq driver */
	- };
	- };
	-
	- /* see Documentation/devicetree/bindings/opp/opp.txt */
	- cpu0_opp_table: opp-table {
	- compatible = "operating-points-v2-ti-cpu";
	- syscon = <&scm_conf>;
	-
	- opp50-300000000 {
	- opp-hz = /bits/ 64 <300000000>;
	- /*
	- * we currently only select the max voltage from table
	- * Table 4-19 of the DM3730 Data sheet (SPRS685B)
	- * Format is: cpu0-supply: <target min max>
	- * vbb-supply: <target min max>
	- */
	- opp-microvolt = <1012500 1012500 1012500>,
	- <1012500 1012500 1012500>;
	- /*
	- * first value is silicon revision bit mask
	- * second one is "speed binned" bit mask
	- */
	- opp-supported-hw = <0xffffffff 3>;
	- opp-suspend;
	- };
	-
	- opp100-600000000 {
	- opp-hz = /bits/ 64 <600000000>;
	- opp-microvolt = <1200000 1200000 1200000>,
	- <1200000 1200000 1200000>;
	- opp-supported-hw = <0xffffffff 3>;
	- };
	-
	- opp130-800000000 {
	- opp-hz = /bits/ 64 <800000000>;
	- opp-microvolt = <1325000 1325000 1325000>,
	- <1325000 1325000 1325000>;
	- opp-supported-hw = <0xffffffff 3>;
	- };
	-
	- opp1g-1000000000 {
	- opp-hz = /bits/ 64 <1000000000>;
	- opp-microvolt = <1375000 1375000 1375000>,
	- <1375000 1375000 1375000>;
	- /* only on am/dm37x with speed-binned bit set */
	- opp-supported-hw = <0xffffffff 2>;
	- turbo-mode;
	+ operating-points = <
	+ /* kHz uV */
	+ 300000 1012500
	+ 600000 1200000
	+ 800000 1325000
	+ >;
	+ clock-latency = <300000>; /* From legacy driver */
	};
	};

	- opp_supply_mpu_iva: opp_supply {
	- compatible = "ti,omap-opp-supply";
	- ti,absolute-max-voltage-uv = <1375000>;
	- };
	-
	ocp@68000000 {
	uart4: serial@49042000 {
	compatible = "ti,omap3-uart";
	@@ -223,10 +174,6 @@
	};
	};

	-&sdma {
	- compatible = "ti,omap3630-sdma", "ti,omap-sdma";
	-};
	-
	/* OMAP3630 needs dss_96m_fck for VENC */
	&venc {
	clocks = <&dss_tv_fck>, <&dss_96m_fck>;
	diff --git a/sys/gnu/dts/arm/omap3xxx-clocks.dtsi b/sys/gnu/dts/arm/omap3xxx-clocks.dtsi
	--- a/sys/gnu/dts/arm/omap3xxx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/omap3xxx-clocks.dtsi
	@@ -416,7 +416,7 @@
	#clock-cells = <0>;
	compatible = "ti,divider-clock";
	clocks = <&dpll4_ck>;
	- ti,max-div = <16>;
	+ ti,max-div = <32>;
	reg = <0x0e40>;
	ti,index-starts-at-one;
	};
	diff --git a/sys/gnu/dts/arm/omap4-droid-bionic-xt875.dts b/sys/gnu/dts/arm/omap4-droid-bionic-xt875.dts
	--- a/sys/gnu/dts/arm/omap4-droid-bionic-xt875.dts
	+++ b/sys/gnu/dts/arm/omap4-droid-bionic-xt875.dts
	@@ -1,9 +0,0 @@
	-// SPDX-License-Identifier: GPL-2.0-only
	-/dts-v1/;
	-
	-#include "motorola-mapphone-common.dtsi"
	-
	-/ {
	- model = "Motorola Droid Bionic XT875";
	- compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4";
	-};
	diff --git a/sys/gnu/dts/arm/omap4-droid4-xt894.dts b/sys/gnu/dts/arm/omap4-droid4-xt894.dts
	--- a/sys/gnu/dts/arm/omap4-droid4-xt894.dts
	+++ b/sys/gnu/dts/arm/omap4-droid4-xt894.dts
	@@ -1,9 +1,784 @@
	// SPDX-License-Identifier: GPL-2.0-only
	/dts-v1/;

	-#include "motorola-mapphone-common.dtsi"
	+#include <dt-bindings/input/input.h>
	+#include "omap443x.dtsi"
	+#include "motorola-cpcap-mapphone.dtsi"

	/ {
	model = "Motorola Droid 4 XT894";
	compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";
	+
	+ chosen {
	+ stdout-path = &uart3;
	+ };
	+
	+ aliases {
	+ display0 = &lcd0;
	+ display1 = &hdmi0;
	+ };
	+
	+ /*
	+ * We seem to have only 1021 MB accessible, 1021 - 1022 is locked,
	+ * then 1023 - 1024 seems to contain mbm.
	+ */
	+ memory {
	+ device_type = "memory";
	+ reg = <0x80000000 0x3fd00000>; /* 1021 MB */
	+ };
	+
	+ /* Poweroff GPIO probably connected to CPCAP */
	+ gpio-poweroff {
	+ compatible = "gpio-poweroff";
	+ pinctrl-0 = <&poweroff_gpio>;
	+ pinctrl-names = "default";
	+ gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; /* gpio50 */
	+ };
	+
	+ hdmi0: connector {
	+ compatible = "hdmi-connector";
	+ pinctrl-0 = <&hdmi_hpd_gpio>;
	+ pinctrl-names = "default";
	+ label = "hdmi";
	+ type = "d";
	+
	+ hpd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>; /* gpio63 */
	+
	+ port {
	+ hdmi_connector_in: endpoint {
	+ remote-endpoint = <&hdmi_out>;
	+ };
	+ };
	+ };
	+
	+ /*
	+ * HDMI 5V regulator probably sourced from battery. Let's keep
	+ * keep this as always enabled for HDMI to work until we've
	+ * figured what the encoder chip is.
	+ */
	+ hdmi_regulator: regulator-hdmi {
	+ compatible = "regulator-fixed";
	+ regulator-name = "hdmi";
	+ regulator-min-microvolt = <5000000>;
	+ regulator-max-microvolt = <5000000>;
	+ gpio = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* gpio59 */
	+ enable-active-high;
	+ regulator-always-on;
	+ };
	+
	+ /* FS USB Host PHY on port 1 for mdm6600 */
	+ fsusb1_phy: usb-phy@1 {
	+ compatible = "motorola,mapphone-mdm6600";
	+ pinctrl-0 = <&usb_mdm6600_pins>;
	+ pinctrl-names = "default";
	+ enable-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; /* gpio_95 */
	+ power-gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* gpio_54 */
	+ reset-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>; /* gpio_49 */
	+ /* mode: gpio_148 gpio_149 */
	+ motorola,mode-gpios = <&gpio5 20 GPIO_ACTIVE_HIGH>,
	+ <&gpio5 21 GPIO_ACTIVE_HIGH>;
	+ /* cmd: gpio_103 gpio_104 gpio_142 */
	+ motorola,cmd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>,
	+ <&gpio4 8 GPIO_ACTIVE_HIGH>,
	+ <&gpio5 14 GPIO_ACTIVE_HIGH>;
	+ /* status: gpio_52 gpio_53 gpio_55 */
	+ motorola,status-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>,
	+ <&gpio2 21 GPIO_ACTIVE_HIGH>,
	+ <&gpio2 23 GPIO_ACTIVE_HIGH>;
	+ #phy-cells = <0>;
	+ };
	+
	+ /* HS USB host TLL nop-phy on port 2 for w3glte */
	+ hsusb2_phy: usb-phy@2 {
	+ compatible = "usb-nop-xceiv";
	+ #phy-cells = <0>;
	+ };
	+
	+ /* LCD regulator from sw5 source */
	+ lcd_regulator: regulator-lcd {
	+ compatible = "regulator-fixed";
	+ regulator-name = "lcd";
	+ regulator-min-microvolt = <5050000>;
	+ regulator-max-microvolt = <5050000>;
	+ gpio = <&gpio4 0 GPIO_ACTIVE_HIGH>; /* gpio96 */
	+ enable-active-high;
	+ vin-supply = <&sw5>;
	+ };
	+
	+ /* This is probably coming straight from the battery.. */
	+ wl12xx_vmmc: regulator-wl12xx {
	+ compatible = "regulator-fixed";
	+ regulator-name = "vwl1271";
	+ regulator-min-microvolt = <1650000>;
	+ regulator-max-microvolt = <1650000>;
	+ gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; /* gpio94 */
	+ startup-delay-us = <70000>;
	+ enable-active-high;
	+ };
	+
	+ gpio_keys {
	+ compatible = "gpio-keys";
	+
	+ volume_down {
	+ label = "Volume Down";
	+ gpios = <&gpio5 26 GPIO_ACTIVE_LOW>; /* gpio154 */
	+ linux,code = <KEY_VOLUMEDOWN>;
	+ linux,can-disable;
	+ /* Value above 7.95ms for no GPIO hardware debounce */
	+ debounce-interval = <10>;
	+ };
	+
	+ slider {
	+ label = "Keypad Slide";
	+ gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */
	+ linux,input-type = <EV_SW>;
	+ linux,code = <SW_KEYPAD_SLIDE>;
	+ linux,can-disable;
	+ /* Value above 7.95ms for no GPIO hardware debounce */
	+ debounce-interval = <10>;
	+ };
	+ };
	+
	+ soundcard {
	+ compatible = "audio-graph-card";
	+ label = "Droid 4 Audio";
	+
	+ simple-graph-card,widgets =
	+ "Speaker", "Earpiece",
	+ "Speaker", "Loudspeaker",
	+ "Headphone", "Headphone Jack",
	+ "Microphone", "Internal Mic";
	+
	+ simple-graph-card,routing =
	+ "Earpiece", "EP",
	+ "Loudspeaker", "SPKR",
	+ "Headphone Jack", "HSL",
	+ "Headphone Jack", "HSR",
	+ "MICR", "Internal Mic";
	+
	+ dais = <&mcbsp2_port>, <&mcbsp3_port>;
	+ };
	+
	+ pwm8: dmtimer-pwm-8 {
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&vibrator_direction_pin>;
	+
	+ compatible = "ti,omap-dmtimer-pwm";
	+ #pwm-cells = <3>;
	+ ti,timers = <&timer8>;
	+ ti,clock-source = <0x01>;
	+ };
	+
	+ pwm9: dmtimer-pwm-9 {
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&vibrator_enable_pin>;
	+
	+ compatible = "ti,omap-dmtimer-pwm";
	+ #pwm-cells = <3>;
	+ ti,timers = <&timer9>;
	+ ti,clock-source = <0x01>;
	+ };
	+
	+ vibrator {
	+ compatible = "pwm-vibrator";
	+ pwms = <&pwm9 0 10000000 0>, <&pwm8 0 10000000 0>;
	+ pwm-names = "enable", "direction";
	+ direction-duty-cycle-ns = <10000000>;
	+ };
	+};
	+
	+&dss {
	+ status = "okay";
	+};
	+
	+&dsi1 {
	+ status = "okay";
	+ vdd-supply = <&vcsi>;
	+
	+ port {
	+ dsi1_out_ep: endpoint {
	+ remote-endpoint = <&lcd0_in>;
	+ lanes = <0 1 2 3 4 5>;
	+ };
	+ };
	+
	+ lcd0: display {
	+ compatible = "panel-dsi-cm";
	+ label = "lcd0";
	+ vddi-supply = <&lcd_regulator>;
	+ reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
	+
	+ width-mm = <50>;
	+ height-mm = <89>;
	+
	+ panel-timing {
	+ clock-frequency = <0>; /* Calculated by dsi */
	+
	+ hback-porch = <2>;
	+ hactive = <540>;
	+ hfront-porch = <0>;
	+ hsync-len = <2>;
	+
	+ vback-porch = <1>;
	+ vactive = <960>;
	+ vfront-porch = <0>;
	+ vsync-len = <1>;
	+
	+ hsync-active = <0>;
	+ vsync-active = <0>;
	+ de-active = <1>;
	+ pixelclk-active = <1>;
	+ };
	+
	+ port {
	+ lcd0_in: endpoint {
	+ remote-endpoint = <&dsi1_out_ep>;
	+ };
	+ };
	+ };
	+};
	+
	+&hdmi {
	+ status = "okay";
	+ pinctrl-0 = <&dss_hdmi_pins>;
	+ pinctrl-names = "default";
	+ vdda-supply = <&vdac>;
	+
	+ port {
	+ hdmi_out: endpoint {
	+ remote-endpoint = <&hdmi_connector_in>;
	+ lanes = <1 0 3 2 5 4 7 6>;
	+ };
	+ };
	+};
	+
	+&i2c1 {
	+ tmp105@48 {
	+ compatible = "ti,tmp105";
	+ reg = <0x48>;
	+ pinctrl-0 = <&tmp105_irq>;
	+ pinctrl-names = "default";
	+ /* kpd_row0.gpio_178 */
	+ interrupts-extended = <&gpio6 18 IRQ_TYPE_EDGE_FALLING
	+ &omap4_pmx_core 0x14e>;
	+ interrupt-names = "irq", "wakeup";
	+ wakeup-source;
	+ };
	+};
	+
	+&keypad {
	+ keypad,num-rows = <8>;
	+ keypad,num-columns = <8>;
	+ linux,keymap = <
	+
	+ /* Row 1 */
	+ MATRIX_KEY(0, 2, KEY_1)
	+ MATRIX_KEY(0, 6, KEY_2)
	+ MATRIX_KEY(2, 3, KEY_3)
	+ MATRIX_KEY(0, 7, KEY_4)
	+ MATRIX_KEY(0, 4, KEY_5)
	+ MATRIX_KEY(5, 5, KEY_6)
	+ MATRIX_KEY(0, 1, KEY_7)
	+ MATRIX_KEY(0, 5, KEY_8)
	+ MATRIX_KEY(0, 0, KEY_9)
	+ MATRIX_KEY(1, 6, KEY_0)
	+
	+ /* Row 2 */
	+ MATRIX_KEY(3, 4, KEY_APOSTROPHE)
	+ MATRIX_KEY(7, 6, KEY_Q)
	+ MATRIX_KEY(7, 7, KEY_W)
	+ MATRIX_KEY(7, 2, KEY_E)
	+ MATRIX_KEY(1, 0, KEY_R)
	+ MATRIX_KEY(4, 4, KEY_T)
	+ MATRIX_KEY(1, 2, KEY_Y)
	+ MATRIX_KEY(6, 7, KEY_U)
	+ MATRIX_KEY(2, 2, KEY_I)
	+ MATRIX_KEY(5, 6, KEY_O)
	+ MATRIX_KEY(3, 7, KEY_P)
	+ MATRIX_KEY(6, 5, KEY_BACKSPACE)
	+
	+ /* Row 3 */
	+ MATRIX_KEY(5, 4, KEY_TAB)
	+ MATRIX_KEY(5, 7, KEY_A)
	+ MATRIX_KEY(2, 7, KEY_S)
	+ MATRIX_KEY(7, 0, KEY_D)
	+ MATRIX_KEY(2, 6, KEY_F)
	+ MATRIX_KEY(6, 2, KEY_G)
	+ MATRIX_KEY(6, 6, KEY_H)
	+ MATRIX_KEY(1, 4, KEY_J)
	+ MATRIX_KEY(3, 1, KEY_K)
	+ MATRIX_KEY(2, 1, KEY_L)
	+ MATRIX_KEY(4, 6, KEY_ENTER)
	+
	+ /* Row 4 */
	+ MATRIX_KEY(3, 6, KEY_LEFTSHIFT) /* KEY_CAPSLOCK */
	+ MATRIX_KEY(6, 1, KEY_Z)
	+ MATRIX_KEY(7, 4, KEY_X)
	+ MATRIX_KEY(5, 1, KEY_C)
	+ MATRIX_KEY(1, 7, KEY_V)
	+ MATRIX_KEY(2, 4, KEY_B)
	+ MATRIX_KEY(4, 1, KEY_N)
	+ MATRIX_KEY(1, 1, KEY_M)
	+ MATRIX_KEY(3, 5, KEY_COMMA)
	+ MATRIX_KEY(5, 2, KEY_DOT)
	+ MATRIX_KEY(6, 3, KEY_UP)
	+ MATRIX_KEY(7, 3, KEY_OK)
	+
	+ /* Row 5 */
	+ MATRIX_KEY(2, 5, KEY_LEFTCTRL) /* KEY_LEFTSHIFT */
	+ MATRIX_KEY(4, 5, KEY_LEFTALT) /* SYM */
	+ MATRIX_KEY(6, 0, KEY_MINUS)
	+ MATRIX_KEY(4, 7, KEY_EQUAL)
	+ MATRIX_KEY(1, 5, KEY_SPACE)
	+ MATRIX_KEY(3, 2, KEY_SLASH)
	+ MATRIX_KEY(4, 3, KEY_LEFT)
	+ MATRIX_KEY(5, 3, KEY_DOWN)
	+ MATRIX_KEY(3, 3, KEY_RIGHT)
	+
	+ /* Side buttons, KEY_VOLUMEDOWN and KEY_PWER are on CPCAP? */
	+ MATRIX_KEY(5, 0, KEY_VOLUMEUP)
	+ >;
	+};
	+
	+&mmc1 {
	+ vmmc-supply = <&vwlan2>;
	+ bus-width = <4>;
	+ cd-gpios = <&gpio6 16 GPIO_ACTIVE_LOW>; /* gpio176 */
	+};
	+
	+&mmc2 {
	+ vmmc-supply = <&vsdio>;
	+ bus-width = <8>;
	+ ti,non-removable;
	+};
	+
	+&mmc3 {
	+ vmmc-supply = <&wl12xx_vmmc>;
	+ /* uart2_tx.sdmmc3_dat1 pad as wakeirq */
	+ interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
	+ &omap4_pmx_core 0xde>;
	+ interrupt-names = "irq", "wakeup";
	+ non-removable;
	+ bus-width = <4>;
	+ cap-power-off-card;
	+ keep-power-in-suspend;
	+
	+ #address-cells = <1>;
	+ #size-cells = <0>;
	+ wlcore: wlcore@2 {
	+ compatible = "ti,wl1285", "ti,wl1283";
	+ reg = <2>;
	+ /* gpio_100 with gpmc_wait2 pad as wakeirq */
	+ interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,
	+ <&omap4_pmx_core 0x4e>;
	+ interrupt-names = "irq", "wakeup";
	+ ref-clock-frequency = <26000000>;
	+ tcxo-clock-frequency = <26000000>;
	+ };
	+};
	+
	+&i2c1 {
	+ led-controller@38 {
	+ compatible = "ti,lm3532";
	+ #address-cells = <1>;
	+ #size-cells = <0>;
	+ reg = <0x38>;
	+
	+ enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
	+
	+ ramp-up-us = <1024>;
	+ ramp-down-us = <8193>;
	+
	+ led@0 {
	+ reg = <0>;
	+ led-sources = <2>;
	+ ti,led-mode = <0>;
	+ label = ":backlight";
	+ linux,default-trigger = "backlight";
	+ };
	+
	+ led@1 {
	+ reg = <1>;
	+ led-sources = <1>;
	+ ti,led-mode = <0>;
	+ label = ":kbd_backlight";
	+ };
	+ };
	+};
	+
	+&i2c2 {
	+ touchscreen@4a {
	+ compatible = "atmel,maxtouch";
	+ reg = <0x4a>;
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&touchscreen_pins>;
	+
	+ reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */
	+
	+ /* gpio_183 with sys_nirq2 pad as wakeup */
	+ interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING>,
	+ <&omap4_pmx_core 0x160>;
	+ interrupt-names = "irq", "wakeup";
	+ wakeup-source;
	+ };
	+
	+ isl29030@44 {
	+ compatible = "isil,isl29030";
	+ reg = <0x44>;
	+
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&als_proximity_pins>;
	+
	+ interrupt-parent = <&gpio6>;
	+ interrupts = <17 IRQ_TYPE_LEVEL_LOW>; /* gpio177 */
	+ };
	+};
	+
	+&omap4_pmx_core {
	+
	+ /* hdmi_hpd.gpio_63 */
	+ hdmi_hpd_gpio: pinmux_hdmi_hpd_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x098, PIN_INPUT \| MUX_MODE3)
	+ >;
	+ };
	+
	+ /* hdmi_cec.hdmi_cec, hdmi_scl.hdmi_scl, hdmi_sda.hdmi_sda */
	+ dss_hdmi_pins: pinmux_dss_hdmi_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x09a, PIN_INPUT \| MUX_MODE0)
	+ OMAP4_IOPAD(0x09c, PIN_INPUT \| MUX_MODE0)
	+ OMAP4_IOPAD(0x09e, PIN_INPUT \| MUX_MODE0)
	+ >;
	+ };
	+
	+ /* gpmc_ncs0.gpio_50 */
	+ poweroff_gpio: pinmux_poweroff_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x074, PIN_OUTPUT_PULLUP \| MUX_MODE3)
	+ >;
	+ };
	+
	+ /* kpd_row0.gpio_178 */
	+ tmp105_irq: pinmux_tmp105_irq {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x18e, PIN_INPUT_PULLUP \| MUX_MODE3)
	+ >;
	+ };
	+
	+ usb_gpio_mux_sel1: pinmux_usb_gpio_mux_sel1_pins {
	+ /* gpio_60 */
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x088, PIN_OUTPUT \| MUX_MODE3)
	+ >;
	+ };
	+
	+ touchscreen_pins: pinmux_touchscreen_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x180, PIN_OUTPUT \| MUX_MODE3)
	+ OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP \| MUX_MODE3)
	+ >;
	+ };
	+
	+ als_proximity_pins: pinmux_als_proximity_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x18c, PIN_INPUT_PULLUP \| MUX_MODE3)
	+ >;
	+ };
	+
	+ usb_mdm6600_pins: pinmux_usb_mdm6600_pins {
	+ pinctrl-single,pins = <
	+ /* enable 0x4a1000d8 usbb1_ulpitll_dat7.gpio_95 ag16 */
	+ OMAP4_IOPAD(0x0d8, PIN_INPUT \| MUX_MODE3)
	+
	+ /* power 0x4a10007c gpmc_nwp.gpio_54 c25 */
	+ OMAP4_IOPAD(0x07c, PIN_OUTPUT \| MUX_MODE3)
	+
	+ /* reset 0x4a100072 gpmc_a25.gpio_49 d20 */
	+ OMAP4_IOPAD(0x072, PIN_OUTPUT \| MUX_MODE3)
	+
	+ /* mode0/bpwake 0x4a10014e sdmmc5_dat1.gpio_148 af4 */
	+ OMAP4_IOPAD(0x14e, PIN_OUTPUT \| MUX_MODE3)
	+
	+ /* mode1/apwake 0x4a100150 sdmmc5_dat2.gpio_149 ag3 */
	+ OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW \| PIN_INPUT \| MUX_MODE3)
	+
	+ /* status0 0x4a10007e gpmc_clk.gpio_55 b22 */
	+ OMAP4_IOPAD(0x07e, PIN_INPUT \| MUX_MODE3)
	+
	+ /* status1 0x4a10007a gpmc_ncs3.gpio_53 c22 */
	+ OMAP4_IOPAD(0x07a, PIN_INPUT \| MUX_MODE3)
	+
	+ /* status2 0x4a100078 gpmc_ncs2.gpio_52 d21 */
	+ OMAP4_IOPAD(0x078, PIN_INPUT \| MUX_MODE3)
	+
	+ /* cmd0 0x4a100094 gpmc_ncs6.gpio_103 c24 */
	+ OMAP4_IOPAD(0x094, PIN_OUTPUT \| MUX_MODE3)
	+
	+ /* cmd1 0x4a100096 gpmc_ncs7.gpio_104 d24 */
	+ OMAP4_IOPAD(0x096, PIN_OUTPUT \| MUX_MODE3)
	+
	+ /* cmd2 0x4a100142 uart3_rts_sd.gpio_142 f28 */
	+ OMAP4_IOPAD(0x142, PIN_OUTPUT \| MUX_MODE3)
	+ >;
	+ };
	+
	+ usb_ulpi_pins: pinmux_usb_ulpi_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x196, MUX_MODE7)
	+ OMAP4_IOPAD(0x198, MUX_MODE7)
	+ OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1ba, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1bc, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP \| MUX_MODE0)
	+ >;
	+ };
	+
	+ /* usb0_otg_dp and usb0_otg_dm */
	+ usb_utmi_pins: pinmux_usb_utmi_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x196, PIN_INPUT \| MUX_MODE0)
	+ OMAP4_IOPAD(0x198, PIN_INPUT \| MUX_MODE0)
	+ OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1ba, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1bc, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ >;
	+ };
	+
	+ /*
	+ * Note that the v3.0.8 stock userspace dynamically remuxes uart1
	+ * rts pin probably for PM purposes to PIN_INPUT_PULLUP \| MUX_MODE7
	+ * when not used. If needed, we can add rts pin remux later based
	+ * on power measurements.
	+ */
	+ uart1_pins: pinmux_uart1_pins {
	+ pinctrl-single,pins = <
	+ /* 0x4a10013c mcspi1_cs2.uart1_cts ag23 */
	+ OMAP4_IOPAD(0x13c, PIN_INPUT_PULLUP \| MUX_MODE1)
	+
	+ /* 0x4a10013e mcspi1_cs3.uart1_rts ah23 */
	+ OMAP4_IOPAD(0x13e, MUX_MODE1)
	+
	+ /* 0x4a100140 uart3_cts_rctx.uart1_tx f27 */
	+ OMAP4_IOPAD(0x140, PIN_OUTPUT \| MUX_MODE1)
	+
	+ /* 0x4a1001ca dpm_emu14.uart1_rx aa3 */
	+ OMAP4_IOPAD(0x1ca, PIN_INPUT_PULLUP \| MUX_MODE2)
	+ >;
	+ };
	+
	+ /* uart3_tx_irtx and uart3_rx_irrx */
	+ uart3_pins: pinmux_uart3_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x196, MUX_MODE7)
	+ OMAP4_IOPAD(0x198, MUX_MODE7)
	+ OMAP4_IOPAD(0x1b2, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1b4, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1b6, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1b8, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1ba, MUX_MODE2)
	+ OMAP4_IOPAD(0x1bc, PIN_INPUT \| MUX_MODE2)
	+ OMAP4_IOPAD(0x1be, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c0, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c2, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c4, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c6, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP \| MUX_MODE7)
	+ >;
	+ };
	+
	+ uart4_pins: pinmux_uart4_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x15c, PIN_INPUT \| MUX_MODE0) /* uart4_rx */
	+ OMAP4_IOPAD(0x15e, PIN_OUTPUT \| MUX_MODE0) /* uart4_tx */
	+ OMAP4_IOPAD(0x110, PIN_INPUT_PULLUP \| MUX_MODE5) /* uart4_cts */
	+ OMAP4_IOPAD(0x112, PIN_OUTPUT_PULLUP \| MUX_MODE5) /* uart4_rts */
	+ >;
	+ };
	+
	+ mcbsp2_pins: pinmux_mcbsp2_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x0f6, PIN_INPUT \| MUX_MODE0) /* abe_mcbsp2_clkx */
	+ OMAP4_IOPAD(0x0f8, PIN_INPUT \| MUX_MODE0) /* abe_mcbsp2_dr */
	+ OMAP4_IOPAD(0x0fa, PIN_OUTPUT \| MUX_MODE0) /* abe_mcbsp2_dx */
	+ OMAP4_IOPAD(0x0fc, PIN_INPUT \| MUX_MODE0) /* abe_mcbsp2_fsx */
	+ >;
	+ };
	+
	+ mcbsp3_pins: pinmux_mcbsp3_pins {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x106, PIN_INPUT \| MUX_MODE1) /* abe_mcbsp3_dr */
	+ OMAP4_IOPAD(0x108, PIN_OUTPUT \| MUX_MODE1) /* abe_mcbsp3_dx */
	+ OMAP4_IOPAD(0x10a, PIN_INPUT \| MUX_MODE1) /* abe_mcbsp3_clkx */
	+ OMAP4_IOPAD(0x10c, PIN_INPUT \| MUX_MODE1) /* abe_mcbsp3_fsx */
	+ >;
	+ };
	+
	+ vibrator_direction_pin: pinmux_vibrator_direction_pin {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x1ce, PIN_OUTPUT \| MUX_MODE1) /* dmtimer8_pwm_evt (gpio_27) */
	+ >;
	+ };
	+
	+ vibrator_enable_pin: pinmux_vibrator_enable_pin {
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0X1d0, PIN_OUTPUT \| MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */
	+ >;
	+ };
	+};
	+
	+&omap4_pmx_wkup {
	+ usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
	+ /* gpio_wk0 */
	+ pinctrl-single,pins = <
	+ OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN \| MUX_MODE3)
	+ >;
	+ };
	+};
	+
	+/* Configure pwm clock source for timers 8 & 9 */
	+&timer8 {
	+ assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
	+ assigned-clock-parents = <&sys_clkin_ck>;
	+};
	+
	+&timer9 {
	+ assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
	+ assigned-clock-parents = <&sys_clkin_ck>;
	+};
	+
	+/*
	+ * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for
	+ * uart1 wakeirq.
	+ */
	+&uart1 {
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&uart1_pins>;
	+ interrupts-extended = <&wakeupgen GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH
	+ &omap4_pmx_core 0xfc>;
	+};
	+
	+&uart3 {
	+ interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
	+ &omap4_pmx_core 0x17c>;
	+};
	+
	+&uart4 {
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&uart4_pins>;
	+
	+ bluetooth {
	+ compatible = "ti,wl1285-st";
	+ enable-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>; /* gpio 174 */
	+ max-speed = <3686400>;
	+ };
	+};
	+
	+&usbhsohci {
	+ phys = <&fsusb1_phy>;
	+ phy-names = "usb";
	+};
	+
	+&usbhsehci {
	+ phys = <&hsusb2_phy>;
	+};
	+
	+&usbhshost {
	+ port1-mode = "ohci-phy-4pin-dpdm";
	+ port2-mode = "ehci-tll";
	+};
	+
	+/* Internal UTMI+ PHY used for OTG, CPCAP ULPI PHY for detection and charger */
	+&usb_otg_hs {
	+ interface-type = <1>;
	+ mode = <3>;
	+ power = <50>;
	+};
	+
	+&i2c4 {
	+ ak8975: magnetometer@c {
	+ compatible = "asahi-kasei,ak8975";
	+ reg = <0x0c>;
	+
	+ vdd-supply = <&vhvio>;
	+
	+ interrupt-parent = <&gpio6>;
	+ interrupts = <15 IRQ_TYPE_EDGE_RISING>; /* gpio175 */
	+
	+ rotation-matrix = "-1", "0", "0",
	+ "0", "1", "0",
	+ "0", "0", "-1";
	+
	+ };
	+
	+ lis3dh: accelerometer@18 {
	+ compatible = "st,lis3dh-accel";
	+ reg = <0x18>;
	+
	+ vdd-supply = <&vhvio>;
	+
	+ interrupt-parent = <&gpio2>;
	+ interrupts = <2 IRQ_TYPE_EDGE_BOTH>; /* gpio34 */
	+
	+ rotation-matrix = "0", "-1", "0",
	+ "1", "0", "0",
	+ "0", "0", "1";
	+ };
	+};
	+
	+&mcbsp2 {
	+ #sound-dai-cells = <0>;
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&mcbsp2_pins>;
	+ status = "okay";
	+
	+ mcbsp2_port: port {
	+ cpu_dai2: endpoint {
	+ dai-format = "i2s";
	+ remote-endpoint = <&cpcap_audio_codec0>;
	+ frame-master = <&cpcap_audio_codec0>;
	+ bitclock-master = <&cpcap_audio_codec0>;
	+ };
	+ };
	+};
	+
	+&mcbsp3 {
	+ #sound-dai-cells = <0>;
	+ pinctrl-names = "default";
	+ pinctrl-0 = <&mcbsp3_pins>;
	+ status = "okay";
	+
	+ mcbsp3_port: port {
	+ cpu_dai3: endpoint {
	+ dai-format = "dsp_a";
	+ frame-master = <&cpcap_audio_codec1>;
	+ bitclock-master = <&cpcap_audio_codec1>;
	+ remote-endpoint = <&cpcap_audio_codec1>;
	+ };
	+ };
	+};
	+
	+&cpcap_audio_codec0 {
	+ remote-endpoint = <&cpu_dai2>;
	+};
	+
	+&cpcap_audio_codec1 {
	+ remote-endpoint = <&cpu_dai3>;
	};
	diff --git a/sys/gnu/dts/arm/omap4-l4-abe.dtsi b/sys/gnu/dts/arm/omap4-l4-abe.dtsi
	--- a/sys/gnu/dts/arm/omap4-l4-abe.dtsi
	+++ b/sys/gnu/dts/arm/omap4-l4-abe.dtsi
	@@ -86,6 +86,7 @@

	target-module@22000 { /* 0x40122000, ap 2 02.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp1";
	reg = <0x2208c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -119,6 +120,7 @@

	target-module@24000 { /* 0x40124000, ap 4 04.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp2";
	reg = <0x2408c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -152,6 +154,7 @@

	target-module@26000 { /* 0x40126000, ap 6 06.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp3";
	reg = <0x2608c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -185,6 +188,7 @@

	target-module@28000 { /* 0x40128000, ap 8 08.0 */
	compatible = "ti,sysc-mcasp", "ti,sysc";
	+ ti,hwmods = "mcasp";
	reg = <0x28000 0x4>,
	<0x28004 0x4>;
	reg-names = "rev", "sysc";
	@@ -219,6 +223,7 @@

	target-module@2e000 { /* 0x4012e000, ap 12 0c.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "dmic";
	reg = <0x2e000 0x4>,
	<0x2e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -278,6 +283,7 @@

	mcpdm_module: target-module@32000 { /* 0x40132000, ap 16 10.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcpdm";
	reg = <0x32000 0x4>,
	<0x32010 0x4>;
	reg-names = "rev", "sysc";
	@@ -312,6 +318,7 @@

	target-module@38000 { /* 0x40138000, ap 18 12.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer5";
	reg = <0x38000 0x4>,
	<0x38010 0x4>;
	reg-names = "rev", "sysc";
	@@ -342,6 +349,7 @@

	target-module@3a000 { /* 0x4013a000, ap 20 14.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer6";
	reg = <0x3a000 0x4>,
	<0x3a010 0x4>;
	reg-names = "rev", "sysc";
	@@ -372,6 +380,7 @@

	target-module@3c000 { /* 0x4013c000, ap 22 16.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer7";
	reg = <0x3c000 0x4>,
	<0x3c010 0x4>;
	reg-names = "rev", "sysc";
	@@ -402,6 +411,7 @@

	target-module@3e000 { /* 0x4013e000, ap 24 18.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer8";
	reg = <0x3e000 0x4>,
	<0x3e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -460,6 +470,7 @@

	target-module@f1000 { /* 0x401f1000, ap 32 20.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "aess";
	reg = <0xf1000 0x4>,
	<0xf1010 0x4>;
	reg-names = "rev", "sysc";
	diff --git a/sys/gnu/dts/arm/omap4-l4.dtsi b/sys/gnu/dts/arm/omap4-l4.dtsi
	--- a/sys/gnu/dts/arm/omap4-l4.dtsi
	+++ b/sys/gnu/dts/arm/omap4-l4.dtsi
	@@ -136,6 +136,7 @@

	target-module@56000 { /* 0x4a056000, ap 7 0a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "dma_system";
	reg = <0x56000 0x4>,
	<0x5602c 0x4>,
	<0x56028 0x4>;
	@@ -159,7 +160,7 @@
	ranges = <0x0 0x56000 0x1000>;

	sdma: dma-controller@0 {
	- compatible = "ti,omap4430-sdma", "ti,omap-sdma";
	+ compatible = "ti,omap4430-sdma";
	reg = <0x0 0x1000>;
	interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
	<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
	@@ -173,6 +174,7 @@

	target-module@58000 { /* 0x4a058000, ap 10 0e.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "hsi";
	reg = <0x58000 0x4>,
	<0x58010 0x4>,
	<0x58014 0x4>;
	@@ -319,6 +321,7 @@

	target-module@66000 { /* 0x4a066000, ap 25 26.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmu_dsp";
	reg = <0x66000 0x4>,
	<0x66010 0x4>,
	<0x66014 0x4>;
	@@ -332,18 +335,12 @@
	/* Domains (V, P, C): iva, tesla_pwrdm, tesla_clkdm */
	clocks = <&tesla_clkctrl OMAP4_DSP_CLKCTRL 0>;
	clock-names = "fck";
	- resets = <&prm_tesla 1>;
	- reset-names = "rstctrl";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x66000 0x1000>;

	- mmu_dsp: mmu@0 {
	- compatible = "ti,omap4-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- };
	+ /* mmu_dsp cannot be moved before reset driver */
	+ status = "disabled";
	};
	};

	@@ -384,6 +381,7 @@

	target-module@2b000 { /* 0x4a0ab000, ap 84 12.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "usb_otg_hs";
	reg = <0x2b400 0x4>,
	<0x2b404 0x4>,
	<0x2b408 0x4>;
	@@ -423,6 +421,7 @@

	target-module@2d000 { /* 0x4a0ad000, ap 88 0c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "ocp2scp_usb_phy";
	reg = <0x2d000 0x4>,
	<0x2d010 0x4>,
	<0x2d014 0x4>;
	@@ -501,6 +500,7 @@

	target-module@59000 { /* 0x4a0d9000, ap 13 1a.0 */
	compatible = "ti,sysc-omap4-sr", "ti,sysc";
	+ ti,hwmods = "smartreflex_mpu";
	reg = <0x59038 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
	@@ -524,6 +524,7 @@

	target-module@5b000 { /* 0x4a0db000, ap 15 08.0 */
	compatible = "ti,sysc-omap4-sr", "ti,sysc";
	+ ti,hwmods = "smartreflex_iva";
	reg = <0x5b038 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
	@@ -547,6 +548,7 @@

	target-module@5d000 { /* 0x4a0dd000, ap 17 22.0 */
	compatible = "ti,sysc-omap4-sr", "ti,sysc";
	+ ti,hwmods = "smartreflex_core";
	reg = <0x5d038 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
	@@ -578,6 +580,7 @@

	target-module@74000 { /* 0x4a0f4000, ap 27 24.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox";
	reg = <0x74000 0x4>,
	<0x74010 0x4>;
	reg-names = "rev", "sysc";
	@@ -612,6 +615,7 @@

	target-module@76000 { /* 0x4a0f6000, ap 29 3a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spinlock";
	reg = <0x76000 0x4>,
	<0x76010 0x4>,
	<0x76014 0x4>;
	@@ -719,6 +723,7 @@

	target-module@a000 { /* 0x4a10a000, ap 65 50.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "fdif";
	reg = <0xa000 0x4>,
	<0xa010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1002,7 +1007,7 @@
	ranges = <0x0 0x6000 0x2000>;

	prm: prm@0 {
	- compatible = "ti,omap4-prm", "simple-bus";
	+ compatible = "ti,omap4-prm";
	reg = <0x0 0x2000>;
	interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
	#address-cells = <1>;
	@@ -1080,6 +1085,7 @@

	gpio1_target: target-module@0 { /* 0x4a310000, ap 5 14.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio1";
	reg = <0x0 0x4>,
	<0x10 0x4>,
	<0x114 0x4>;
	@@ -1174,6 +1180,7 @@

	target-module@c000 { /* 0x4a31c000, ap 11 20.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "kbd";
	reg = <0xc000 0x4>,
	<0xc010 0x4>,
	<0xc014 0x4>;
	@@ -1418,6 +1425,7 @@

	target-module@32000 { /* 0x48032000, ap 5 02.0 */
	compatible = "ti,sysc-omap2-timer", "ti,sysc";
	+ ti,hwmods = "timer2";
	reg = <0x32000 0x4>,
	<0x32010 0x4>,
	<0x32014 0x4>;
	@@ -1449,6 +1457,7 @@

	target-module@34000 { /* 0x48034000, ap 7 04.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer3";
	reg = <0x34000 0x4>,
	<0x34010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1476,6 +1485,7 @@

	target-module@36000 { /* 0x48036000, ap 9 0e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer4";
	reg = <0x36000 0x4>,
	<0x36010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1503,6 +1513,7 @@

	target-module@3e000 { /* 0x4803e000, ap 11 08.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer9";
	reg = <0x3e000 0x4>,
	<0x3e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1539,6 +1550,7 @@

	target-module@55000 { /* 0x48055000, ap 15 0c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio2";
	reg = <0x55000 0x4>,
	<0x55010 0x4>,
	<0x55114 0x4>;
	@@ -1572,6 +1584,7 @@

	target-module@57000 { /* 0x48057000, ap 17 16.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio3";
	reg = <0x57000 0x4>,
	<0x57010 0x4>,
	<0x57114 0x4>;
	@@ -1605,6 +1618,7 @@

	target-module@59000 { /* 0x48059000, ap 19 10.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio4";
	reg = <0x59000 0x4>,
	<0x59010 0x4>,
	<0x59114 0x4>;
	@@ -1638,6 +1652,7 @@

	target-module@5b000 { /* 0x4805b000, ap 21 12.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio5";
	reg = <0x5b000 0x4>,
	<0x5b010 0x4>,
	<0x5b114 0x4>;
	@@ -1671,6 +1686,7 @@

	target-module@5d000 { /* 0x4805d000, ap 23 14.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio6";
	reg = <0x5d000 0x4>,
	<0x5d010 0x4>,
	<0x5d114 0x4>;
	@@ -1884,6 +1900,7 @@

	target-module@76000 { /* 0x48076000, ap 39 38.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "slimbus2";
	reg = <0x76000 0x4>,
	<0x76010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1904,6 +1921,7 @@

	target-module@78000 { /* 0x48078000, ap 41 1a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "elm";
	reg = <0x78000 0x4>,
	<0x78010 0x4>,
	<0x78014 0x4>;
	@@ -1932,6 +1950,7 @@

	target-module@86000 { /* 0x48086000, ap 43 24.0 */
	compatible = "ti,sysc-omap2-timer", "ti,sysc";
	+ ti,hwmods = "timer10";
	reg = <0x86000 0x4>,
	<0x86010 0x4>,
	<0x86014 0x4>;
	@@ -1964,6 +1983,7 @@

	target-module@88000 { /* 0x48088000, ap 45 2e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer11";
	reg = <0x88000 0x4>,
	<0x88010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1990,30 +2010,17 @@
	};
	};

	- rng_target: target-module@90000 { /* 0x48090000, ap 57 2a.0 */
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x91fe0 0x4>,
	- <0x91fe4 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
	- clocks = <&l4_secure_clkctrl OMAP4_RNG_CLKCTRL 0>;
	- clock-names = "fck";
	+ target-module@90000 { /* 0x48090000, ap 57 2a.0 */
	+ compatible = "ti,sysc";
	+ status = "disabled";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x90000 0x2000>;
	-
	- rng: rng@0 {
	- compatible = "ti,omap4-rng";
	- reg = <0x0 0x2000>;
	- interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
	- };
	};

	target-module@96000 { /* 0x48096000, ap 37 26.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp4";
	reg = <0x9608c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -2045,6 +2052,7 @@

	target-module@98000 { /* 0x48098000, ap 49 22.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi1";
	reg = <0x98000 0x4>,
	<0x98010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2083,6 +2091,7 @@

	target-module@9a000 { /* 0x4809a000, ap 51 2c.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi2";
	reg = <0x9a000 0x4>,
	<0x9a010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2173,35 +2182,6 @@
	<0x00001000 0x000a5000 0x00001000>;
	};

	- des_target: target-module@a5000 { /* 0x480a5000 */
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0xa5030 0x4>,
	- <0xa5034 0x4>,
	- <0xa5038 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
	- clocks = <&l4_secure_clkctrl OMAP4_DES3DES_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0 0xa5000 0x00001000>;
	-
	- des: des@0 {
	- compatible = "ti,omap4-des";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&sdma 117>, <&sdma 116>;
	- dma-names = "tx", "rx";
	- };
	- };
	-
	target-module@a8000 { /* 0x480a8000, ap 61 3e.0 */
	compatible = "ti,sysc";
	status = "disabled";
	@@ -2252,6 +2232,7 @@

	target-module@b2000 { /* 0x480b2000, ap 65 3c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "hdq1w";
	reg = <0xb2000 0x4>,
	<0xb2014 0x4>,
	<0xb2018 0x4>;
	@@ -2308,6 +2289,7 @@

	target-module@b8000 { /* 0x480b8000, ap 69 58.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi3";
	reg = <0xb8000 0x4>,
	<0xb8010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2338,6 +2320,7 @@

	target-module@ba000 { /* 0x480ba000, ap 71 32.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi4";
	reg = <0xba000 0x4>,
	<0xba010 0x4>;
	reg-names = "rev", "sysc";
	diff --git a/sys/gnu/dts/arm/omap4.dtsi b/sys/gnu/dts/arm/omap4.dtsi
	--- a/sys/gnu/dts/arm/omap4.dtsi
	+++ b/sys/gnu/dts/arm/omap4.dtsi
	@@ -148,7 +148,7 @@
	l4_abe: interconnect@40100000 {
	};

	- ocmcram: sram@40304000 {
	+ ocmcram: ocmcram@40304000 {
	compatible = "mmio-sram";
	reg = <0x40304000 0xa000>; /* 40k */
	};
	@@ -173,6 +173,14 @@
	#gpio-cells = <2>;
	};

	+ mmu_dsp: mmu@4a066000 {
	+ compatible = "ti,omap4-iommu";
	+ reg = <0x4a066000 0x100>;
	+ interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu_dsp";
	+ #iommu-cells = <0>;
	+ };
	+
	target-module@52000000 {
	compatible = "ti,sysc-omap4", "ti,sysc";
	ti,hwmods = "iss";
	@@ -198,37 +206,17 @@
	/* No child device binding, driver in staging */
	};

	- target-module@55082000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x55082000 0x4>,
	- <0x55082010 0x4>,
	- <0x55082014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&ducati_clkctrl OMAP4_IPU_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_core 2>;
	- reset-names = "rstctrl";
	- ranges = <0x0 0x55082000 0x100>;
	- #size-cells = <1>;
	- #address-cells = <1>;
	-
	- mmu_ipu: mmu@0 {
	- compatible = "ti,omap4-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,iommu-bus-err-back;
	- };
	+ mmu_ipu: mmu@55082000 {
	+ compatible = "ti,omap4-iommu";
	+ reg = <0x55082000 0x100>;
	+ interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu_ipu";
	+ #iommu-cells = <0>;
	+ ti,iommu-bus-err-back;
	};
	-
	target-module@4012c000 {
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "slimbus1";
	reg = <0x4012c000 0x4>,
	<0x4012c010 0x4>;
	reg-names = "rev", "sysc";
	@@ -278,90 +266,40 @@
	hw-caps-temp-alert;
	};

	- aes1_target: target-module@4b501000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x4b501080 0x4>,
	- <0x4b501084 0x4>,
	- <0x4b501088 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
	- clocks = <&l4_secure_clkctrl OMAP4_AES1_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x4b501000 0x1000>;
	-
	- aes1: aes@0 {
	- compatible = "ti,omap4-aes";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&sdma 111>, <&sdma 110>;
	- dma-names = "tx", "rx";
	- };
	+ aes1: aes@4b501000 {
	+ compatible = "ti,omap4-aes";
	+ ti,hwmods = "aes1";
	+ reg = <0x4b501000 0xa0>;
	+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&sdma 111>, <&sdma 110>;
	+ dma-names = "tx", "rx";
	};

	- aes2_target: target-module@4b701000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x4b701080 0x4>,
	- <0x4b701084 0x4>,
	- <0x4b701088 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>,
	- <SYSC_IDLE_SMART_WKUP>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
	- clocks = <&l4_secure_clkctrl OMAP4_AES2_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x4b701000 0x1000>;
	-
	- aes2: aes@0 {
	- compatible = "ti,omap4-aes";
	- reg = <0 0xa0>;
	- interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&sdma 114>, <&sdma 113>;
	- dma-names = "tx", "rx";
	- };
	+ aes2: aes@4b701000 {
	+ compatible = "ti,omap4-aes";
	+ ti,hwmods = "aes2";
	+ reg = <0x4b701000 0xa0>;
	+ interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&sdma 114>, <&sdma 113>;
	+ dma-names = "tx", "rx";
	};

	- sham_target: target-module@4b100000 {
	- compatible = "ti,sysc-omap3-sham", "ti,sysc";
	- reg = <0x4b100100 0x4>,
	- <0x4b100110 0x4>,
	- <0x4b100114 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,syss-mask = <1>;
	- /* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
	- clocks = <&l4_secure_clkctrl OMAP4_SHA2MD5_CLKCTRL 0>;
	- clock-names = "fck";
	- #address-cells = <1>;
	- #size-cells = <1>;
	- ranges = <0x0 0x4b100000 0x1000>;
	-
	- sham: sham@0 {
	- compatible = "ti,omap4-sham";
	- reg = <0 0x300>;
	- interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
	- dmas = <&sdma 119>;
	- dma-names = "rx";
	- };
	+ des: des@480a5000 {
	+ compatible = "ti,omap4-des";
	+ ti,hwmods = "des";
	+ reg = <0x480a5000 0xa0>;
	+ interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&sdma 117>, <&sdma 116>;
	+ dma-names = "tx", "rx";
	+ };
	+
	+ sham: sham@4b100000 {
	+ compatible = "ti,omap4-sham";
	+ ti,hwmods = "sham";
	+ reg = <0x4b100000 0x300>;
	+ interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
	+ dmas = <&sdma 119>;
	+ dma-names = "rx";
	};

	abb_mpu: regulator-abb-mpu {
	@@ -392,8 +330,8 @@

	target-module@56000000 {
	compatible = "ti,sysc-omap4", "ti,sysc";
	- reg = <0x5600fe00 0x4>,
	- <0x5600fe10 0x4>;
	+ reg = <0x5601fc00 0x4>,
	+ <0x5601fc10 0x4>;
	reg-names = "rev", "sysc";
	ti,sysc-midle = <SYSC_IDLE_FORCE>,
	<SYSC_IDLE_NO>,
	@@ -504,29 +442,3 @@
	#include "omap4-l4.dtsi"
	#include "omap4-l4-abe.dtsi"
	#include "omap44xx-clocks.dtsi"
	-
	-&prm {
	- prm_tesla: prm@400 {
	- compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x400 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_core: prm@700 {
	- compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x700 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_ivahd: prm@f00 {
	- compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
	- reg = <0xf00 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_device: prm@1b00 {
	- compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1b00 0x40>;
	- #reset-cells = <1>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/omap44xx-clocks.dtsi b/sys/gnu/dts/arm/omap44xx-clocks.dtsi
	--- a/sys/gnu/dts/arm/omap44xx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/omap44xx-clocks.dtsi
	@@ -1279,18 +1279,13 @@
	#size-cells = <1>;
	ranges = <0 0x1400 0x200>;

	- l4_per_clkctrl: clock@20 {
	- compatible = "ti,clkctrl-l4-per", "ti,clkctrl";
	+ l4_per_clkctrl: clk@20 {
	+ compatible = "ti,clkctrl";
	reg = <0x20 0x144>;
	#clock-cells = <2>;
	};
	-
	- l4_secure_clkctrl: clock@1a0 {
	- compatible = "ti,clkctrl-l4-secure", "ti,clkctrl";
	- reg = <0x1a0 0x3c>;
	- #clock-cells = <2>;
	- };
	};
	+
	};

	&prm {
	diff --git a/sys/gnu/dts/arm/omap5-l4-abe.dtsi b/sys/gnu/dts/arm/omap5-l4-abe.dtsi
	--- a/sys/gnu/dts/arm/omap5-l4-abe.dtsi
	+++ b/sys/gnu/dts/arm/omap5-l4-abe.dtsi
	@@ -86,6 +86,7 @@

	target-module@22000 { /* 0x40122000, ap 2 02.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp1";
	reg = <0x2208c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -119,6 +120,7 @@

	target-module@24000 { /* 0x40124000, ap 4 04.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp2";
	reg = <0x2408c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -152,6 +154,7 @@

	target-module@26000 { /* 0x40126000, ap 6 06.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mcbsp3";
	reg = <0x2608c 0x4>;
	reg-names = "sysc";
	ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	@@ -203,6 +206,7 @@

	target-module@2e000 { /* 0x4012e000, ap 12 0c.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "dmic";
	reg = <0x2e000 0x4>,
	<0x2e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -243,6 +247,7 @@

	mcpdm_module: target-module@32000 { /* 0x40132000, ap 16 10.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcpdm";
	reg = <0x32000 0x4>,
	<0x32010 0x4>;
	reg-names = "rev", "sysc";
	@@ -277,6 +282,7 @@

	target-module@38000 { /* 0x40138000, ap 18 12.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer5";
	reg = <0x38000 0x4>,
	<0x38010 0x4>;
	reg-names = "rev", "sysc";
	@@ -308,6 +314,7 @@

	target-module@3a000 { /* 0x4013a000, ap 20 14.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer6";
	reg = <0x3a000 0x4>,
	<0x3a010 0x4>;
	reg-names = "rev", "sysc";
	@@ -339,6 +346,7 @@

	target-module@3c000 { /* 0x4013c000, ap 22 16.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer7";
	reg = <0x3c000 0x4>,
	<0x3c010 0x4>;
	reg-names = "rev", "sysc";
	@@ -369,6 +377,7 @@

	target-module@3e000 { /* 0x4013e000, ap 24 18.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer8";
	reg = <0x3e000 0x4>,
	<0x3e010 0x4>;
	reg-names = "rev", "sysc";
	diff --git a/sys/gnu/dts/arm/omap5-l4.dtsi b/sys/gnu/dts/arm/omap5-l4.dtsi
	--- a/sys/gnu/dts/arm/omap5-l4.dtsi
	+++ b/sys/gnu/dts/arm/omap5-l4.dtsi
	@@ -213,6 +213,7 @@

	target-module@56000 { /* 0x4a056000, ap 7 02.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "dma_system";
	reg = <0x56000 0x4>,
	<0x5602c 0x4>,
	<0x56028 0x4>;
	@@ -236,7 +237,7 @@
	ranges = <0x0 0x56000 0x1000>;

	sdma: dma-controller@0 {
	- compatible = "ti,omap4430-sdma", "ti,omap-sdma";
	+ compatible = "ti,omap4430-sdma";
	reg = <0x0 0x1000>;
	interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
	<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
	@@ -348,6 +349,7 @@

	target-module@66000 { /* 0x4a066000, ap 23 0a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "mmu_dsp";
	reg = <0x66000 0x4>,
	<0x66010 0x4>,
	<0x66014 0x4>;
	@@ -362,18 +364,12 @@
	/* Domains (V, P, C): mm, dsp_pwrdm, dsp_clkdm */
	clocks = <&dsp_clkctrl OMAP5_MMU_DSP_CLKCTRL 0>;
	clock-names = "fck";
	- resets = <&prm_dsp 1>;
	- reset-names = "rstctrl";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x66000 0x1000>;

	- mmu_dsp: mmu@0 {
	- compatible = "ti,omap4-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- };
	+ /* mmu_dsp cannot be moved before reset driver */
	+ status = "disabled";
	};

	target-module@70000 { /* 0x4a070000, ap 79 2e.0 */
	@@ -434,6 +430,7 @@

	target-module@0 { /* 0x4a080000, ap 83 28.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "ocp2scp1";
	reg = <0x0 0x4>,
	<0x10 0x4>,
	<0x14 0x4>;
	@@ -491,6 +488,7 @@

	target-module@10000 { /* 0x4a090000, ap 89 36.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "ocp2scp3";
	reg = <0x10000 0x4>,
	<0x10010 0x4>,
	<0x10014 0x4>;
	@@ -595,6 +593,7 @@

	target-module@74000 { /* 0x4a0f4000, ap 25 04.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mailbox";
	reg = <0x74000 0x4>,
	<0x74010 0x4>;
	reg-names = "rev", "sysc";
	@@ -629,6 +628,7 @@

	target-module@76000 { /* 0x4a0f6000, ap 27 0c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "spinlock";
	reg = <0x76000 0x4>,
	<0x76010 0x4>,
	<0x76014 0x4>;
	@@ -1033,6 +1033,7 @@

	target-module@20000 { /* 0x48020000, ap 3 04.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart3";
	reg = <0x20050 0x4>,
	<0x20054 0x4>,
	<0x20058 0x4>;
	@@ -1062,6 +1063,7 @@

	target-module@32000 { /* 0x48032000, ap 5 3e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer2";
	reg = <0x32000 0x4>,
	<0x32010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1089,6 +1091,7 @@

	target-module@34000 { /* 0x48034000, ap 7 46.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer3";
	reg = <0x34000 0x4>,
	<0x34010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1116,6 +1119,7 @@

	target-module@36000 { /* 0x48036000, ap 9 4e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer4";
	reg = <0x36000 0x4>,
	<0x36010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1143,6 +1147,7 @@

	target-module@3e000 { /* 0x4803e000, ap 11 56.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer9";
	reg = <0x3e000 0x4>,
	<0x3e010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1171,6 +1176,7 @@

	target-module@51000 { /* 0x48051000, ap 45 2e.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio7";
	reg = <0x51000 0x4>,
	<0x51010 0x4>,
	<0x51114 0x4>;
	@@ -1204,6 +1210,7 @@

	target-module@53000 { /* 0x48053000, ap 35 36.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio8";
	reg = <0x53000 0x4>,
	<0x53010 0x4>,
	<0x53114 0x4>;
	@@ -1237,6 +1244,7 @@

	target-module@55000 { /* 0x48055000, ap 13 0e.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio2";
	reg = <0x55000 0x4>,
	<0x55010 0x4>,
	<0x55114 0x4>;
	@@ -1270,6 +1278,7 @@

	target-module@57000 { /* 0x48057000, ap 15 06.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio3";
	reg = <0x57000 0x4>,
	<0x57010 0x4>,
	<0x57114 0x4>;
	@@ -1303,6 +1312,7 @@

	target-module@59000 { /* 0x48059000, ap 17 16.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio4";
	reg = <0x59000 0x4>,
	<0x59010 0x4>,
	<0x59114 0x4>;
	@@ -1336,6 +1346,7 @@

	target-module@5b000 { /* 0x4805b000, ap 19 1e.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio5";
	reg = <0x5b000 0x4>,
	<0x5b010 0x4>,
	<0x5b114 0x4>;
	@@ -1369,6 +1380,7 @@

	target-module@5d000 { /* 0x4805d000, ap 21 26.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio6";
	reg = <0x5d000 0x4>,
	<0x5d010 0x4>,
	<0x5d114 0x4>;
	@@ -1402,6 +1414,7 @@

	target-module@60000 { /* 0x48060000, ap 23 24.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c3";
	reg = <0x60000 0x8>,
	<0x60010 0x8>,
	<0x60090 0x8>;
	@@ -1433,6 +1446,7 @@

	target-module@66000 { /* 0x48066000, ap 63 4c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart5";
	reg = <0x66050 0x4>,
	<0x66054 0x4>,
	<0x66058 0x4>;
	@@ -1462,6 +1476,7 @@

	target-module@68000 { /* 0x48068000, ap 53 54.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart6";
	reg = <0x68050 0x4>,
	<0x68054 0x4>,
	<0x68058 0x4>;
	@@ -1491,6 +1506,7 @@

	target-module@6a000 { /* 0x4806a000, ap 24 0a.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart1";
	reg = <0x6a050 0x4>,
	<0x6a054 0x4>,
	<0x6a058 0x4>;
	@@ -1520,6 +1536,7 @@

	target-module@6c000 { /* 0x4806c000, ap 26 22.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart2";
	reg = <0x6c050 0x4>,
	<0x6c054 0x4>,
	<0x6c058 0x4>;
	@@ -1549,6 +1566,7 @@

	target-module@6e000 { /* 0x4806e000, ap 28 44.1 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "uart4";
	reg = <0x6e050 0x4>,
	<0x6e054 0x4>,
	<0x6e058 0x4>;
	@@ -1578,6 +1596,7 @@

	target-module@70000 { /* 0x48070000, ap 30 14.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c1";
	reg = <0x70000 0x8>,
	<0x70010 0x8>,
	<0x70090 0x8>;
	@@ -1609,6 +1628,7 @@

	target-module@72000 { /* 0x48072000, ap 32 1c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c2";
	reg = <0x72000 0x8>,
	<0x72010 0x8>,
	<0x72090 0x8>;
	@@ -1648,6 +1668,7 @@

	target-module@7a000 { /* 0x4807a000, ap 81 2c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c4";
	reg = <0x7a000 0x8>,
	<0x7a010 0x8>,
	<0x7a090 0x8>;
	@@ -1679,6 +1700,7 @@

	target-module@7c000 { /* 0x4807c000, ap 83 34.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "i2c5";
	reg = <0x7c000 0x8>,
	<0x7c010 0x8>,
	<0x7c090 0x8>;
	@@ -1710,6 +1732,7 @@

	target-module@86000 { /* 0x48086000, ap 41 5e.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer10";
	reg = <0x86000 0x4>,
	<0x86010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1738,6 +1761,7 @@

	target-module@88000 { /* 0x48088000, ap 43 66.0 */
	compatible = "ti,sysc-omap4-timer", "ti,sysc";
	+ ti,hwmods = "timer11";
	reg = <0x88000 0x4>,
	<0x88010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1764,30 +1788,17 @@
	};
	};

	- rng_target: target-module@90000 { /* 0x48090000, ap 55 1a.0 */
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x91fe0 0x4>,
	- <0x91fe4 0x4>;
	- reg-names = "rev", "sysc";
	- ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>;
	- /* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
	- clocks = <&l4sec_clkctrl OMAP5_RNG_CLKCTRL 0>;
	- clock-names = "fck";
	+ target-module@90000 { /* 0x48090000, ap 55 1a.0 */
	+ compatible = "ti,sysc";
	+ status = "disabled";
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0x0 0x90000 0x2000>;
	-
	- rng: rng@0 {
	- compatible = "ti,omap4-rng";
	- reg = <0x0 0x2000>;
	- interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
	- };
	};

	target-module@98000 { /* 0x48098000, ap 47 08.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi1";
	reg = <0x98000 0x4>,
	<0x98010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1826,6 +1837,7 @@

	target-module@9a000 { /* 0x4809a000, ap 49 10.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi2";
	reg = <0x9a000 0x4>,
	<0x9a010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1859,6 +1871,7 @@

	target-module@9c000 { /* 0x4809c000, ap 51 3a.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mmc1";
	reg = <0x9c000 0x4>,
	<0x9c010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1918,6 +1931,7 @@

	target-module@ad000 { /* 0x480ad000, ap 61 20.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mmc3";
	reg = <0xad000 0x4>,
	<0xad010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1958,6 +1972,7 @@

	target-module@b4000 { /* 0x480b4000, ap 65 42.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mmc2";
	reg = <0xb4000 0x4>,
	<0xb4010 0x4>;
	reg-names = "rev", "sysc";
	@@ -1990,6 +2005,7 @@

	target-module@b8000 { /* 0x480b8000, ap 67 32.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi3";
	reg = <0xb8000 0x4>,
	<0xb8010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2020,6 +2036,7 @@

	target-module@ba000 { /* 0x480ba000, ap 69 18.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mcspi4";
	reg = <0xba000 0x4>,
	<0xba010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2050,6 +2067,7 @@

	target-module@d1000 { /* 0x480d1000, ap 71 28.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mmc4";
	reg = <0xd1000 0x4>,
	<0xd1010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2082,6 +2100,7 @@

	target-module@d5000 { /* 0x480d5000, ap 73 30.0 */
	compatible = "ti,sysc-omap4", "ti,sysc";
	+ ti,hwmods = "mmc5";
	reg = <0xd5000 0x4>,
	<0xd5010 0x4>;
	reg-names = "rev", "sysc";
	@@ -2277,6 +2296,7 @@

	target-module@0 { /* 0x4ae10000, ap 5 10.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "gpio1";
	reg = <0x0 0x4>,
	<0x10 0x4>,
	<0x114 0x4>;
	@@ -2311,6 +2331,7 @@

	target-module@4000 { /* 0x4ae14000, ap 7 14.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "wd_timer2";
	reg = <0x4000 0x4>,
	<0x4010 0x4>,
	<0x4014 0x4>;
	@@ -2367,6 +2388,7 @@

	target-module@c000 { /* 0x4ae1c000, ap 11 1c.0 */
	compatible = "ti,sysc-omap2", "ti,sysc";
	+ ti,hwmods = "kbd";
	reg = <0xc000 0x4>,
	<0xc010 0x4>;
	reg-names = "rev", "sysc";
	diff --git a/sys/gnu/dts/arm/omap5.dtsi b/sys/gnu/dts/arm/omap5.dtsi
	--- a/sys/gnu/dts/arm/omap5.dtsi
	+++ b/sys/gnu/dts/arm/omap5.dtsi
	@@ -143,7 +143,6 @@
	#address-cells = <1>;
	#size-cells = <1>;
	ranges = <0 0 0 0xc0000000>;
	- dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
	ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
	reg = <0 0x44000000 0 0x2000>,
	<0 0x44800000 0 0x3000>,
	@@ -163,7 +162,7 @@
	l4_abe: interconnect@40100000 {
	};

	- ocmcram: sram@40300000 {
	+ ocmcram: ocmcram@40300000 {
	compatible = "mmio-sram";
	reg = <0x40300000 0x20000>; /* 128k */
	};
	@@ -187,33 +186,21 @@
	#gpio-cells = <2>;
	};

	- target-module@55082000 {
	- compatible = "ti,sysc-omap2", "ti,sysc";
	- reg = <0x55082000 0x4>,
	- <0x55082010 0x4>,
	- <0x55082014 0x4>;
	- reg-names = "rev", "sysc", "syss";
	- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
	- <SYSC_IDLE_NO>,
	- <SYSC_IDLE_SMART>;
	- ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY \|
	- SYSC_OMAP2_SOFTRESET \|
	- SYSC_OMAP2_AUTOIDLE)>;
	- clocks = <&ipu_clkctrl OMAP5_MMU_IPU_CLKCTRL 0>;
	- clock-names = "fck";
	- resets = <&prm_core 2>;
	- reset-names = "rstctrl";
	- ranges = <0x0 0x55082000 0x100>;
	- #size-cells = <1>;
	- #address-cells = <1>;
	+ mmu_dsp: mmu@4a066000 {
	+ compatible = "ti,omap4-iommu";
	+ reg = <0x4a066000 0x100>;
	+ interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu_dsp";
	+ #iommu-cells = <0>;
	+ };

	- mmu_ipu: mmu@0 {
	- compatible = "ti,omap4-iommu";
	- reg = <0x0 0x100>;
	- interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
	- #iommu-cells = <0>;
	- ti,iommu-bus-err-back;
	- };
	+ mmu_ipu: mmu@55082000 {
	+ compatible = "ti,omap4-iommu";
	+ reg = <0x55082000 0x100>;
	+ interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
	+ ti,hwmods = "mmu_ipu";
	+ #iommu-cells = <0>;
	+ ti,iommu-bus-err-back;
	};

	dmm@4e000000 {
	@@ -448,29 +435,3 @@

	#include "omap5-l4-abe.dtsi"
	#include "omap54xx-clocks.dtsi"
	-
	-&prm {
	- prm_dsp: prm@400 {
	- compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
	- reg = <0x400 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_core: prm@700 {
	- compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
	- reg = <0x700 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_iva: prm@1200 {
	- compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1200 0x100>;
	- #reset-cells = <1>;
	- };
	-
	- prm_device: prm@1c00 {
	- compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
	- reg = <0x1c00 0x100>;
	- #reset-cells = <1>;
	- };
	-};
	diff --git a/sys/gnu/dts/arm/omap54xx-clocks.dtsi b/sys/gnu/dts/arm/omap54xx-clocks.dtsi
	--- a/sys/gnu/dts/arm/omap54xx-clocks.dtsi
	+++ b/sys/gnu/dts/arm/omap54xx-clocks.dtsi
	@@ -1125,17 +1125,11 @@
	#size-cells = <1>;
	ranges = <0 0x1000 0x200>;

	- l4per_clkctrl: clock@20 {
	- compatible = "ti,clkctrl-l4per", "ti,clkctrl";
	+ l4per_clkctrl: clk@20 {
	+ compatible = "ti,clkctrl";
	reg = <0x20 0x15c>;
	#clock-cells = <2>;
	};
	-
	- l4sec_clkctrl: clock@1a0 {
	- compatible = "ti,clkctrl-l4sec", "ti,clkctrl";
	- reg = <0x1a0 0x3c>;
	- #clock-cells = <2>;
	- };
	};

	dss_cm: dss_cm@1400 {
	diff --git a/sys/gnu/dts/include/dt-bindings/clock/dra7.h b/sys/gnu/dts/include/dt-bindings/clock/dra7.h
	--- a/sys/gnu/dts/include/dt-bindings/clock/dra7.h
	+++ b/sys/gnu/dts/include/dt-bindings/clock/dra7.h
	@@ -29,16 +29,6 @@
	#define DRA7_RTC_CLKCTRL_INDEX(offset) ((offset) - DRA7_RTC_CLKCTRL_OFFSET)
	#define DRA7_RTCSS_CLKCTRL DRA7_RTC_CLKCTRL_INDEX(0x44)

	-/* vip clocks */
	-#define DRA7_VIP1_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
	-#define DRA7_VIP2_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
	-#define DRA7_VIP3_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
	-
	-/* vpe clocks */
	-#define DRA7_VPE_CLKCTRL_OFFSET 0x60
	-#define DRA7_VPE_CLKCTRL_INDEX(offset) ((offset) - DRA7_VPE_CLKCTRL_OFFSET)
	-#define DRA7_VPE_CLKCTRL DRA7_VPE_CLKCTRL_INDEX(0x64)
	-
	/* coreaon clocks */
	#define DRA7_SMARTREFLEX_MPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
	#define DRA7_SMARTREFLEX_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x38)
	@@ -88,9 +78,6 @@
	#define DRA7_DSS_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
	#define DRA7_BB2D_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)

	-/* gpu clocks */
	-#define DRA7_GPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
	-
	/* l3init clocks */
	#define DRA7_MMC1_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
	#define DRA7_MMC2_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
	@@ -205,16 +192,6 @@
	/* rtc clocks */
	#define DRA7_RTC_RTCSS_CLKCTRL DRA7_CLKCTRL_INDEX(0x44)

	-/* vip clocks */
	-#define DRA7_CAM_VIP1_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
	-#define DRA7_CAM_VIP2_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
	-#define DRA7_CAM_VIP3_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
	-
	-/* vpe clocks */
	-#define DRA7_VPE_CLKCTRL_OFFSET 0x60
	-#define DRA7_VPE_CLKCTRL_INDEX(offset) ((offset) - DRA7_VPE_CLKCTRL_OFFSET)
	-#define DRA7_VPE_VPE_CLKCTRL DRA7_VPE_CLKCTRL_INDEX(0x64)
	-
	/* coreaon clocks */
	#define DRA7_COREAON_SMARTREFLEX_MPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
	#define DRA7_COREAON_SMARTREFLEX_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x38)
	diff --git a/sys/gnu/dts/include/dt-bindings/clock/omap4.h b/sys/gnu/dts/include/dt-bindings/clock/omap4.h
	--- a/sys/gnu/dts/include/dt-bindings/clock/omap4.h
	+++ b/sys/gnu/dts/include/dt-bindings/clock/omap4.h
	@@ -124,17 +124,6 @@
	#define OMAP4_UART4_CLKCTRL OMAP4_CLKCTRL_INDEX(0x158)
	#define OMAP4_MMC5_CLKCTRL OMAP4_CLKCTRL_INDEX(0x160)

	-/* l4_secure clocks */
	-#define OMAP4_L4_SECURE_CLKCTRL_OFFSET 0x1a0
	-#define OMAP4_L4_SECURE_CLKCTRL_INDEX(offset) ((offset) - OMAP4_L4_SECURE_CLKCTRL_OFFSET)
	-#define OMAP4_AES1_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1a0)
	-#define OMAP4_AES2_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1a8)
	-#define OMAP4_DES3DES_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1b0)
	-#define OMAP4_PKA_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1b8)
	-#define OMAP4_RNG_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1c0)
	-#define OMAP4_SHA2MD5_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1c8)
	-#define OMAP4_CRYPTODMA_CLKCTRL OMAP4_L4_SECURE_CLKCTRL_INDEX(0x1d8)
	-
	/* l4_wkup clocks */
	#define OMAP4_L4_WKUP_CLKCTRL OMAP4_CLKCTRL_INDEX(0x20)
	#define OMAP4_WD_TIMER2_CLKCTRL OMAP4_CLKCTRL_INDEX(0x30)
	diff --git a/sys/gnu/dts/include/dt-bindings/clock/omap5.h b/sys/gnu/dts/include/dt-bindings/clock/omap5.h
	--- a/sys/gnu/dts/include/dt-bindings/clock/omap5.h
	+++ b/sys/gnu/dts/include/dt-bindings/clock/omap5.h
	@@ -16,7 +16,6 @@

	/* abe clocks */
	#define OMAP5_L4_ABE_CLKCTRL OMAP5_CLKCTRL_INDEX(0x20)
	-#define OMAP5_AESS_CLKCTRL OMAP5_CLKCTRL_INDEX(0x28)
	#define OMAP5_MCPDM_CLKCTRL OMAP5_CLKCTRL_INDEX(0x30)
	#define OMAP5_DMIC_CLKCTRL OMAP5_CLKCTRL_INDEX(0x38)
	#define OMAP5_MCBSP1_CLKCTRL OMAP5_CLKCTRL_INDEX(0x48)
	@@ -87,21 +86,6 @@
	#define OMAP5_UART5_CLKCTRL OMAP5_CLKCTRL_INDEX(0x170)
	#define OMAP5_UART6_CLKCTRL OMAP5_CLKCTRL_INDEX(0x178)

	-/* l4_secure clocks */
	-#define OMAP5_L4_SECURE_CLKCTRL_OFFSET 0x1a0
	-#define OMAP5_L4_SECURE_CLKCTRL_INDEX(offset) ((offset) - OMAP5_L4_SECURE_CLKCTRL_OFFSET)
	-#define OMAP5_AES1_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1a0)
	-#define OMAP5_AES2_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1a8)
	-#define OMAP5_DES3DES_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1b0)
	-#define OMAP5_FPKA_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1b8)
	-#define OMAP5_RNG_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1c0)
	-#define OMAP5_SHA2MD5_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1c8)
	-#define OMAP5_DMA_CRYPTO_CLKCTRL OMAP5_L4_SECURE_CLKCTRL_INDEX(0x1d8)
	-
	-/* iva clocks */
	-#define OMAP5_IVA_CLKCTRL OMAP5_CLKCTRL_INDEX(0x20)
	-#define OMAP5_SL2IF_CLKCTRL OMAP5_CLKCTRL_INDEX(0x28)
	-
	/* dss clocks */
	#define OMAP5_DSS_CORE_CLKCTRL OMAP5_CLKCTRL_INDEX(0x20)

	diff --git a/sys/gnu/dts/include/dt-bindings/clock/ti-dra7-atl.h b/sys/gnu/dts/include/dt-bindings/clock/ti-dra7-atl.h
	--- a/sys/gnu/dts/include/dt-bindings/clock/ti-dra7-atl.h
	+++ b/sys/gnu/dts/include/dt-bindings/clock/ti-dra7-atl.h
	@@ -1,40 +0,0 @@
	-/*
	- * This header provides constants for DRA7 ATL (Audio Tracking Logic)
	- *
	- * The constants defined in this header are used in dts files
	- *
	- * Copyright (C) 2013 Texas Instruments, Inc.
	- *
	- * Peter Ujfalusi <peter.ujfalusi@ti.com>
	- *
	- * This program is free software; you can redistribute it and/or modify
	- * it under the terms of the GNU General Public License version 2 as
	- * published by the Free Software Foundation.
	- *
	- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
	- * kind, whether express or implied; without even the implied warranty
	- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	- * GNU General Public License for more details.
	- */
	-
	-#ifndef _DT_BINDINGS_CLK_DRA7_ATL_H
	-#define _DT_BINDINGS_CLK_DRA7_ATL_H
	-
	-#define DRA7_ATL_WS_MCASP1_FSR 0
	-#define DRA7_ATL_WS_MCASP1_FSX 1
	-#define DRA7_ATL_WS_MCASP2_FSR 2
	-#define DRA7_ATL_WS_MCASP2_FSX 3
	-#define DRA7_ATL_WS_MCASP3_FSX 4
	-#define DRA7_ATL_WS_MCASP4_FSX 5
	-#define DRA7_ATL_WS_MCASP5_FSX 6
	-#define DRA7_ATL_WS_MCASP6_FSX 7
	-#define DRA7_ATL_WS_MCASP7_FSX 8
	-#define DRA7_ATL_WS_MCASP8_FSX 9
	-#define DRA7_ATL_WS_MCASP8_AHCLKX 10
	-#define DRA7_ATL_WS_XREF_CLK3 11
	-#define DRA7_ATL_WS_XREF_CLK0 12
	-#define DRA7_ATL_WS_XREF_CLK1 13
	-#define DRA7_ATL_WS_XREF_CLK2 14
	-#define DRA7_ATL_WS_OSC1_X1 15
	-
	-#endif

File Metadata

Mime Type: text/plain
Expires: Mon, Sep 30, 6:24 AM (21 h, 53 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 13152187
Default Alt Text: D26552.diff (209 KB)

D26552.diffNo OneTemporaryActions

D26552.diffView Options

File Metadata

Event Timeline

D26552.diff
No OneTemporary
Actions

D26552.diff
View Options