Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
3b6919e5
Commit
3b6919e5
authored
Aug 12, 2007
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
pull asus sony thinkpad into release branch
parents
3864e8cc
de47b69c
f7b88ccb
9de1cc4a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
13 deletions
+40
-13
Documentation/thinkpad-acpi.txt
Documentation/thinkpad-acpi.txt
+2
-2
drivers/acpi/asus_acpi.c
drivers/acpi/asus_acpi.c
+1
-0
drivers/char/sonypi.c
drivers/char/sonypi.c
+6
-1
drivers/misc/Kconfig
drivers/misc/Kconfig
+15
-7
drivers/misc/sony-laptop.c
drivers/misc/sony-laptop.c
+6
-1
drivers/misc/thinkpad_acpi.c
drivers/misc/thinkpad_acpi.c
+8
-2
drivers/misc/thinkpad_acpi.h
drivers/misc/thinkpad_acpi.h
+2
-0
No files found.
Documentation/thinkpad-acpi.txt
View file @
3b6919e5
...
...
@@ -105,10 +105,10 @@ The version of thinkpad-acpi's sysfs interface is exported by the driver
as a driver attribute (see below).
Sysfs driver attributes are on the driver's sysfs attribute space,
for 2.6.20 this is /sys/bus/platform/drivers/thinkpad
-
acpi/.
for 2.6.20 this is /sys/bus/platform/drivers/thinkpad
_
acpi/.
Sysfs device attributes are on the driver's sysfs attribute space,
for 2.6.20 this is /sys/devices/platform/thinkpad
-
acpi/.
for 2.6.20 this is /sys/devices/platform/thinkpad
_
acpi/.
Driver version
--------------
...
...
drivers/acpi/asus_acpi.c
View file @
3b6919e5
...
...
@@ -1192,6 +1192,7 @@ static int asus_hotk_get_info(void)
break
;
default:
kfree
(
model
);
model
=
NULL
;
break
;
}
}
...
...
drivers/char/sonypi.c
View file @
3b6919e5
...
...
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
return
0
;
}
const
static
struct
acpi_device_id
sonypi_device_ids
[]
=
{
{
"SNY6001"
,
0
},
{
""
,
0
},
};
static
struct
acpi_driver
sonypi_acpi_driver
=
{
.
name
=
"sonypi"
,
.
class
=
"hkey"
,
.
ids
=
"SNY6001"
,
.
ids
=
sonypi_device_ids
,
.
ops
=
{
.
add
=
sonypi_acpi_add
,
.
remove
=
sonypi_acpi_remove
,
...
...
drivers/misc/Kconfig
View file @
3b6919e5
...
...
@@ -200,14 +200,22 @@ config THINKPAD_ACPI_BAY
config THINKPAD_ACPI_INPUT_ENABLED
bool "Enable input layer support by default"
depends on THINKPAD_ACPI
default
y
default
n
---help---
Enables hot key handling over the input layer by default. If unset,
the driver does not enable any hot key handling by default, and also
starts up with a mostly empty keymap.
If you are not sure, say Y here. Say N to retain the deprecated
behavior of ibm-acpi, and thinkpad-acpi for kernels up to 2.6.21.
This option enables thinkpad-acpi hot key handling over the input
layer at driver load time. When it is unset, the driver does not
enable hot key handling by default, and also starts up with a mostly
empty keymap.
This option should be enabled if you have a new enough HAL or other
userspace support that properly handles the thinkpad-acpi event
device. It auto-tunes the hot key support to those reported by the
firmware and enables it automatically.
If unsure, say N here to retain the old behaviour of ibm-acpi, and
thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and
set up the thinkpad-acpi hot key handling using the sysfs interace
after loading the driver.
endif # MISC_DEVICES
drivers/misc/sony-laptop.c
View file @
3b6919e5
...
...
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = {
};
/* SNC-only model map */
struct
dmi_system_id
sony_nc_ids
[]
=
{
st
atic
st
ruct
dmi_system_id
sony_nc_ids
[]
=
{
{
.
ident
=
"Sony Vaio FE Series"
,
.
callback
=
sony_nc_C_enable
,
...
...
@@ -942,6 +942,11 @@ static int sony_nc_resume(struct acpi_device *device)
}
}
/* set the last requested brightness level */
if
(
sony_backlight_device
&&
!
sony_backlight_update_status
(
sony_backlight_device
))
printk
(
KERN_WARNING
DRV_PFX
"unable to restore brightness level"
);
/* re-initialize models with specific requirements */
dmi_check_system
(
sony_nc_ids
);
...
...
drivers/misc/thinkpad_acpi.c
View file @
3b6919e5
...
...
@@ -4668,12 +4668,15 @@ static int __init thinkpad_acpi_module_init(void)
thinkpad_acpi_module_exit
();
return
ret
;
}
tp_features
.
platform_drv_registered
=
1
;
ret
=
tpacpi_create_driver_attributes
(
&
tpacpi_pdriver
.
driver
);
if
(
ret
)
{
printk
(
IBM_ERR
"unable to create sysfs driver attributes
\n
"
);
thinkpad_acpi_module_exit
();
return
ret
;
}
tp_features
.
platform_drv_attrs_registered
=
1
;
/* Device initialization */
...
...
@@ -4756,8 +4759,11 @@ static void thinkpad_acpi_module_exit(void)
if
(
tpacpi_pdev
)
platform_device_unregister
(
tpacpi_pdev
);
tpacpi_remove_driver_attributes
(
&
tpacpi_pdriver
.
driver
);
platform_driver_unregister
(
&
tpacpi_pdriver
);
if
(
tp_features
.
platform_drv_attrs_registered
)
tpacpi_remove_driver_attributes
(
&
tpacpi_pdriver
.
driver
);
if
(
tp_features
.
platform_drv_registered
)
platform_driver_unregister
(
&
tpacpi_pdriver
);
if
(
proc_dir
)
remove_proc_entry
(
IBM_PROC_DIR
,
acpi_root_dir
);
...
...
drivers/misc/thinkpad_acpi.h
View file @
3b6919e5
...
...
@@ -246,6 +246,8 @@ static struct {
u16
wan
:
1
;
u16
fan_ctrl_status_undef
:
1
;
u16
input_device_registered
:
1
;
u16
platform_drv_registered
:
1
;
u16
platform_drv_attrs_registered
:
1
;
}
tp_features
;
struct
thinkpad_id_data
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment