Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

a9ceea26 · Linus Torvalds <[email protected]> · 2017-07-04 14:50:59 -07:00

Pull ARM 64-bit DT updates from Arnd Bergmann:
 "Device-tree updates for arm64 platforms. For the first time I can
  remember, this is actually larger than the corresponding branch for
  32-bit platforms overall, though that has more individual changes.

  A significant portion this time is due to added machine support:

   - Initial support for the Realtek RTD1295 SoC, along with the Zidoo
     X9S set-top-box

   - Initial support for Actions Semi S900 and the Bubblegum-96
     single-board-cёmputer.

   - Rockchips support for the rk3399-Firefly single-board-computer gets
     added, this one stands out for being relatively fast, affordable
     and well₋supported, compared to many boards that only fall into one
     or two of the above categories.

   - Mediatek gains support for the mt6797 mobile-phone SoC platform and
     corresponding evaluation board.

   - Amlogic board support gets added for the NanoPi K2 and S905x
     LibreTech CC single-board computers and the R-Box Pro set-top-box

   - Allwinner board support gets added for the OrangePi Win, Orangepi
     Zero Plus 2, NanoPi NEO2 and Orange Pi Prime single board computers
     and the SoPine system-on-module.

   - Renesas board support for Salvator-XS and H3ULCB automotive
     development systems.

   - Socionext Uniphier board support for LD11-global and LD20-global,
     whatever those may be.

   - Broadcom adds support for the new Stingray communication processor
     in its iProc family, along with two reference boards.

  Other updates include:

   - For the hisicon platform, support for Hi3660-Hikey960 gets extended
     significantly.

   - Lots of smaller updates for Renesas, Amlogic, Rockchip, UniPhier,
     Broadcom, Allwinner, Hisilicon, Qualcomm, Marvell, and NXP"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (243 commits)
  ARM64: dts: marvell: armada37xx: Fix timer interrupt specifiers
  Revert "arm64: dts: marvell: add dma-mask in crypto nodes for 7k/8k"
  arm64: dts: mediatek: don't include missing file
  ARM64: dts: meson-gxl: Add Libre Technology CC support
  dt-bindings: arm: amlogic: Add Libre Technology CC board
  dt-bindings: add Libre Technology vendor prefix
  arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K
  arm64: dts: zte: Use - instead of @ for DT OPP entries
  arm64: dts: marvell: add gpio support for Armada 7K/8K
  arm64: dts: marvell: add pinctrl support for Armada 7K/8K
  arm64: dts: marvell: use new binding for the system controller on cp110
  arm64: dts: marvell: remove *-clock-output-names on cp110
  arm64: dts: marvell: use new bindings for xor clocks on ap806
  arm64: dts: marvell: mcbin: enable the mdio node
  arm64: dts: Add Actions Semi S900 and Bubblegum-96
  dt-bindings: Add vendor prefix for uCRobotics
  arm64: dts: marvell: add xmdio nodes for 7k/8k
  arm64: dts: marvell: add a comment on the cp110 slave node status
  arm64: dts: marvell: remove cpm crypto nodes from dts files
  arm64: dts: marvell: cp110: enable the crypto engine at the SoC level
  ...

Commit: a9ceea26747dfd1879e7d836c5ce40bb8d6fc7e9
Parents: e8547112 · ac548add

Merge commit. Changes below are compared with the first parent: e8547112.

Changes

171 files changed · +11454 −2390

