diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi
index ff70c58..734cef2 100644
--- a/arch/arm/boot/dts/bcm2708_common.dtsi
+++ b/arch/arm/boot/dts/bcm2708_common.dtsi
@@ -84,9 +84,57 @@
 			status = "disabled";
 		};

+		usb: usb@7e980000 {
+			compatible = "brcm,bcm2708-usb";
+			reg = <0x7e980000 0x10000>,
+			      <0x7e006000 0x1000>;
+			interrupts = <2 0>,
+				     <1 9>;
+		};
+
+		fb: fb {
+			compatible = "brcm,bcm2708-fb";
+		};
+
 		leds: leds {
 			compatible = "gpio-leds";
 		};
+
+		thermal {
+			compatible = "brcm,bcm2835-thermal";
+		};
+
+		audio@0 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@1 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@2 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@3 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@4 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@5 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@6 {
+			compatible = "brcm,bcm2835-audio";
+		};
+
+		audio@7 {
+			compatible = "brcm,bcm2835-audio";
+		};
 	};

 	clocks {
diff --git a/arch/arm/mach-bcm2709/bcm2709.c b/arch/arm/mach-bcm2709/bcm2709.c
index 56d16a4..afd7b01 100644
--- a/arch/arm/mach-bcm2709/bcm2709.c
+++ b/arch/arm/mach-bcm2709/bcm2709.c
@@ -903,8 +903,8 @@ void __init bcm2709_init(void)
 #ifdef SYSTEM_TIMER
 	bcm_register_device(&bcm2708_systemtimer_device);
 #endif
-	bcm_register_device(&bcm2708_fb_device);
-	bcm_register_device(&bcm2708_usb_device);
+	bcm_register_device_dt(&bcm2708_fb_device);
+	bcm_register_device_dt(&bcm2708_usb_device);
 	bcm_register_device(&bcm2708_uart1_device);
 	bcm_register_device(&bcm2708_powerman_device);

@@ -913,7 +913,7 @@ void __init bcm2709_init(void)
 #endif
 	bcm2709_init_led();
 	for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
-		bcm_register_device(&bcm2708_alsa_devices[i]);
+		bcm_register_device_dt(&bcm2708_alsa_devices[i]);

 	bcm_register_device_dt(&bcm2708_spi_device);

@@ -927,7 +927,7 @@ void __init bcm2709_init(void)
 	}

 	bcm_register_device(&bcm2835_hwmon_device);
-	bcm_register_device(&bcm2835_thermal_device);
+	bcm_register_device_dt(&bcm2835_thermal_device);

 #if defined(CONFIG_SND_BCM2708_SOC_I2S) || defined(CONFIG_SND_BCM2708_SOC_I2S_MODULE)
 	bcm_register_device_dt(&bcm2708_i2s_device);
diff --git a/drivers/thermal/bcm2835-thermal.c b/drivers/thermal/bcm2835-thermal.c
index 85fceb5..21a1010 100644
--- a/drivers/thermal/bcm2835-thermal.c
+++ b/drivers/thermal/bcm2835-thermal.c
@@ -167,12 +167,18 @@ static struct thermal_zone_device_ops ops  = {
 	.get_mode = bcm2835_get_mode,
 };

-/* Thermal Driver */
+static const struct of_device_id bcm2835_thermal_of_match_table[] = {
+	{ .compatible = "brcm,bcm2835-thermal", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, bcm2835_thermal_of_match_table);
+
 static struct platform_driver bcm2835_thermal_driver = {
 	.probe = bcm2835_thermal_probe,
 	.remove = bcm2835_thermal_remove,
 	.driver = {
 				.name = "bcm2835_thermal",
+				.of_match_table = bcm2835_thermal_of_match_table,
 				.owner = THIS_MODULE,
 			},
 };
diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
index dc7cd32..53307f0 100644
--- a/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
@@ -1043,9 +1043,16 @@ static struct platform_device_id platform_ids[] = {
 };
 MODULE_DEVICE_TABLE(platform, platform_ids);

+static const struct of_device_id dwc_otg_of_match_table[] = {
+	{ .compatible = "brcm,bcm2708-usb", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, dwc_otg_of_match_table);
+
 static struct platform_driver dwc_otg_driver = {
 	.driver = {
 		.name = (char *)dwc_driver_name,
+		.of_match_table = dwc_otg_of_match_table,
 		},
         .id_table = platform_ids,

diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
index f632750..1d61f68 100644
--- a/drivers/video/fbdev/bcm2708_fb.c
+++ b/drivers/video/fbdev/bcm2708_fb.c
@@ -781,11 +781,18 @@ static int bcm2708_fb_remove(struct platform_device *dev)
 	return 0;
 }

+static const struct of_device_id bcm2708_fb_of_match_table[] = {
+	{ .compatible = "brcm,bcm2708-fb", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, bcm2708_fb_of_match_table);
+
 static struct platform_driver bcm2708_fb_driver = {
 	.probe = bcm2708_fb_probe,
 	.remove = bcm2708_fb_remove,
 	.driver = {
 		   .name = DRIVER_NAME,
+		   .of_match_table = bcm2708_fb_of_match_table,
 		   .owner = THIS_MODULE,
 		   },
 };
diff --git a/sound/arm/bcm2835.c b/sound/arm/bcm2835.c
old mode 100755
new mode 100644
index 7ed5079..95abab6
--- a/sound/arm/bcm2835.c
+++ b/sound/arm/bcm2835.c
@@ -1,3 +1,5 @@
+#define AUDIO_DEBUG_ENABLE
+#define AUDIO_VERBOSE_DEBUG_ENABLE
 /*****************************************************************************
 * Copyright 2011 Broadcom Corporation.  All rights reserved.
 *
@@ -224,6 +226,12 @@ static int snd_bcm2835_alsa_resume(struct platform_device *pdev)

 #endif

+static const struct of_device_id snd_bcm2835_of_match_table[] = {
+	{ .compatible = "brcm,bcm2835-audio", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table);
+
 static struct platform_driver bcm2835_alsa0_driver = {
 	.probe = snd_bcm2835_alsa_probe,
 	.remove = snd_bcm2835_alsa_remove,
@@ -233,6 +241,7 @@ static struct platform_driver bcm2835_alsa0_driver = {
 #endif
 	.driver = {
 		   .name = "bcm2835_AUD0",
+		   .of_match_table = snd_bcm2835_of_match_table,
 		   .owner = THIS_MODULE,
 		   },
 };