Skip to content

Commit 604a98f

Browse files
KAGA-KOKOKAGA-KOKO
committed
Merge branch 'timers/urgent' into timers/core
Pick up urgent fixes to apply dependent cleanup patch
2 parents 1cfd904 + 7dba33c commit 604a98f

File tree

674 files changed

+8472
-4792
lines changed

Some content is hidden

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

674 files changed

+8472
-4792
lines changed

‎Documentation/core-api/kernel-api.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,19 @@ Sorting
136136
.. kernel-doc:: lib/list_sort.c
137137
:export:
138138

139+
Text Searching
140+
--------------
141+
142+
.. kernel-doc:: lib/textsearch.c
143+
:doc: ts_intro
144+
145+
.. kernel-doc:: lib/textsearch.c
146+
:export:
147+
148+
.. kernel-doc:: include/linux/textsearch.h
149+
:functions: textsearch_find textsearch_next \
150+
textsearch_get_pattern textsearch_get_pattern_len
151+
139152
UUID/GUID
140153
---------
141154

‎Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Required properties:
2121
- interrupts : identifier to the device interrupt
2222
- clocks : a list of phandle + clock-specifier pairs, one for each
2323
entry in clock names.
24-
- clocks-names :
24+
- clock-names :
2525
* "xtal" for external xtal clock identifier
2626
* "pclk" for the bus core clock, either the clk81 clock or the gate clock
2727
* "baud" for the source of the baudrate generator, can be either the xtal

‎Documentation/devicetree/bindings/serial/mvebu-uart.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Required properties:
2424
- Must contain two elements for the extended variant of the IP
2525
(marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",
2626
respectively the UART TX interrupt and the UART RX interrupt. A
27-
corresponding interrupts-names property must be defined.
27+
corresponding interrupt-names property must be defined.
2828
- For backward compatibility reasons, a single element interrupts
2929
property is also supported for the standard variant of the IP,
3030
containing only the UART sum interrupt. This form is deprecated

‎Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Required properties:
1717
- "renesas,scifa-r8a7745" for R8A7745 (RZ/G1E) SCIFA compatible UART.
1818
- "renesas,scifb-r8a7745" for R8A7745 (RZ/G1E) SCIFB compatible UART.
1919
- "renesas,hscif-r8a7745" for R8A7745 (RZ/G1E) HSCIF compatible UART.
20+
- "renesas,scif-r8a77470" for R8A77470 (RZ/G1C) SCIF compatible UART.
21+
- "renesas,hscif-r8a77470" for R8A77470 (RZ/G1C) HSCIF compatible UART.
2022
- "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.
2123
- "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.
2224
- "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.

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

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,6 @@ on the SoC (only first trip points defined in DT will be configured):
4949
- samsung,exynos5433-tmu: 8
5050
- samsung,exynos7-tmu: 8
5151

52-
Following properties are mandatory (depending on SoC):
53-
- samsung,tmu_gain: Gain value for internal TMU operation.
54-
- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage
55-
- samsung,tmu_noise_cancel_mode: Mode for noise cancellation
56-
- samsung,tmu_efuse_value: Default level of temperature - it is needed when
57-
in factory fusing produced wrong value
58-
- samsung,tmu_min_efuse_value: Minimum temperature fused value
59-
- samsung,tmu_max_efuse_value: Maximum temperature fused value
60-
- samsung,tmu_first_point_trim: First point trimming value
61-
- samsung,tmu_second_point_trim: Second point trimming value
62-
- samsung,tmu_default_temp_offset: Default temperature offset
63-
- samsung,tmu_cal_type: Callibration type
64-
6552
** Optional properties:
6653

6754
- vtmu-supply: This entry is optional and provides the regulator node supplying
@@ -78,7 +65,7 @@ Example 1):
7865
clocks = <&clock 383>;
7966
clock-names = "tmu_apbif";
8067
vtmu-supply = <&tmu_regulator_node>;
81-
#include "exynos4412-tmu-sensor-conf.dtsi"
68+
#thermal-sensor-cells = <0>;
8269
};
8370

