Skip to content

Commit 4257412

Browse files
olofjolofj
committed
Merge tag 'fixes-against-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "omap fixes against v3.18-rc2" from Tony Lindgren: Few fixes for omaps to enable NAND BCH so devices won't produce errors when booted with omap2plus_defconfig, and reduce bloat by making IPV6 a loadable module. Also let's add a warning about legacy boot being deprecated for omap3. We now have things working with device tree, and only omap3 is still booting in legacy mode. So hopefully this warning will help move the remaining legacy mode users to boot with device tree. As the total reduction of code and static data is somewhere around 20000 lines of code once we remove omap3 legacy mode booting, we really do want to make omap3 to boot also in device tree mode only over the next few merge cycles. * tag 'fixes-against-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (407 commits) ARM: OMAP2+: Warn about deprecated legacy booting mode ARM: omap2plus_defconfig: Fix errors with NAND BCH ARM: omap2plus_defconfig: Fix bloat caused by having ipv6 built-in + Linux 3.18-rc2 Signed-off-by: Olof Johansson <[email protected]>
2 parents cc040ba + 4b91f7f commit 4257412

File tree

453 files changed

+14972
-4850
lines changed

Some content is hidden

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

453 files changed

+14972
-4850
lines changed

‎Documentation/arm64/memory.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ User addresses have bits 63:48 set to 0 while the kernel addresses have
1717
the same bits set to 1. TTBRx selection is given by bit 63 of the
1818
virtual address. The swapper_pg_dir contains only kernel (global)
1919
mappings while the user pgd contains only user (non-global) mappings.
20-
The swapper_pgd_dir address is written to TTBR1 and never written to
20+
The swapper_pg_dir address is written to TTBR1 and never written to
2121
TTBR0.
2222

2323

‎Documentation/devicetree/bindings/mailbox/mailbox.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
* Generic Mailbox Controller and client driver bindings
2+
3+
Generic binding to provide a way for Mailbox controller drivers to
4+
assign appropriate mailbox channel to client drivers.
5+
6+
* Mailbox Controller
7+
8+
Required property:
9+
- #mbox-cells: Must be at least 1. Number of cells in a mailbox
10+
specifier.
11+
12+
Example:
13+
mailbox: mailbox {
14+
...
15+
#mbox-cells = <1>;
16+
};
17+
18+
19+
* Mailbox Client
20+
21+
Required property:
22+
- mboxes: List of phandle and mailbox channel specifiers.
23+
24+
Optional property:
25+
- mbox-names: List of identifier strings for each mailbox channel
26+
required by the client. The use of this property
27+
is discouraged in favor of using index in list of
28+
'mboxes' while requesting a mailbox. Instead the
29+
platforms may define channel indices, in DT headers,
30+
to something legible.
31+
32+
Example:
33+
pwr_cntrl: power {
34+
...
35+
mbox-names = "pwr-ctrl", "rpc";
36+
mboxes = <&mailbox 0
37+
&mailbox 1>;
38+
};

‎Documentation/devicetree/bindings/pwm/pwm-fsl-ftm.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
Freescale FlexTimer Module (FTM) PWM controller
22

3+
The same FTM PWM device can have a different endianness on different SoCs. The
4+
device tree provides a property to describing this so that an operating system
5+
device driver can handle all variants of the device. Refer to the table below
6+
for the endianness of the FTM PWM block as integrated into the existing SoCs:
7+
8+
SoC | FTM-PWM endianness
9+
--------+-------------------
10+
Vybrid | LE
11+
LS1 | BE
12+
LS2 | LE
13+
14+
Please see ../regmap/regmap.txt for more detail about how to specify endian
15+
modes in device tree.
16+
17+
318
Required properties:
419
- compatible: Should be "fsl,vf610-ftm-pwm".
520
- reg: Physical base address and length of the controller's registers
@@ -16,7 +31,8 @@ Required properties:
1631
- pinctrl-names: Must contain a "default" entry.
1732
- pinctrl-NNN: One property must exist for each entry in pinctrl-names.
1833
See pinctrl/pinctrl-bindings.txt for details of the property values.
19-
34+
- big-endian: Boolean property, required if the FTM PWM registers use a big-
35+
endian rather than little-endian layout.
2036

2137
Example:
2238

@@ -32,4 +48,5 @@ pwm0: pwm@40038000 {
3248
<&clks VF610_CLK_FTM0_EXT_FIX_EN>;
3349
pinctrl-names = "default";
3450
pinctrl-0 = <&pinctrl_pwm0_1>;
51+
big-endian;
3552
};