File	Status	Add	Del	Content
Documentation/devicetree/bindings/arm/amlogic.txt	modified	+16	−7	View file
Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt	added	+12	−0	View file
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt	modified	+4	−0	View file
Documentation/devicetree/bindings/arm/mediatek.txt	modified	+8	−0	View file
Documentation/devicetree/bindings/arm/realtek.txt	added	+20	−0	View file
Documentation/devicetree/bindings/arm/rockchip.txt	modified	+4	−0	View file
Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt	modified	+76	−0	View file
Documentation/devicetree/bindings/i2c/i2c-mt6577.txt → Documentation/devicetree/bindings/i2c/i2c-mtk.txt	renamed	+5	−5	View file
Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt	modified	+15	−13	View file
Documentation/devicetree/bindings/mfd/hi6421.txt	modified	+3	−1	View file
Documentation/devicetree/bindings/mmc/fsl-esdhc.txt	modified	+14	−0	View file
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/pci/kirin-pcie.txt	added	+50	−0	View file
Documentation/devicetree/bindings/serial/mtk-uart.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/soc/mediatek/scpsys.txt	modified	+5	−1	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+4	−0	View file
arch/arm64/boot/dts/Makefile	modified	+2	−0	View file
arch/arm64/boot/dts/actions/Makefile	added	+5	−0	View file
arch/arm64/boot/dts/actions/s900-bubblegum-96.dts	added	+35	−0	View file
arch/arm64/boot/dts/actions/s900.dtsi	added	+164	−0	View file
arch/arm64/boot/dts/allwinner/Makefile	modified	+5	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts	modified	+15	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts	added	+95	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts	modified	+16	−1	View file
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts	modified	+57	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts	added	+126	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi	added	+65	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi	modified	+120	−17	View file
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts	added	+161	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts	modified	+27	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts	added	+232	−0	View file
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts	added	+92	−0	View file
arch/arm64/boot/dts/amlogic/Makefile	modified	+6	−3	View file
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi	modified	+30	−30	View file
arch/arm64/boot/dts/amlogic/meson-gx.dtsi	modified	+10	−1	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts	added	+291	−0	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts	modified	+26	−26	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts	modified	+54	−54	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi	modified	+33	−33	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi	modified	+28	−28	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts	modified	+3	−3	View file
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts	modified	+40	−0	View file
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi	modified	+134	−86	View file
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts	modified	+24	−0	View file
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts	modified	+24	−1	View file
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts	added	+92	−0	View file
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts	modified	+26	−26	View file
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts	modified	+23	−0	View file
arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi	modified	+1	−1	View file
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi	modified	+89	−38	View file
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts	modified	+43	−44	View file
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts	added	+240	−0	View file
arch/arm64/boot/dts/arm/juno-base.dtsi	modified	+54	−4	View file
arch/arm64/boot/dts/arm/juno-r1.dts	modified	+24	−0	View file
arch/arm64/boot/dts/arm/juno-r2.dts	modified	+24	−0	View file
arch/arm64/boot/dts/arm/juno.dts	modified	+24	−0	View file
arch/arm64/boot/dts/broadcom/Makefile	modified	+1	−0	View file
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts	modified	+17	−0	View file
arch/arm64/boot/dts/broadcom/bcm2837.dtsi	modified	+4	−0	View file
arch/arm64/boot/dts/broadcom/ns2.dtsi	modified	+14	−0	View file
arch/arm64/boot/dts/broadcom/stingray/Makefile	added	+6	−0	View file
arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi	added	+131	−0	View file
arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts	added	+78	−0	View file
arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts	added	+40	−0	View file
arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi	added	+170	−0	View file
arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi	added	+345	−0	View file
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi	added	+460	−0	View file
arch/arm64/boot/dts/exynos/exynos5433-tm2.dts	modified	+0	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts	modified	+1	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts	modified	+9	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts	modified	+14	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi	modified	+36	−3	View file
arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi	added	+45	−0	View file
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts	modified	+3	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts	modified	+76	−3	View file
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi	modified	+67	−2	View file
arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi	added	+48	−0	View file
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts	modified	+3	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts	modified	+69	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi	modified	+71	−4	View file
arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts	modified	+28	−0	View file
arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts	modified	+20	−0	View file
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi	modified	+105	−6	View file
arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts	modified	+2	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts	modified	+2	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts	modified	+1	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi	modified	+1	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts	modified	+2	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts	modified	+2	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi	modified	+2	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi	modified	+3	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi	modified	+2	−1	View file
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi	modified	+3	−2	View file
arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi	added	+71	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi	added	+42	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi	added	+42	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi	added	+41	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi	added	+41	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi	added	+41	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi	added	+41	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi	added	+41	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi	added	+41	−0	View file
arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi	added	+81	−0	View file
arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi	added	+80	−0	View file
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts	modified	+213	−4	View file
arch/arm64/boot/dts/hisilicon/hi3660.dtsi	modified	+699	−7	View file
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts	modified	+31	−3	View file
arch/arm64/boot/dts/hisilicon/hi6220.dtsi	modified	+26	−0	View file
arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi	modified	+715	−63	View file
arch/arm64/boot/dts/marvell/armada-3720-db.dts	modified	+76	−44	View file
arch/arm64/boot/dts/marvell/armada-37xx.dtsi	modified	+22	−15	View file
arch/arm64/boot/dts/marvell/armada-7020.dtsi	modified	+1	−1	View file
arch/arm64/boot/dts/marvell/armada-7040-db.dts	modified	+2	−4	View file
arch/arm64/boot/dts/marvell/armada-7040.dtsi	modified	+1	−1	View file
arch/arm64/boot/dts/marvell/armada-70x0.dtsi	added	+68	−0	View file
arch/arm64/boot/dts/marvell/armada-8020.dtsi	modified	+1	−2	View file
arch/arm64/boot/dts/marvell/armada-8040-db.dts	modified	+20	−4	View file
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts	modified	+42	−0	View file
arch/arm64/boot/dts/marvell/armada-8040.dtsi	modified	+1	−2	View file
arch/arm64/boot/dts/marvell/armada-80x0.dtsi	added	+76	−0	View file
arch/arm64/boot/dts/marvell/armada-ap806.dtsi	modified	+36	−12	View file
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi	modified	+87	−58	View file
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi	modified	+92	−54	View file
arch/arm64/boot/dts/mediatek/Makefile	modified	+1	−0	View file
arch/arm64/boot/dts/mediatek/mt6797-evb.dts	added	+36	−0	View file
arch/arm64/boot/dts/mediatek/mt6797.dtsi	added	+244	−0	View file
arch/arm64/boot/dts/mediatek/mt8173.dtsi	modified	+79	−74	View file
arch/arm64/boot/dts/nvidia/tegra132.dtsi	modified	+3	−1	View file
arch/arm64/boot/dts/nvidia/tegra186.dtsi	modified	+7	−0	View file
arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts	modified	+1	−1	View file
arch/arm64/boot/dts/nvidia/tegra210.dtsi	modified	+3	−1	View file
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi	modified	+19	−17	View file
arch/arm64/boot/dts/qcom/msm8916.dtsi	modified	+29	−33	View file
arch/arm64/boot/dts/qcom/msm8992.dtsi	modified	+53	−0	View file
arch/arm64/boot/dts/qcom/msm8996.dtsi	modified	+6	−0	View file
arch/arm64/boot/dts/realtek/Makefile	added	+5	−0	View file
arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts	added	+42	−0	View file
arch/arm64/boot/dts/realtek/rtd1295.dtsi	added	+131	−0	View file
arch/arm64/boot/dts/renesas/Makefile	modified	+2	−0	View file
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts	added	+42	−0	View file
arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts	added	+115	−0	View file
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi	added	+84	−0	View file
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts	modified	+4	−338	View file
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts	modified	+48	−517	View file
arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts	added	+109	−0	View file
arch/arm64/boot/dts/renesas/r8a7795.dtsi	modified	+64	−69	View file
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts	modified	+6	−162	View file
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts	modified	+3	−241	View file
arch/arm64/boot/dts/renesas/r8a7796.dtsi	modified	+421	−0	View file
arch/arm64/boot/dts/renesas/salvator-common.dtsi	added	+629	−0	View file
arch/arm64/boot/dts/renesas/salvator-x.dtsi	added	+30	−0	View file
arch/arm64/boot/dts/renesas/salvator-xs.dtsi	added	+20	−0	View file
arch/arm64/boot/dts/renesas/ulcb.dtsi	added	+367	−0	View file
arch/arm64/boot/dts/rockchip/Makefile	modified	+1	−0	View file
arch/arm64/boot/dts/rockchip/rk3328.dtsi	modified	+33	−0	View file
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts	added	+718	−0	View file
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi	modified	+1	−1	View file
arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi	added	+145	−0	View file
arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi	modified	+5	−13	View file
arch/arm64/boot/dts/rockchip/rk3399.dtsi	modified	+157	−8	View file
arch/arm64/boot/dts/socionext/Makefile	modified	+2	−0	View file
arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts	added	+70	−0	View file
arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts	modified	+1	−37	View file
arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi	modified	+15	−46	View file
arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts	added	+52	−0	View file
arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts	modified	+1	−37	View file
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi	modified	+24	−55	View file
arch/arm64/boot/dts/zte/zx296718.dtsi	modified	+5	−5	View file
include/dt-bindings/clock/bcm-sr.h	added	+101	−0	View file
include/dt-bindings/pinctrl/brcm,pinctrl-stingray.h	added	+68	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/arm/amlogic.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt
index bfd5b55..0fff40a 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -29,26 +29,35 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:
   Required root node property:
     compatible: "amlogic,s912", "amlogic,meson-gxm";
 
