gma ACPI: Consolidate non-PCH and PCH brightness levels

The two cases only differ in the register locations.

As the values in BRIG were all the same, consolidate them. They also
got normalized to percentages as the ACPI spec wants that (0x61 was 100%
before).

Change-Id: I9216a953bb89458ed102c39194ea370cbf463d5e
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: http://review.coreboot.org/11703
Tested-by: build bot (Jenkins)
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>

src/drivers/intel/gma/acpi/brightness_levels.asl

@@ -0,0 +1,35 @@
+	Name (BRIG, Package (0x12)
+	{
+		100, /* default AC */
+		100, /* default Battery */
+		  2,
+		  4,
+		  5,
+		  7,
+		  9,
+		 11,
+		 13,
+		 18,
+		 20,
+		 24,
+		 29,
+		 33,
+		 40,
+		 50,
+		 67,
+		100,
+	})
+
+	Method (XBCM, 1, NotSerialized)
+	{
+		Store (ShiftLeft (Arg0, 4), BCLV)
+		Store (0x80000000, CR1)
+		Store (0x0610, BCLM)
+	}
+
+	Method (XBQC, 0, NotSerialized)
+	{
+		Store (BCLV, Local0)
+		ShiftRight (Local0, 4, Local0)
+		Return (Local0)
+	}

src/drivers/intel/gma/acpi/non-pch.asl

@@ -34,44 +34,11 @@ Device (GFX0)
 	{
 		Offset (0x61250),
 		CR1, 32,
+		Offset (0x61254),
 		BCLV, 16,
 		BCLM, 16,
 	}
 
-	Name (BRIG, Package (0x12)
+#include "brightness_levels.asl"
-	{
-		0x61,
-		0x61,
-		0x2,
-		0x4,
-		0x5,
-		0x7,
-		0x9,
-		0xb,
-		0xd,
-		0x11,
-		0x14,
-		0x17,
-		0x1c,
-		0x20,
-		0x27,
-		0x31,
-		0x41,
-		0x61,
-	})
-
-	Method (XBCM, 1, NotSerialized)
-	{
-		Store (ShiftLeft (Arg0, 4), BCLV)
-		Store (0x80000000, CR1)
-		Store (0x0610, BCLM)
-	}
-
-	Method (XBQC, 0, NotSerialized)
-	{
-		Store (BCLV, Local0)
-		ShiftRight (Local0, 4, Local0)
-		Return (Local0)
-	}
 #include "common.asl"
 }

src/drivers/intel/gma/acpi/pch.asl

@@ -36,43 +36,10 @@ Device (GFX0)
 		BCLV, 16,
 		Offset (0xc8250),
 		CR1, 32,
-			CR2, 32
+		Offset (0xc8256),
+		BCLM, 16
 	}
 
-	Name (BRIG, Package (0x12)
+#include "brightness_levels.asl"
-	{
-		0x61,
-		0x61,
-		0x2,
-		0x4,
-		0x5,
-		0x7,
-		0x9,
-		0xb,
-		0xd,
-		0x11,
-		0x14,
-		0x17,
-		0x1c,
-		0x20,
-		0x27,
-		0x31,
-		0x41,
-		0x61,
-	})
-
-	Method (XBCM, 1, NotSerialized)
-	{
-		Store (ShiftLeft (Arg0, 4), BCLV)
-		Store (0x80000000, CR1)
-		Store (0x061a061a, CR2)
-	}
-
-	Method (XBQC, 0, NotSerialized)
-	{
-		Store (BCLV, Local0)
-		ShiftRight (Local0, 4, Local0)
-		Return (Local0)
-	}
 #include "common.asl"
 }