hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi    |   12 ----
 fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi |   33 ++++++++++++
 fdi/information/10freedesktop/Makefile.am                   |    1 
 3 files changed, 34 insertions(+), 12 deletions(-)

New commits:
commit 516bbb096a364ba10ab709b42ef7bb70c1a6817c
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 16:02:48 2007 +0100

    updated suspend quirks for Samsung with entries from s2ram
    
    Updated suspend quirks for Samsung with entries from s2ram whitelist. Moved
    existing entries from 20-video-quirk-pm-misc.fdi to a new file.
    
    Added new:
    - Q35/Q36, SM40S, R40/R41, SENS V25, R55S

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 245ebfd..f2a4947 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -39,18 +39,6 @@
       </match>
     </match>
   </device>
-  <device>
-    <match key="system.hardware.vendor" prefix="Samsung">
-      <match key="system.hardware.product" string="SX20S">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
-      </match>
-      <match key="system.hardware.product" string="SQ10">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-      </match>
-    </match>
-  </device>
 
   <device>
     <match key="system.hardware.vendor" string="AVERATEC">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
new file mode 100644
index 0000000..2b9fbc0
--- /dev/null
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<deviceinfo version="0.2">
+  <device>
+    <match key="system.hardware.vendor" prefix_ncase="Samsung">
+      <match key="system.hardware.product" string_outof="Q35/Q36;SM40S">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" string="R40/R41">
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+      <!-- Samsung UMPC -->
+      <match key="system.hardware.product" string="R40/R41">
+        <match key="system.hardware.version" string="01ME">
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
+      </match>
+      <match key="system.hardware.product" string_outof="SX20S;SENS V25">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" string="SQ10">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+      <!-- these need no quirks to suspend/resume -->
+      <match key="system.hardware.product" prefix="R55S ">
+        <merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 49aef61..2483287 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -48,6 +48,7 @@ dist_fdi_DATA +=				\
 		20-video-quirk-pm-ibm.fdi	\
 		20-video-quirk-pm-lenovo.fdi	\
 		20-video-quirk-pm-misc.fdi	\
+		20-video-quirk-pm-samsung.fdi   \
 		20-video-quirk-pm-sony.fdi	\
 		20-video-quirk-pm-toshiba.fdi
 endif