-Board compatible values:
+Board compatible values (alphabetically, grouped by SoC):
+
   - "geniatech,atv1200" (Meson6)
+
   - "minix,neo-x8" (Meson8)
-  - "tronfy,mxq" (Meson8b)
+
   - "hardkernel,odroid-c1" (Meson8b)
+  - "tronfy,mxq" (Meson8b)
+
+  - "amlogic,p200" (Meson gxbb)
+  - "amlogic,p201" (Meson gxbb)
+  - "friendlyarm,nanopi-k2" (Meson gxbb)
+  - "hardkernel,odroid-c2" (Meson gxbb)
+  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)
   - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)
   - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)
   - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)
-  - "hardkernel,odroid-c2" (Meson gxbb)
-  - "amlogic,p200" (Meson gxbb)
-  - "amlogic,p201" (Meson gxbb)
   - "wetek,hub" (Meson gxbb)
   - "wetek,play2" (Meson gxbb)
+
   - "amlogic,p212" (Meson gxl s905x)
+  - "hwacom,amazetv" (Meson gxl s905x)
   - "khadas,vim" (Meson gxl s905x)
+  - "libretech,cc" (Meson gxl s905x)
 
   - "amlogic,p230" (Meson gxl s905d)
   - "amlogic,p231" (Meson gxl s905d)
