diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-16 04:03:33 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-16 04:03:33 (GMT) |
| commit | 56f4a560c6d6318b5a8e18a1b3e44909a5158d1e (patch) | |
| tree | 3193b43eebd2cde7b13de9eb4b37cb5a1dccfdd0 /Documentation | |
| parent | 3871608e4cb995b0fb9c630da9ac45b246151fef (diff) | |
| parent | 9b609ba2c2df8290054e5c62be69101b43e2a976 (diff) | |
| download | linux-56f4a560c6d6318b5a8e18a1b3e44909a5158d1e.tar.xz | |
Merge tag 'v4.9.62' into linux-linaro-lsk-v4.9
This is the 4.9.62 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/davinci.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/clock/qoriq-clock.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/davinci.txt b/Documentation/devicetree/bindings/arm/davinci.txt index f0841ce..715622c 100644 --- a/Documentation/devicetree/bindings/arm/davinci.txt +++ b/Documentation/devicetree/bindings/arm/davinci.txt @@ -13,6 +13,10 @@ EnBW AM1808 based CMC board Required root node properties: - compatible = "enbw,cmc", "ti,da850; +LEGO MINDSTORMS EV3 (AM1808 based) +Required root node properties: + - compatible = "lego,ev3", "ti,da850"; + Generic DaVinci Boards ---------------------- diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt index 16a3ec4..1bd2c76 100644 --- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt +++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt @@ -31,6 +31,7 @@ Required properties: * "fsl,t4240-clockgen" * "fsl,b4420-clockgen" * "fsl,b4860-clockgen" + * "fsl,ls1012a-clockgen" * "fsl,ls1021a-clockgen" Chassis-version clock strings include: * "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index d0526e0..a40f881 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -154,6 +154,7 @@ kosagi Sutajio Ko-Usagi PTE Ltd. kyo Kyocera Corporation lacie LaCie lantiq Lantiq Semiconductor +lego LEGO Systems A/S lenovo Lenovo Group Ltd. lg LG Corporation linaro Linaro Limited |