Skip to content

Commit c3c3f4c

Browse files
dabracedabrace
committed
Merge pull request #40 from torvalds/master
Sync up with Linus
2 parents 56c3bfa + 3d88348 commit c3c3f4c

File tree

141 files changed

+4443
-3533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+4443
-3533
lines changed

‎Documentation/ABI/testing/sysfs-driver-samsung-laptop

+8
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,11 @@ Contact: Corentin Chary <[email protected]>
3535
Description: Use your USB ports to charge devices, even
3636
when your laptop is powered off.
3737
1 means enabled, 0 means disabled.
38+
39+
What: /sys/devices/platform/samsung/lid_handling
40+
Date: December 11, 2014
41+
KernelVersion: 3.19
42+
Contact: Julijonas Kikutis <[email protected]>
43+
Description: Some Samsung laptops handle lid closing quicker and
44+
only handle lid opening with this mode enabled.
45+
1 means enabled, 0 means disabled.

‎Documentation/ABI/testing/sysfs-driver-toshiba_acpi

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_mode
2+
Date: June 8, 2014
3+
KernelVersion: 3.15
4+
Contact: Azael Avalos <[email protected]>
5+
Description: This file controls the keyboard backlight operation mode, valid
6+
values are:
7+
* 0x1 -> FN-Z
8+
* 0x2 -> AUTO (also called TIMER)
9+
* 0x8 -> ON
10+
* 0x10 -> OFF
11+
Note that the kernel 3.16 onwards this file accepts all listed
12+
parameters, kernel 3.15 only accepts the first two (FN-Z and
13+
AUTO).
14+
Users: KToshiba
15+
16+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_timeout
17+
Date: June 8, 2014
18+
KernelVersion: 3.15
19+
Contact: Azael Avalos <[email protected]>
20+
Description: This file controls the timeout of the keyboard backlight
21+
whenever the operation mode is set to AUTO (or TIMER),
22+
valid values range from 0-60.
23+
Note that the kernel 3.15 only had support for the first
24+
keyboard type, the kernel 3.16 added support for the second
25+
type and the range accepted for type 2 is 1-60.
26+
See the entry named "kbd_type"
27+
Users: KToshiba
28+
29+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/position
30+
Date: June 8, 2014
31+
KernelVersion: 3.15
32+
Contact: Azael Avalos <[email protected]>
33+
Description: This file shows the absolute position of the built-in
34+
accelereometer.
35+
36+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/touchpad
37+
Date: June 8, 2014
38+
KernelVersion: 3.15
39+
Contact: Azael Avalos <[email protected]>
40+
Description: This files controls the status of the touchpad and pointing
41+
stick (if available), valid values are:
42+
* 0 -> OFF
43+
* 1 -> ON
44+
Users: KToshiba
45+
46+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/available_kbd_modes
47+
Date: August 3, 2014
48+
KernelVersion: 3.16
49+
Contact: Azael Avalos <[email protected]>
50+
Description: This file shows the supported keyboard backlight modes
51+
the system supports, which can be:
52+
* 0x1 -> FN-Z
53+
* 0x2 -> AUTO (also called TIMER)
54+
* 0x8 -> ON
55+
* 0x10 -> OFF
56+
Note that not all keyboard types support the listed modes.
57+
See the entry named "available_kbd_modes"
58+
Users: KToshiba
59+
60+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_type
61+
Date: August 3, 2014
62+
KernelVersion: 3.16
63+
Contact: Azael Avalos <[email protected]>
64+
Description: This file shows the current keyboard backlight type,
65+
which can be:
66+
* 1 -> Type 1, supporting modes FN-Z and AUTO
67+
* 2 -> Type 2, supporting modes TIMER, ON and OFF
68+
Users: KToshiba
69+
70+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/version
71+
Date: February, 2015
72+
KernelVersion: 3.20
73+
Contact: Azael Avalos <[email protected]>
74+
Description: This file shows the current version of the driver
75+
76+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/fan
77+
Date: February, 2015
78+
KernelVersion: 3.20
79+
Contact: Azael Avalos <[email protected]>
80+
Description: This file controls the state of the internal fan, valid
81+
values are:
82+
* 0 -> OFF
83+
* 1 -> ON
84+
85+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_function_keys
86+
Date: February, 2015
87+
KernelVersion: 3.20
88+
Contact: Azael Avalos <[email protected]>
89+
Description: This file controls the Special Functions (hotkeys) operation
90+
mode, valid values are:
91+
* 0 -> Normal Operation
92+
* 1 -> Special Functions
93+
In the "Normal Operation" mode, the F{1-12} keys are as usual
94+
and the hotkeys are accessed via FN-F{1-12}.
95+
In the "Special Functions" mode, the F{1-12} keys trigger the
96+
hotkey and the F{1-12} keys are accessed via FN-F{1-12}.
97+
98+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/panel_power_on
99+
Date: February, 2015
100+
KernelVersion: 3.20
101+
Contact: Azael Avalos <[email protected]>
102+
Description: This file controls whether the laptop should turn ON whenever
103+
the LID is opened, valid values are:
104+
* 0 -> Disabled
105+
* 1 -> Enabled
106+
107+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_three
108+
Date: February, 2015
109+
KernelVersion: 3.20
110+
Contact: Azael Avalos <[email protected]>
111+
Description: This file controls whether the USB 3 functionality, valid
112+
values are:
113+
* 0 -> Disabled (Acts as a regular USB 2)
114+
* 1 -> Enabled (Full USB 3 functionality)