8471
Example 2):
@@ -89,7 +76,7 @@ Example 2):
8976
interrupts = <0 58 0>;
9077
clocks = <&clock 21>;
9178
clock-names = "tmu_apbif";
92-
#include "exynos5440-tmu-sensor-conf.dtsi"
79+
#thermal-sensor-cells = <0>;
9380
};
9481

9582
Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
@@ -99,7 +86,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
9986
interrupts = <0 184 0>;
10087
clocks = <&clock 318>, <&clock 318>;
10188
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
102-
#include "exynos4412-tmu-sensor-conf.dtsi"
89+
#thermal-sensor-cells = <0>;
10390
};
10491

10592
tmu_cpu3: tmu@1006c000 {
@@ -108,7 +95,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
10895
interrupts = <0 185 0>;
10996
clocks = <&clock 318>, <&clock 319>;
11097
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
111-
#include "exynos4412-tmu-sensor-conf.dtsi"
98+
#thermal-sensor-cells = <0>;
11299
};
113100

114101
tmu_gpu: tmu@100a0000 {
@@ -117,7 +104,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
117104
interrupts = <0 215 0>;
118105
clocks = <&clock 319>, <&clock 318>;
119106
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
120-
#include "exynos4412-tmu-sensor-conf.dtsi"
107+
#thermal-sensor-cells = <0>;
121108
};
122109

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

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ of heat dissipation). For example a fan's cooling states correspond to
5555
the different fan speeds possible. Cooling states are referred to by
5656
single unsigned integers, where larger numbers mean greater heat
5757
dissipation. The precise set of cooling states associated with a device
58-
(as referred to by the cooling-min-level and cooling-max-level
59-
properties) should be defined in a particular device's binding.
58+
should be defined in a particular device's binding.
6059
For more examples of cooling devices, refer to the example sections below.
6160

6261
Required properties:
@@ -69,15 +68,6 @@ Required properties:
6968
See Cooling device maps section below for more details
7069
on how consumers refer to cooling devices.
7170

72-
Optional properties:
73-
- cooling-min-level: An integer indicating the smallest
74-
Type: unsigned cooling state accepted. Typically 0.
75-
Size: one cell
76-
77-
- cooling-max-level: An integer indicating the largest
78-
Type: unsigned cooling state accepted.
79-
Size: one cell
80-
8171
* Trip points
8272

8373
The trip node is a node to describe a point in the temperature domain
@@ -226,8 +216,6 @@ cpus {
226216
396000 950000
227217
198000 850000
228218
>;
229-
cooling-min-level = <0>;
230-
cooling-max-level = <3>;
231219
#cooling-cells = <2>; /* min followed by max */
232220
};
233221
...
@@ -241,8 +229,6 @@ cpus {
241229
*/
242230
fan0: fan@48 {
243231
...
244-
cooling-min-level = <0>;
245-
cooling-max-level = <9>;
246232
#cooling-cells = <2>; /* min followed by max */
247233
};
248234
};

‎Documentation/devicetree/bindings/usb/usb-xhci.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ Required properties:
2828
- interrupts: one XHCI interrupt should be described here.
2929

3030
Optional properties:
31-
- clocks: reference to a clock
31+
- clocks: reference to the clocks
32+
- clock-names: mandatory if there is a second clock, in this case
33+
the name must be "core" for the first clock and "reg" for the
34+
second one
3235
- usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM
3336
- usb3-lpm-capable: determines if platform is USB3 LPM capable
3437
- quirk-broken-port-ped: set if the controller has broken port disable mechanism

‎Documentation/driver-api/firmware/request_firmware.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ an error is returned.
1717

1818
request_firmware
1919
----------------
20-
.. kernel-doc:: drivers/base/firmware_class.c
20+
.. kernel-doc:: drivers/base/firmware_loader/main.c
2121
:functions: request_firmware
2222

