diff options
author | Olof Johansson <olof@lixom.net> | 2015-10-23 10:24:44 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-10-23 10:24:44 -0700 |
commit | de0b2a545c3e3115ef834c48465b4c1a559ad41c (patch) | |
tree | d782a37187807a0df491da867f1657f8dfa16200 /Documentation | |
parent | 4751424117547546d197e99ce91e4bdc0c3a1101 (diff) | |
parent | 060646a218b357e758b3dc6bbce2865bd0aadd44 (diff) | |
download | linux-stable-de0b2a545c3e3115ef834c48465b4c1a559ad41c.tar.gz linux-stable-de0b2a545c3e3115ef834c48465b4c1a559ad41c.tar.bz2 linux-stable-de0b2a545c3e3115ef834c48465b4c1a559ad41c.zip |
Merge tag 'v4.3-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt
Delete regulator-compatible usage in mt8135-evbp1.dts.
The regualtor-compatible binding is deprecated, instead the node name
is used.
Mediatek timer driver supports as well mt8127, mt8135 and mt8173. Add
these SOCs to the bindings list.
Power domains venc and venc_lt need clocks two extra clocks to access
their registers. We update the bindings documentation about this.
Update SMP bindings documentation by adding support for mt6589 and mt81xx SOCs.
Update mt8127.dtsi and mt8135.dtsi to enable SMP support.
* tag 'v4.3-next-dts' of https://github.com/mbgg/linux-mediatek:
ARM: dts: mt8127: enable basic SMP bringup for mt8127
ARM: dts: mt8135: enable basic SMP bringup for mt8135
devicetree: bindings: add new SMP enable method Mediatek SoC
dt-bindings: soc: Add clocks for Mediatek SCPSYS unit
dt-bindings: add more MediaTek SoC to mtk-timer binding
ARM: dts: mt8135-evbp1: remove regulator-compatible usage
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
3 files changed, 13 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index 91e6e5c478d0..3a07a87fef20 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -195,6 +195,8 @@ nodes to be present and contain the properties described below. "marvell,armada-380-smp" "marvell,armada-390-smp" "marvell,armada-xp-smp" + "mediatek,mt6589-smp" + "mediatek,mt81xx-tz-smp" "qcom,gcc-msm8660" "qcom,kpss-acc-v1" "qcom,kpss-acc-v2" diff --git a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt index c0511142b39c..a6c8afc8385a 100644 --- a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt +++ b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt @@ -17,9 +17,9 @@ Required properties: - reg: Address range of the SCPSYS unit - infracfg: must contain a phandle to the infracfg controller - clock, clock-names: clocks according to the common clock binding. - The clocks needed "mm" and "mfg". These are the - clocks which hardware needs to be enabled before - enabling certain power domains. + The clocks needed "mm", "mfg", "venc" and "venc_lt". + These are the clocks which hardware needs to be enabled + before enabling certain power domains. Example: @@ -30,7 +30,9 @@ Example: infracfg = <&infracfg>; clocks = <&clk26m>, <&topckgen CLK_TOP_MM_SEL>; - clock-names = "mfg", "mm"; + <&topckgen CLK_TOP_VENC_SEL>, + <&topckgen CLK_TOP_VENC_LT_SEL>; + clock-names = "mfg", "mm", "venc", "venc_lt"; }; Example consumer: diff --git a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt index 53a3029b7589..64083bc5633c 100644 --- a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt +++ b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt @@ -3,10 +3,12 @@ Mediatek MT6577, MT6572 and MT6589 Timers Required properties: - compatible should contain: - * "mediatek,mt6589-timer" for MT6589 compatible timers * "mediatek,mt6580-timer" for MT6580 compatible timers - * "mediatek,mt6577-timer" for all compatible timers (MT6589, MT6580, - MT6577) + * "mediatek,mt6589-timer" for MT6589 compatible timers + * "mediatek,mt8127-timer" for MT8127 compatible timers + * "mediatek,mt8135-timer" for MT8135 compatible timers + * "mediatek,mt8173-timer" for MT8173 compatible timers + * "mediatek,mt6577-timer" for MT6577 and all above compatible timers - reg: Should contain location and length for timers register. - clocks: Clocks driving the timer hardware. This list should include two clocks. The order is system clock and as second clock the RTC clock. |