-  - "hwacom,amazetv" (Meson gxl s905x)
+
   - "amlogic,q200" (Meson gxm s912)
   - "amlogic,q201" (Meson gxm s912)
-  - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)
+  - "kingnovel,r-box-pro" (Meson gxm S912)
   - "nexbox,a1" (Meson gxm s912)

Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
new file mode 100644
index 0000000..23a0217
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
@@ -0,0 +1,12 @@
+Broadcom Stingray device tree bindings
+------------------------------------------------
+
+Boards with Stingray shall have the following properties:
+
+Required root node property:
+
+Stingray Combo SVK board
+compatible = "brcm,bcm958742k", "brcm,stingray";
+
+Stingray SST100 board
+compatible = "brcm,bcm958742t", "brcm,stingray";

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
index 2e73215..7111fbc 100644
--- a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
+++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
@@ -4,6 +4,10 @@ Hi3660 SoC
 Required root node properties:
 	- compatible = "hisilicon,hi3660";
 
+HiKey960 Board
+Required root node properties:
+	- compatible = "hisilicon,hi3660-hikey960", "hisilicon,hi3660";
+
 Hi3798cv200 SoC
 Required root node properties:
 	- compatible = "hisilicon,hi3798cv200";

Documentation/devicetree/bindings/arm/mediatek.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt
index c860b24..da7bd13 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@ -12,6 +12,8 @@ compatible: Must contain one of
    "mediatek,mt6592"
    "mediatek,mt6755"
    "mediatek,mt6795"
+   "mediatek,mt6797"
+   "mediatek,mt7622"
    "mediatek,mt7623"
    "mediatek,mt8127"
    "mediatek,mt8135"
@@ -38,6 +40,12 @@ Supported boards:
 - Evaluation board for MT6795(Helio X10):
     Required root node properties:
       - compatible = "mediatek,mt6795-evb", "mediatek,mt6795";
+- Evaluation board for MT6797(Helio X20):
+    Required root node properties:
+      - compatible = "mediatek,mt6797-evb", "mediatek,mt6797";
+- Reference board variant 1 for MT7622:
+    Required root node properties:
+      - compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
 - Evaluation board for MT7623:
     Required root node properties:
       - compatible = "mediatek,mt7623-evb", "mediatek,mt7623";

Documentation/devicetree/bindings/arm/realtek.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/realtek.txt b/Documentation/devicetree/bindings/arm/realtek.txt
new file mode 100644
index 0000000..13d7557
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/realtek.txt
@@ -0,0 +1,20 @@
+Realtek platforms device tree bindings
+--------------------------------------
+
+
+RTD1295 SoC
+===========
+
+Required root node properties:
+
+ - compatible :  must contain "realtek,rtd1295"
+
+
+Root node property compatible must contain, depending on board:
+
+ - Zidoo X9S: "zidoo,x9s"
+
+
+Example:
+
+    compatible = "zidoo,x9s", "realtek,rtd1295";

Documentation/devicetree/bindings/arm/rockchip.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index 7b48474..11c0ac4 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -42,6 +42,10 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";
 
+- Firefly Firefly-RK3399 board:
+    Required root node properties:
+      - compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
+
 - ChipSPARK PopMetal-RK3288 board:
     Required root node properties:
       - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";

Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt

View file

diff --git a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
index fc33ca0..7c3ca0e 100644
--- a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
@@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller
 Required properties:
   - reg: Physical base address and size of the controller's register area.
   - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where
-    chip could be ls1021a, ls1043a, ls1046a, ls2080a etc.
+    chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a etc.
   - clocks: Input clock specifier. Refer to common clock bindings.
   - interrupts: Interrupt specifier. Refer to interrupt binding.
 

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt

View file

diff --git a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
index 6f66e9a..f2c5f0e 100644
--- a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
@@ -219,3 +219,79 @@ BCM63138
 --------
 PLL and leaf clock compatible strings for BCM63138 are:
     "brcm,bcm63138-armpll"
