mb/lenovo/t430|t530: Reduces differences in code

Make the T430 look like the T530 codebase by reordering includes,
update the ACPI code and update the CMOS defaults file. Should have
not influence on functionality, but changes the TIMELESS build artifacts.

Change-Id: I2c300ecbf44fa950183ee5e05ba1e05cdf5ff00d
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91281
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/mainboard/lenovo/t430/cmos.default

@@ -15,6 +15,6 @@ fn_ctrl_swap=Disable
 sticky_fn=Disable
 trackpoint=Enable
 backlight=Both
-usb_always_on=Disable
 hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable
 me_state=Normal

src/mainboard/lenovo/t430/cmos.layout

@@ -41,6 +41,7 @@ entries
 # coreboot config options: northbridge
 432	3	e	11	gfx_uma_size
 435	2	e	12	hybrid_graphics_mode
+
 440	8	h	0	volume
 
 # VBOOT

src/mainboard/lenovo/t430/dsdt.asl

@@ -11,24 +11,29 @@ DefinitionBlock(
 	ACPI_DSDT_REV_2,
 	OEM_ID,
 	ACPI_TABLE_CREATOR,
-	0x20141018	// OEM revision
+	0x20110725	// OEM revision
 )
 {
 	#include <acpi/dsdt_top.asl>
-	#include "acpi/platform.asl"
-	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <southbridge/intel/common/acpi/platform.asl>
-	/* global NVS and variables. */
+
+	#include "acpi/platform.asl"
+
+	// global NVS and variables
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
-	#include <southbridge/intel/common/acpi/sleepstates.asl>
+
+	#include <cpu/intel/common/acpi/cpu.asl>
 
 	Scope (\_SB) {
 		Device (PCI0)
 		{
 			#include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
-			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 			#include <southbridge/intel/bd82x6x/acpi/pch.asl>
+
+			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 		}
 	}
+
+	#include <southbridge/intel/common/acpi/sleepstates.asl>
 	#include <ec/lenovo/h8/acpi/thinklight.asl>
 }

src/mainboard/lenovo/t430/smihandler.c

@@ -5,8 +5,8 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/pmutil.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13

src/mainboard/lenovo/t530/early_init.c

@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <types.h>
-#include <device/device.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
+#include <ec/lenovo/pmh7/pmh7.h>
 #include <drivers/i2c/at24rf08c/lenovo.h>
-#include <northbridge/intel/sandybridge/sandybridge.h>
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
+#include <northbridge/intel/sandybridge/sandybridge.h>
 
 static void hybrid_graphics_init(void)
 {