diff --git a/src/mainboard/google/beltino/devicetree.cb b/src/mainboard/google/beltino/devicetree.cb
index a976b8d186..2dfa382491 100644
--- a/src/mainboard/google/beltino/devicetree.cb
+++ b/src/mainboard/google/beltino/devicetree.cb
@@ -1,26 +1,14 @@
 chip northbridge/intel/haswell
 
-	# Enable eDP Hotplug with 6ms pulse
-	register "gpu_dp_d_hotplug" = "0x06"
+	# Disable eDP Hotplug
+	register "gpu_dp_d_hotplug" = "0x00"
 
-	# Disable DisplayPort C Hotplug
-	register "gpu_dp_c_hotplug" = "0x00"
+	# Enable DisplayPort C Hotplug with 6ms pulse
+	register "gpu_dp_c_hotplug" = "0x06"
 
 	# Enable HDMI Hotplug with 6ms pulse
 	register "gpu_dp_b_hotplug" = "0x06"
 
-	# Set backlight PWM values for eDP
-	register "gpu_cpu_backlight" = "0x00000200"
-	register "gpu_pch_backlight" = "0x04000000"
-
-	# Enable Panel and configure power delays
-	register "gpu_panel_port_select" = "1"			# eDP
-	register "gpu_panel_power_cycle_delay" = "5"		# 400ms (T4)
-	register "gpu_panel_power_up_delay" = "600"		# 60ms  (T1+T2)
-	register "gpu_panel_power_down_delay" = "600"		# 60ms  (T3+T7)
-	register "gpu_panel_power_backlight_on_delay" = "2100"	# 210ms (T5)
-	register "gpu_panel_power_backlight_off_delay" = "2100"	# 210ms (T6)
-
 	device cpu_cluster 0 on
 		chip cpu/intel/socket_rPGA989
 			device lapic 0 on end
@@ -40,6 +28,7 @@ chip northbridge/intel/haswell
 	end
 
 	device domain 0 on
+		subsystemid 0x1ae0 0xc000 inherit
 		device pci 00.0 on end # host bridge
 		device pci 02.0 on end # vga controller
 		device pci 03.0 on end # mini-hd audio
@@ -54,9 +43,8 @@ chip northbridge/intel/haswell
 			register "pirqg_routing" = "0x80"
 			register "pirqh_routing" = "0x80"
 
-			# EC range is 0x800-0x9ff
-			register "gen1_dec" = "0x00fc0801"
-			register "gen2_dec" = "0x00fc0901"
+			# SuperIO range is 0x700-0x73f
+			register "gen2_dec" = "0x003c0701"
 
 			# EC_SMI is GPIO34
 			register "alt_gp_smi_en" = "0x0004"