+
+Stingray
+-----------
+PLL and leaf clock compatible strings for Stingray are:
+    "brcm,sr-genpll0"
+    "brcm,sr-genpll1"
+    "brcm,sr-genpll2"
+    "brcm,sr-genpll3"
+    "brcm,sr-genpll4"
+    "brcm,sr-genpll5"
+    "brcm,sr-genpll6"
+
+    "brcm,sr-lcpll0"
+    "brcm,sr-lcpll1"
+    "brcm,sr-lcpll-pcie"
+
+
+The following table defines the set of PLL/clock index and ID for Stingray.
+These clock IDs are defined in:
+    "include/dt-bindings/clock/bcm-sr.h"
+
+    Clock		Source		Index	ID
+    ---			-----		-----	---------
+    crystal		N/A		N/A	N/A
+    crmu_ref25m		crystal		N/A	N/A
+
+    genpll0		crystal		0	BCM_SR_GENPLL0
+    clk_125m		genpll0		1	BCM_SR_GENPLL0_125M_CLK
+    clk_scr		genpll0		2	BCM_SR_GENPLL0_SCR_CLK
+    clk_250		genpll0		3	BCM_SR_GENPLL0_250M_CLK
+    clk_pcie_axi	genpll0		4	BCM_SR_GENPLL0_PCIE_AXI_CLK
+    clk_paxc_axi_x2	genpll0		5	BCM_SR_GENPLL0_PAXC_AXI_X2_CLK
+    clk_paxc_axi	genpll0		6	BCM_SR_GENPLL0_PAXC_AXI_CLK
+
+    genpll1		crystal		0	BCM_SR_GENPLL1
+    clk_pcie_tl		genpll1		1	BCM_SR_GENPLL1_PCIE_TL_CLK
+    clk_mhb_apb		genpll1		2	BCM_SR_GENPLL1_MHB_APB_CLK
+
+    genpll2		crystal		0	BCM_SR_GENPLL2
+    clk_nic		genpll2		1	BCM_SR_GENPLL2_NIC_CLK
+    clk_ts_500_ref	genpll2		2	BCM_SR_GENPLL2_TS_500_REF_CLK
+    clk_125_nitro	genpll2		3	BCM_SR_GENPLL2_125_NITRO_CLK
+    clk_chimp		genpll2		4	BCM_SR_GENPLL2_CHIMP_CLK
+    clk_nic_flash	genpll2		5	BCM_SR_GENPLL2_NIC_FLASH
+
+    genpll3		crystal		0	BCM_SR_GENPLL3
+    clk_hsls		genpll3		1	BCM_SR_GENPLL3_HSLS_CLK
+    clk_sdio		genpll3		2	BCM_SR_GENPLL3_SDIO_CLK
+
+    genpll4		crystal		0	BCM_SR_GENPLL4
+    ccn			genpll4		1	BCM_SR_GENPLL4_CCN_CLK
+    clk_tpiu_pll	genpll4		2	BCM_SR_GENPLL4_TPIU_PLL_CLK
+    noc_clk		genpll4		3	BCM_SR_GENPLL4_NOC_CLK
+    clk_chclk_fs4	genpll4		4	BCM_SR_GENPLL4_CHCLK_FS4_CLK
+    clk_bridge_fscpu	genpll4		5	BCM_SR_GENPLL4_BRIDGE_FSCPU_CLK
+
+
+    genpll5		crystal		0	BCM_SR_GENPLL5
+    fs4_hf_clk		genpll5		1	BCM_SR_GENPLL5_FS4_HF_CLK
+    crypto_ae_clk	genpll5		2	BCM_SR_GENPLL5_CRYPTO_AE_CLK
+    raid_ae_clk		genpll5		3	BCM_SR_GENPLL5_RAID_AE_CLK
+
+    genpll6		crystal		0	BCM_SR_GENPLL6
+    48_usb		genpll6		1	BCM_SR_GENPLL6_48_USB_CLK
+
+    lcpll0		crystal		0	BCM_SR_LCPLL0
+    clk_sata_refp 	lcpll0		1	BCM_SR_LCPLL0_SATA_REFP_CLK
+    clk_sata_refn	lcpll0		2	BCM_SR_LCPLL0_SATA_REFN_CLK
+    clk_usb_ref		lcpll0		3	BCM_SR_LCPLL0_USB_REF_CLK
+    sata_refpn		lcpll0		3	BCM_SR_LCPLL0_SATA_REFPN_CLK
+
+    lcpll1		crystal		0	BCM_SR_LCPLL1
+    wan 		lcpll1		1	BCM_SR_LCPLL0_WAN_CLK
+
+    lcpll_pcie		crystal		0	BCM_SR_LCPLL_PCIE
+    pcie_phy_ref 	lcpll1		1	BCM_SR_LCPLL_PCIE_PHY_REF_CLK

Documentation/devicetree/bindings/i2c/i2c-mtk.txt

View file

diff --git a/Documentation/devicetree/bindings/i2c/i2c-mt6577.txt b/Documentation/devicetree/bindings/i2c/i2c-mtk.txt
similarity index 85%
rename from Documentation/devicetree/bindings/i2c/i2c-mt6577.txt
rename to Documentation/devicetree/bindings/i2c/i2c-mtk.txt
index 0ce6fa3..bd5a7be 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mt6577.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mtk.txt
@@ -4,11 +4,11 @@ The Mediatek's I2C controller is used to interface with I2C devices.
 
 Required properties:
   - compatible: value should be either of the following.