‎Documentation/devicetree/bindings/thermal/exynos-thermal.txt

+21
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4
1313
Exynos5420 (Must pass triminfo base and triminfo clock)
1414
"samsung,exynos5440-tmu"
15+
"samsung,exynos7-tmu"
1516
- interrupt-parent : The phandle for the interrupt controller
1617
- reg : Address range of the thermal registers. For soc's which has multiple
1718
instances of TMU and some registers are shared across all TMU's like
@@ -32,13 +33,28 @@
3233
- clocks : The main clocks for TMU device
3334
-- 1. operational clock for TMU channel
3435
-- 2. optional clock to access the shared registers of TMU channel
36+
-- 3. optional special clock for functional operation
3537
- clock-names : Thermal system clock name
3638
-- "tmu_apbif" operational clock for current TMU channel
3739
-- "tmu_triminfo_apbif" clock to access the shared triminfo register
3840
for current TMU channel
41+
-- "tmu_sclk" clock for functional operation of the current TMU
42+
channel
3943
- vtmu-supply: This entry is optional and provides the regulator node supplying
4044
voltage to TMU. If needed this entry can be placed inside
4145
board/platform specific dts file.
46+
Following properties are mandatory (depending on SoC):
47+
- samsung,tmu_gain: Gain value for internal TMU operation.
48+
- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage
49+
- samsung,tmu_noise_cancel_mode: Mode for noise cancellation
50+
- samsung,tmu_efuse_value: Default level of temperature - it is needed when
51+
in factory fusing produced wrong value
52+
- samsung,tmu_min_efuse_value: Minimum temperature fused value
53+
- samsung,tmu_max_efuse_value: Maximum temperature fused value
54+
- samsung,tmu_first_point_trim: First point trimming value
55+
- samsung,tmu_second_point_trim: Second point trimming value
56+
- samsung,tmu_default_temp_offset: Default temperature offset
57+
- samsung,tmu_cal_type: Callibration type
4258

4359
Example 1):
4460

@@ -51,6 +67,7 @@ Example 1):
5167
clock-names = "tmu_apbif";
5268
status = "disabled";
5369
vtmu-supply = <&tmu_regulator_node>;
70+
#include "exynos4412-tmu-sensor-conf.dtsi"
5471
};
5572

5673
Example 2):
@@ -61,6 +78,7 @@ Example 2):
6178
interrupts = <0 58 0>;
6279
clocks = <&clock 21>;
6380
clock-names = "tmu_apbif";
81+
#include "exynos5440-tmu-sensor-conf.dtsi"
6482
};
6583

6684
Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
@@ -70,6 +88,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
7088
interrupts = <0 184 0>;
7189
clocks = <&clock 318>, <&clock 318>;
7290
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
91+
#include "exynos4412-tmu-sensor-conf.dtsi"
7392
};
7493

7594
tmu_cpu3: tmu@1006c000 {
@@ -78,6 +97,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
7897
interrupts = <0 185 0>;
7998
clocks = <&clock 318>, <&clock 319>;
8099
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
100+
#include "exynos4412-tmu-sensor-conf.dtsi"
81101
};
82102

83103
tmu_gpu: tmu@100a0000 {
@@ -86,6 +106,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
86106
interrupts = <0 215 0>;
87107
clocks = <&clock 319>, <&clock 318>;
88108
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
109+
#include "exynos4412-tmu-sensor-conf.dtsi"
89110
};
90111

91112
Note: For multi-instance tmu each instance should have an alias correctly

0 commit comments

Comments
 (0)