View | Details | Raw Unified | Return to bug 119206
Collapse All | Expand All

(-)linux/drivers/acpi/asus_acpi.c (-2 / +18 lines)
Lines 124-129 Link Here
124
		L3D,      //L3400D
124
		L3D,      //L3400D
125
		L3H,      //L3H, but also L2000E
125
		L3H,      //L3H, but also L2000E
126
		L4R,      //L4500R
126
		L4R,      //L4500R
127
		L5D,	  //L5000D/DF 
127
		L5x,      //L5800C 
128
		L5x,      //L5800C 
128
		L8L,      //L8400L
129
		L8L,      //L8400L
129
		M1A,      //M1300A
130
		M1A,      //M1300A
Lines 263-268 Link Here
263
		.display_get       = "\\_SB.PCI0.P0P1.VGA.GETD"
264
		.display_get       = "\\_SB.PCI0.P0P1.VGA.GETD"
264
	},
265
	},
265
266
267
        {
268
                .name              = "L5D",
269
                .mt_mled           = "MLED",
270
/* WLED present, but not controlled by ACPI */
271
/* TLED does not exist */
272
/* .mt_lcd_switch does not exist - handled by hardware */
273
/* .lcd_status  - unneccesary, see above */
274
                .brightness_set    = "SPLV",
275
                .brightness_get    = "GPLV",
276
                .display_set       = "SDSP",
277
                .display_get       = "\\INFB"
278
        },
279
266
	{
280
	{
267
		.name              = "L5x",
281
		.name              = "L5x",
268
		.mt_mled           = "MLED",
282
		.mt_mled           = "MLED",
Lines 622-628 Link Here
622
{
636
{
623
	int lcd = 0;
637
	int lcd = 0;
624
638
625
	if (hotk->model != L3H) {
639
	if (hotk->model != L3H && hotk->model != L5D) {
626
	/* We don't have to check anything if we are here */
640
	/* We don't have to check anything if we are here */
627
		if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd))
641
		if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd))
628
			printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
642
			printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
Lines 667-673 Link Here
667
	lcd = value ? 1 : 0;
681
	lcd = value ? 1 : 0;
668
	if (lcd != get_lcd_state()) {
682
	if (lcd != get_lcd_state()) {
669
		/* switch */
683
		/* switch */
670
		if (hotk->model != L3H) {
684
		if (hotk->model != L3H && hotk->model != L5D) {
671
			status =
685
			status =
672
			    acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
686
			    acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
673
						 NULL, NULL);
687
						 NULL, NULL);
Lines 1054-1059 Link Here
1054
		hotk->model = A2x;
1068
		hotk->model = A2x;
1055
	else if (strncmp(model->string.pointer, "J1", 2) == 0)
1069
	else if (strncmp(model->string.pointer, "J1", 2) == 0)
1056
		hotk->model = S2x;
1070
		hotk->model = S2x;
1071
	else if (strncmp(model->string.pointer, "L5D", 3) == 0)
1072
                hotk->model = L5D;
1057
	else if (strncmp(model->string.pointer, "L5", 2) == 0)
1073
	else if (strncmp(model->string.pointer, "L5", 2) == 0)
1058
		hotk->model = L5x;
1074
		hotk->model = L5x;
1059
1075

Return to bug 119206