-      (a) "mediatek,mt6577-i2c", for i2c compatible with mt6577 i2c.
-      (b) "mediatek,mt6589-i2c", for i2c compatible with mt6589 i2c.
-      (c) "mediatek,mt8127-i2c", for i2c compatible with mt8127 i2c.
-      (d) "mediatek,mt8135-i2c", for i2c compatible with mt8135 i2c.
-      (e) "mediatek,mt8173-i2c", for i2c compatible with mt8173 i2c.
+      "mediatek,mt2701-i2c", "mediatek,mt6577-i2c": for Mediatek mt2701
+      "mediatek,mt6577-i2c": for i2c compatible with mt6577.
+      "mediatek,mt6589-i2c": for i2c compatible with mt6589.
+      "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for i2c compatible with mt7623.
+      "mediatek,mt8173-i2c": for i2c compatible with mt8173.
   - reg: physical base address of the controller and dma base, length of memory
     mapped region.
   - interrupts: interrupt number to the cpu.

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

View file

diff --git a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt
index a89c03b..11cc87a 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt
@@ -1,21 +1,23 @@
-+Mediatek 65xx/67xx/81xx sysirq
++Mediatek MT65xx/MT67xx/MT81xx sysirq
 
 Mediatek SOCs sysirq support controllable irq inverter for each GIC SPI
 interrupt.
 
 Required properties:
-- compatible: should be one of:
-	"mediatek,mt8173-sysirq"
-	"mediatek,mt8135-sysirq"
-	"mediatek,mt8127-sysirq"
-	"mediatek,mt6795-sysirq"
-	"mediatek,mt6755-sysirq"
-	"mediatek,mt6592-sysirq"
-	"mediatek,mt6589-sysirq"
-	"mediatek,mt6582-sysirq"
-	"mediatek,mt6580-sysirq"
-	"mediatek,mt6577-sysirq"
-	"mediatek,mt2701-sysirq"
+- compatible: should be
+	"mediatek,mt8173-sysirq", "mediatek,mt6577-sysirq": for MT8173
+	"mediatek,mt8135-sysirq", "mediatek,mt6577-sysirq": for MT8135
+	"mediatek,mt8127-sysirq", "mediatek,mt6577-sysirq": for MT8127
+	"mediatek,mt7622-sysirq", "mediatek,mt6577-sysirq": for MT7622
+	"mediatek,mt6795-sysirq", "mediatek,mt6577-sysirq": for MT6795
+	"mediatek,mt6797-sysirq", "mediatek,mt6577-sysirq": for MT6797
+	"mediatek,mt6755-sysirq", "mediatek,mt6577-sysirq": for MT6755
+	"mediatek,mt6592-sysirq", "mediatek,mt6577-sysirq": for MT6592
+	"mediatek,mt6589-sysirq", "mediatek,mt6577-sysirq": for MT6589
+	"mediatek,mt6582-sysirq", "mediatek,mt6577-sysirq": for MT6582
+	"mediatek,mt6580-sysirq", "mediatek,mt6577-sysirq": for MT6580
+	"mediatek,mt6577-sysirq": for MT6577
+	"mediatek,mt2701-sysirq", "mediatek,mt6577-sysirq": for MT2701
 - interrupt-controller : Identifies the node as an interrupt controller
 - #interrupt-cells : Use the same format as specified by GIC in arm,gic.txt.
 - interrupt-parent: phandle of irq parent for sysirq. The parent must

Documentation/devicetree/bindings/mfd/hi6421.txt

View file

diff --git a/Documentation/devicetree/bindings/mfd/hi6421.txt b/Documentation/devicetree/bindings/mfd/hi6421.txt
index 0d5a446..22da96d 100644
--- a/Documentation/devicetree/bindings/mfd/hi6421.txt
+++ b/Documentation/devicetree/bindings/mfd/hi6421.txt
@@ -1,7 +1,9 @@
 * HI6421 Multi-Functional Device (MFD), by HiSilicon Ltd.
 
 Required parent device properties:
-- compatible	: contains "hisilicon,hi6421-pmic";
+- compatible    : One of the following chip-specific strings:
+	"hisilicon,hi6421-pmic";
+	"hisilicon,hi6421v530-pmic";
 - reg		: register range space of hi6421;
 
 Supported Hi6421 sub-devices include:

Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

View file

diff --git a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
index dedfb02..a2cf5e1 100644
--- a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
+++ b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
@@ -7,6 +7,20 @@ This file documents differences between the core properties described
 by mmc.txt and the properties used by the sdhci-esdhc driver.
 
 Required properties:
+  - compatible : should be "fsl,esdhc", or "fsl,<chip>-esdhc".
+    Possible compatibles for PowerPC:
+	"fsl,mpc8536-esdhc"
+	"fsl,mpc8378-esdhc"
+	"fsl,p2020-esdhc"
+	"fsl,p4080-esdhc"
+	"fsl,t1040-esdhc"
+	"fsl,t4240-esdhc"
+    Possible compatibles for ARM:
+	"fsl,ls1012a-esdhc"
+	"fsl,ls1088a-esdhc"
+	"fsl,ls1043a-esdhc"
+	"fsl,ls1046a-esdhc"
+	"fsl,ls2080a-esdhc"
   - interrupt-parent : interrupt source phandle.
   - clock-frequency : specifies eSDHC base clock frequency.
 

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

View file

diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
index df37058..8af1afc 100644
--- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
@@ -12,6 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller.
 Required Properties:
 
 * compatible: should be one of the following.
+  - "hisilicon,hi3660-dw-mshc": for controllers with hi3660 specific extensions.
   - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions.
   - "hisilicon,hi6220-dw-mshc": for controllers with hi6220 specific extensions.
 

Documentation/devicetree/bindings/pci/kirin-pcie.txt

View file

diff --git a/Documentation/devicetree/bindings/pci/kirin-pcie.txt b/Documentation/devicetree/bindings/pci/kirin-pcie.txt
new file mode 100644
index 0000000..68ffa0f
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/kirin-pcie.txt
@@ -0,0 +1,50 @@
+HiSilicon Kirin SoCs PCIe host DT description
+
+Kirin PCIe host controller is based on Designware PCI core.
+It shares common functions with PCIe Designware core driver
+and inherits common properties defined in
+Documentation/devicetree/bindings/pci/designware-pci.txt.
+
+Additional properties are described here:
+
+Required properties
+- compatible:
+	"hisilicon,kirin960-pcie" for PCIe of Kirin960 SoC
+- reg: Should contain rc_dbi, apb, phy, config registers location and length.
+- reg-names: Must include the following entries:
+  "dbi": controller configuration registers;
+  "apb": apb Ctrl register defined by Kirin;
+  "phy": apb PHY register defined by Kirin;
+  "config": PCIe configuration space registers.
+- reset-gpios: The gpio to generate PCIe perst assert and deassert signal.
+
+Optional properties:
+
+Example based on kirin960:
+
+	pcie@f4000000 {
+		compatible = "hisilicon,kirin-pcie";
+		reg = <0x0 0xf4000000 0x0 0x1000>, <0x0 0xff3fe000 0x0 0x1000>,
+		      <0x0 0xf3f20000 0x0 0x40000>, <0x0 0xF4000000 0 0x2000>;
+		reg-names = "dbi","apb","phy", "config";
+		bus-range = <0x0  0x1>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		device_type = "pci";
+		ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>;
+		num-lanes = <1>;
+		#interrupt-cells = <1>;
+		interrupt-map-mask = <0xf800 0 0 7>;
+		interrupt-map = <0x0 0 0 1 &gic 0 0 0  282 4>,
+				<0x0 0 0 2 &gic 0 0 0  283 4>,
+				<0x0 0 0 3 &gic 0 0 0  284 4>,
+				<0x0 0 0 4 &gic 0 0 0  285 4>;
+		clocks = <&crg_ctrl HI3660_PCIEPHY_REF>,
+			 <&crg_ctrl HI3660_CLK_GATE_PCIEAUX>,
+			 <&crg_ctrl HI3660_PCLK_GATE_PCIE_PHY>,
+			 <&crg_ctrl HI3660_PCLK_GATE_PCIE_SYS>,
+			 <&crg_ctrl HI3660_ACLK_GATE_PCIE>;
+		clock-names = "pcie_phy_ref", "pcie_aux",
+			      "pcie_apb_phy", "pcie_apb_sys", "pcie_aclk";
+		reset-gpios = <&gpio11 1 0 >;
+	};

Documentation/devicetree/bindings/serial/mtk-uart.txt

View file

diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt
index 0015c72..b6cf384 100644
--- a/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@ -8,6 +8,8 @@ Required properties:
   * "mediatek,mt6589-uart" for MT6589 compatible UARTS
   * "mediatek,mt6755-uart" for MT6755 compatible UARTS
   * "mediatek,mt6795-uart" for MT6795 compatible UARTS
+  * "mediatek,mt6797-uart" for MT6797 compatible UARTS
+  * "mediatek,mt7622-uart" for MT7622 compatible UARTS
   * "mediatek,mt7623-uart" for MT7623 compatible UARTS
   * "mediatek,mt8127-uart" for MT8127 compatible UARTS
   * "mediatek,mt8135-uart" for MT8135 compatible UARTS

Documentation/devicetree/bindings/soc/mediatek/scpsys.txt

View file

diff --git a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt
index 16fe94d..b1d165b 100644
--- a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt
+++ b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt
@@ -9,11 +9,14 @@ domain control.
 
 The driver implements the Generic PM domain bindings described in
 power/power_domain.txt. It provides the power domains defined in