2323
request_firmware_direct
2424
-----------------------
25-
.. kernel-doc:: drivers/base/firmware_class.c
25+
.. kernel-doc:: drivers/base/firmware_loader/main.c
2626
:functions: request_firmware_direct
2727

2828
request_firmware_into_buf
2929
-------------------------
30-
.. kernel-doc:: drivers/base/firmware_class.c
30+
.. kernel-doc:: drivers/base/firmware_loader/main.c
3131
:functions: request_firmware_into_buf
3232

3333
Asynchronous firmware requests
@@ -41,7 +41,7 @@ in atomic contexts.
4141

4242
request_firmware_nowait
4343
-----------------------
44-
.. kernel-doc:: drivers/base/firmware_class.c
44+
.. kernel-doc:: drivers/base/firmware_loader/main.c
4545
:functions: request_firmware_nowait
4646

4747
Special optimizations on reboot
@@ -50,12 +50,12 @@ Special optimizations on reboot
5050
Some devices have an optimization in place to enable the firmware to be
5151
retained during system reboot. When such optimizations are used the driver
5252
author must ensure the firmware is still available on resume from suspend,
53-
this can be done with firmware_request_cache() insted of requesting for the
54-
firmare to be loaded.
53+
this can be done with firmware_request_cache() instead of requesting for the
54+
firmware to be loaded.
5555

5656
firmware_request_cache()
57-
-----------------------
58-
.. kernel-doc:: drivers/base/firmware_class.c
57+
------------------------
58+
.. kernel-doc:: drivers/base/firmware_loader/main.c
5959
:functions: firmware_request_cache
6060

6161
request firmware API expected driver use

‎Documentation/driver-api/infrastructure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Device Drivers Base
2828
.. kernel-doc:: drivers/base/node.c
2929
:internal:
3030

31-
.. kernel-doc:: drivers/base/firmware_class.c
31+
.. kernel-doc:: drivers/base/firmware_loader/main.c
3232
:export:
3333

3434
.. kernel-doc:: drivers/base/transport_class.c

‎Documentation/driver-api/usb/typec.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ If the connector is dual-role capable, there may also be a switch for the data
210210
role. USB Type-C Connector Class does not supply separate API for them. The
211211
port drivers can use USB Role Class API with those.
212212

213-
Illustration of the muxes behind a connector that supports an alternate mode:
213+
Illustration of the muxes behind a connector that supports an alternate mode::
214214

215215
------------------------
216216
| Connector |

‎Documentation/i2c/dev-interface

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ i2c adapters present on your system at a given time. i2cdetect is part of
99
the i2c-tools package.
1010