‎Documentation/devicetree/bindings/pwm/pwm-rockchip.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Required properties:
77
"rockchip,vop-pwm": found integrated in VOP on RK3288 SoC
88
- reg: physical base address and length of the controller's registers
99
- clocks: phandle and clock specifier of the PWM reference clock
10-
- #pwm-cells: should be 2. See pwm.txt in this directory for a
11-
description of the cell format.
10+
- #pwm-cells: must be 2 (rk2928) or 3 (rk3288). See pwm.txt in this directory
11+
for a description of the cell format.
1212

1313
Example:
1414

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs
22

33
Required properties:
4-
- compatible : "fsl,imx6q-thermal"
4+
- compatible : "fsl,imx6q-tempmon" for i.MX6Q, "fsl,imx6sx-tempmon" for i.MX6SX.
5+
i.MX6SX has two more IRQs than i.MX6Q, one is IRQ_LOW and the other is IRQ_PANIC,
6+
when temperature is below than low threshold, IRQ_LOW will be triggered, when temperature
7+
is higher than panic threshold, system will auto reboot by SRC module.
58
- fsl,tempmon : phandle pointer to system controller that contains TEMPMON
69
control registers, e.g. ANATOP on imx6q.
710
- fsl,tempmon-data : phandle pointer to fuse controller that contains TEMPMON

‎Documentation/devicetree/bindings/watchdog/cadence-wdt.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Zynq Watchdog Device Tree Bindings
2+
-------------------------------------------
3+
4+
Required properties:
5+
- compatible : Should be "cdns,wdt-r1p2".
6+
- clocks : This is pclk (APB clock).
7+
- interrupts : This is wd_irq - watchdog timeout interrupt.
8+
- interrupt-parent : Must be core interrupt controller.
9+
10+
Optional properties
11+
- reset-on-timeout : If this property exists, then a reset is done
12+
when watchdog times out.
13+
- timeout-sec : Watchdog timeout value (in seconds).
14+
15+
Example:
16+
watchdog@f8005000 {
17+
compatible = "cdns,wdt-r1p2";
18+
clocks = <&clkc 45>;
19+
interrupt-parent = <&intc>;
20+
interrupts = <0 9 1>;
21+
reg = <0xf8005000 0x1000>;
22+
reset-on-timeout;
23+
timeout-sec = <10>;
24+
};

‎Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Required properties:
77

88
Optional property:
99
- big-endian: If present the watchdog device's registers are implemented
10-
in big endian mode, otherwise in little mode.
10+
in big endian mode, otherwise in native mode(same with CPU), for more
11+
detail please see: Documentation/devicetree/bindings/regmap/regmap.txt.
1112

1213
Examples:
1314

‎Documentation/devicetree/bindings/watchdog/meson6-wdt.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Meson SoCs Watchdog timer
2+
3+
Required properties:
4+
5+
- compatible : should be "amlogic,meson6-wdt"
6+
- reg : Specifies base physical address and size of the registers.
7+
8+
Example:
9+
10+
wdt: watchdog@c1109900 {
11+
compatible = "amlogic,meson6-wdt";
12+
reg = <0xc1109900 0x8>;
13+
};

‎Documentation/devicetree/bindings/watchdog/qcom-wdt.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Qualcomm Krait Processor Sub-system (KPSS) Watchdog
2+
---------------------------------------------------
3+
4+
Required properties :
5+
- compatible : shall contain only one of the following:
6+
7+
"qcom,kpss-wdt-msm8960"
8+
"qcom,kpss-wdt-apq8064"
9+
"qcom,kpss-wdt-ipq8064"
10+
11+
- reg : shall contain base register location and length
12+
- clocks : shall contain the input clock
13+
14+
Optional properties :
15+
- timeout-sec : shall contain the default watchdog timeout in seconds,
16+
if unset, the default timeout is 30 seconds
17+
18+
Example:
19+
watchdog@208a038 {
20+
compatible = "qcom,kpss-wdt-ipq8064";
21+
reg = <0x0208a038 0x40>;
22+
clocks = <&sleep_clk>;
23+
timeout-sec = <10>;
24+
};

‎Documentation/devicetree/bindings/watchdog/samsung-wdt.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Required properties:
99
(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs
1010
(b) "samsung,exynos5250-wdt" for Exynos5250
1111
(c) "samsung,exynos5420-wdt" for Exynos5420
12+
(c) "samsung,exynos7-wdt" for Exynos7
1213

1314
- reg : base physical address of the controller and length of memory mapped
1415
region.

‎Documentation/filesystems/Locking

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ prototypes:
6767
struct file *, unsigned open_flag,
6868
umode_t create_mode, int *opened);
6969
int (*tmpfile) (struct inode *, struct dentry *, umode_t);
70+
int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
7071

7172
locking rules:
7273
all may block
@@ -96,6 +97,7 @@ fiemap: no
9697
update_time: no
9798
atomic_open: yes
9899
tmpfile: no
100+
dentry_open: no
99101

100102
Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
101103
victim.

0 commit comments

Comments
 (0)