-include/dt-bindings/power/mt8173-power.h and mt2701-power.h.
+- include/dt-bindings/power/mt8173-power.h
+- include/dt-bindings/power/mt6797-power.h
+- include/dt-bindings/power/mt2701-power.h
 
 Required properties:
 - compatible: Should be one of:
 	- "mediatek,mt2701-scpsys"
+	- "mediatek,mt6797-scpsys"
 	- "mediatek,mt8173-scpsys"
 - #power-domain-cells: Must be 1
 - reg: Address range of the SCPSYS unit
@@ -22,6 +25,7 @@ Required properties:
                       These are clocks which hardware needs to be
                       enabled before enabling certain power domains.
 	Required clocks for MT2701: "mm", "mfg", "ethif"
+	Required clocks for MT6797: "mm", "mfg", "vdec"
 	Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt"
 
 Optional properties:

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index aa27db6..286f4e1 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -166,6 +166,7 @@ keithkoep	Keith & Koep GmbH
 keymile	Keymile GmbH
 khadas	Khadas
 kinetic Kinetic Technologies
+kingnovel	Kingnovel Technology Co., Ltd.
 kosagi	Sutajio Ko-Usagi PTE Ltd.
 kyo	Kyocera Corporation
 lacie	LaCie
@@ -173,6 +174,7 @@ lantiq	Lantiq Semiconductor
 lego	LEGO Systems A/S
 lenovo	Lenovo Group Ltd.
 lg	LG Corporation
+libretech	Shenzhen Libre Technology Co., Ltd
 licheepi	Lichee Pi
 linaro	Linaro Limited
 linux	Linux-specific binding
@@ -332,6 +334,7 @@ tronfy	Tronfy
 tronsmart	Tronsmart
 truly	Truly Semiconductors Limited
 tyan	Tyan Computer Corporation
+ucrobotics	uCRobotics
 udoo	Udoo
 uniwest	United Western Technologies Corp (UniWest)
 upisemi	uPI Semiconductor Corp.
@@ -357,6 +360,7 @@ xlnx	Xilinx
 xunlong	Shenzhen Xunlong Software CO.,Limited
 zarlink	Zarlink Semiconductor
 zeitec	ZEITEC Semiconductor Co., LTD.
+zidoo	Shenzhen Zidoo Technology Co., Ltd.
 zii	Zodiac Inflight Innovations
 zte	ZTE Corp.
 zyxel	ZyXEL Communications Corp.

arch/arm64/boot/dts/Makefile

View file

diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 080232b..8e19512 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,3 +1,4 @@
+dts-dirs += actions
 dts-dirs += al
 dts-dirs += allwinner
 dts-dirs += altera
@@ -14,6 +15,7 @@ dts-dirs += marvell
 dts-dirs += mediatek
 dts-dirs += nvidia
 dts-dirs += qcom
+dts-dirs += realtek
 dts-dirs += renesas
 dts-dirs += rockchip
 dts-dirs += socionext

arch/arm64/boot/dts/actions/Makefile

View file

diff --git a/arch/arm64/boot/dts/actions/Makefile b/arch/arm64/boot/dts/actions/Makefile
new file mode 100644
index 0000000..62922d6
--- /dev/null
+++ b/arch/arm64/boot/dts/actions/Makefile
@@ -0,0 +1,5 @@
+dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb
+
+always		:= $(dtb-y)
+subdir-y	:= $(dts-dirs)
+clean-files	:= *.dtb

arch/arm64/boot/dts/actions/s900-bubblegum-96.dts

View file

diff --git a/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts b/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
new file mode 100644
index 0000000..a0c3484
--- /dev/null
+++ b/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017 Andreas Färber
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+
+/dts-v1/;
+
+#include "s900.dtsi"
+
+/ {
+	compatible = "ucrobotics,bubblegum-96", "actions,s900";
+	model = "Bubblegum-96";
+
+	aliases {
+		serial5 = &uart5;
+	};
+
+	chosen {
+		stdout-path = "serial5:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x0 0x0 0x80000000>;
+	};
+};
+
+&timer {
+	clocks = <&hosc>;
+};
+
+&uart5 {
+	status = "okay";
+};

arch/arm64/boot/dts/actions/s900.dtsi

View file

diff --git a/arch/arm64/boot/dts/actions/s900.dtsi b/arch/arm64/boot/dts/actions/s900.dtsi
new file mode 100644
index 0000000..11406f6
--- /dev/null
+++ b/arch/arm64/boot/dts/actions/s900.dtsi
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2017 Andreas Färber
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "actions,s900";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	cpus {
+		#address-cells = <2>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53", "arm,armv8";
+			reg = <0x0 0x0>;
+			enable-method = "psci";
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53", "arm,armv8";
+			reg = <0x0 0x1>;
+			enable-method = "psci";
+		};