1111
I2C device files are character device files with major device number 89
12-
and a minor device number corresponding to the number assigned as
13-
explained above. They should be called "i2c-%d" (i2c-0, i2c-1, ...,
12+
and a minor device number corresponding to the number assigned as
13+
explained above. They should be called "i2c-%d" (i2c-0, i2c-1, ...,
1414
i2c-10, ...). All 256 minor device numbers are reserved for i2c.
1515

1616

@@ -23,11 +23,6 @@ First, you need to include these two headers:
2323
#include <linux/i2c-dev.h>
2424
#include <i2c/smbus.h>
2525

26-
(Please note that there are two files named "i2c-dev.h" out there. One is
27-
distributed with the Linux kernel and the other one is included in the
28-
source tree of i2c-tools. They used to be different in content but since 2012
29-
they're identical. You should use "linux/i2c-dev.h").
30-
3126
Now, you have to decide which adapter you want to access. You should
3227
inspect /sys/class/i2c-dev/ or run "i2cdetect -l" to decide this.
3328
Adapter numbers are assigned somewhat dynamically, so you can not
@@ -38,7 +33,7 @@ Next thing, open the device file, as follows:
3833
int file;
3934
int adapter_nr = 2; /* probably dynamically determined */
4035
char filename[20];
41-
36+
4237
snprintf(filename, 19, "/dev/i2c-%d", adapter_nr);
4338
file = open(filename, O_RDWR);
4439
if (file < 0) {
@@ -72,8 +67,10 @@ the device supports them. Both are illustrated below.
7267
/* res contains the read word */
7368
}
7469

75-
/* Using I2C Write, equivalent of
76-
i2c_smbus_write_word_data(file, reg, 0x6543) */
70+
/*
71+
* Using I2C Write, equivalent of
72+
* i2c_smbus_write_word_data(file, reg, 0x6543)
73+
*/
7774
buf[0] = reg;
7875
buf[1] = 0x43;
7976
buf[2] = 0x65;
@@ -140,14 +137,14 @@ ioctl(file, I2C_RDWR, struct i2c_rdwr_ioctl_data *msgset)
140137
set in each message, overriding the values set with the above ioctl's.
141138

142139
ioctl(file, I2C_SMBUS, struct i2c_smbus_ioctl_data *args)
143-
Not meant to be called directly; instead, use the access functions
144-
below.
140+
If possible, use the provided i2c_smbus_* methods described below instead
141+
of issuing direct ioctls.
145142

146143
You can do plain i2c transactions by using read(2) and write(2) calls.
147144
You do not need to pass the address byte; instead, set it through
148145
ioctl I2C_SLAVE before you try to access the device.
149146

150-
You can do SMBus level transactions (see documentation file smbus-protocol
147+
You can do SMBus level transactions (see documentation file smbus-protocol
151148
for details) through the following functions:
152149
__s32 i2c_smbus_write_quick(int file, __u8 value);
153150
__s32 i2c_smbus_read_byte(int file);
@@ -158,18 +155,17 @@ for details) through the following functions:
158155
__s32 i2c_smbus_write_word_data(int file, __u8 command, __u16 value);
159156
__s32 i2c_smbus_process_call(int file, __u8 command, __u16 value);
160157
__s32 i2c_smbus_read_block_data(int file, __u8 command, __u8 *values);
161-
__s32 i2c_smbus_write_block_data(int file, __u8 command, __u8 length,
158+
__s32 i2c_smbus_write_block_data(int file, __u8 command, __u8 length,
162159
__u8 *values);
163160
All these transactions return -1 on failure; you can read errno to see
164161
what happened. The 'write' transactions return 0 on success; the
165162
'read' transactions return the read value, except for read_block, which
166163
returns the number of values read. The block buffers need not be longer
167164
than 32 bytes.
168165

169-
The above functions are all inline functions, that resolve to calls to
170-
the i2c_smbus_access function, that on its turn calls a specific ioctl
171-
with the data in a specific format. Read the source code if you
172-
want to know what happens behind the screens.
166+
The above functions are made available by linking against the libi2c library,
167+
which is provided by the i2c-tools project. See:
168+
https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/.
173169

174170

175171
Implementation details

‎Documentation/ioctl/ioctl-number.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ Code Seq#(hex) Include File Comments
217217
'd' 02-40 pcmcia/ds.h conflict!
218218
'd' F0-FF linux/digi1.h
219219
'e' all linux/digi1.h conflict!
220-
'e' 00-1F drivers/net/irda/irtty-sir.h conflict!
221220
'f' 00-1F linux/ext2_fs.h conflict!
222221
'f' 00-1F linux/ext3_fs.h conflict!
223222
'f' 00-0F fs/jfs/jfs_dinode.h conflict!
@@ -247,7 +246,6 @@ Code Seq#(hex) Include File Comments
247246
'm' all linux/synclink.h conflict!
248247
'm' 00-19 drivers/message/fusion/mptctl.h conflict!
249248
'm' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict!
250-
'm' 00-1F net/irda/irmod.h conflict!
251249
'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c
252250
'n' 80-8F uapi/linux/nilfs2_api.h NILFS2
253251
'n' E0-FF linux/matroxfb.h matroxfb

0 commit comments

Comments
 (0)