]> Git Repo - linux.git/commitdiff
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <[email protected]>
Wed, 18 May 2016 19:58:39 +0000 (12:58 -0700)
committerLinus Torvalds <[email protected]>
Wed, 18 May 2016 19:58:39 +0000 (12:58 -0700)
Pull ARM 64-bit DT updates from Arnd Bergmann:
 "We continue ramping up platform support for 64-bit ARM machines, with
  111 individual non-merge changesets touching 21 platforms.

  The LG1312 platform is completely new and is the first ARM platform by
  LG that we support in the mainline kernel.  Two other SoCs got added
  that are updated versions of existing SoC families, so the port mainly
  consists of new dts files:

   - The Hisilicon Hip06/D03 is the latest server platform from
     Huawei/Hisilicon, and follows the Hip05/D02 platform.

   - Rockchip RK3399 follows the 32-bit RK3288 that is popular in
     low-end Chromebooks and the 64-bit RK3368 that is mainly found in
     chinese Android TV boxes.

  The 96Boards HiKey based on the Hisilicon Hi6220 (Kirin 620) gets a
  long-awaited overhaul with a lot of devices enabled in the DT, so it
  should be much more usable with a mainline kernel now.  See also

     https://plus.google.com/111524780435806926688/posts/PeGb2VsNhJd

  A lot of work went into enabling new device drivers on existing
  machines, but we also have a couple of new commercially available
  machines:

   - Google Pixel C laptop based on Tegra210
   - Hardkernel Odroid C2 Based on Amlogic Meson GXBB (S905)
   - Geekbuying GeekBox based on Rockchip RK3368

  And finally, a couple of reference or development platforms that are
  not end-user platforms but are used for trying out the respective SoC
  platforms:

   - Amlogic Meson GXBB P200 and P201 development systems
   - NXP Layerscape 1043A QDS development board
   - Hisilicon Hip06 D03 server board, as mentioned above
   - LG1312 Reference Design
   - RK3399 Evaluation Board"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (104 commits)
  arm64: dts: marvell: add XOR node for Armada 3700 SoC
  dt-bindings: document rockchip rk3399-evb board
  arm64: dts: rockchip: add dts file for RK3399 evaluation board
  arm64: dts: rockchip: add core dtsi file for RK3399 SoCs
  dt-bindings: rockchip-dw-mshc: add description for rk3399
  arm64: dts: marvell: Use a SoC-specific compatible for xHCI on Armada37xx
  arm64: dts: marvell: Rename armada-37xx USB node
  arm64: dts: marvell: Clean up armada-3720-db
  Documentation: arm64: Add Hisilicon Hip06 D03 dts binding
  arm64: dts: Add initial dts for Hisilicon Hip06 D03 board
  arm64: dts: hip05: Add nor flash support
  arm64: dts: hip05: fix its node without msi-cells
  arm64: dts: r8a7795: Don't disable referenced optional clocks
  arm64: dts: salvator-x: populate EXTALR
  arm64: dts: r8a7795: enable PCIe on Salvator-X
  arm64: dts: r8a7795: Add PCIe nodes
  arm64: tegra: Add IOMMU node to GM20B on Tegra210
  arm64: tegra: Add reference clock to GM20B on Tegra210
  dt-bindings: Add documentation for GM20B GPU
  dt-bindings: gk20a: Document iommus property
  ...

1  2 
Documentation/devicetree/bindings/arm/rockchip.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi

index 585496f203df418a4fb2669ebfb54e951851c1cc,6491b560c876d4b43936f38dfbc66e14469e7299..715d960d5eea66f71bdadd2429f265b520e7b8cd
@@@ -39,6 -39,10 +39,10 @@@ Rockchip platforms device tree binding
      Required root node properties:
        - compatible = "netxeon,r89", "rockchip,rk3288";
  
+ - GeekBuying GeekBox:
+     Required root node properties:
+       - compatible = "geekbuying,geekbox", "rockchip,rk3368";
  - Google Brain (dev-board):
      Required root node properties:
        - compatible = "google,veyron-brain-rev0", "google,veyron-brain",
                     "google,veyron-speedy-rev3", "google,veyron-speedy-rev2",
                     "google,veyron-speedy", "google,veyron", "rockchip,rk3288";
  
 +- mqmaker MiQi:
 +    Required root node properties:
 +      - compatible = "mqmaker,miqi", "rockchip,rk3288";
 +
  - Rockchip RK3368 evb:
      Required root node properties:
        - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";
  
  - Rockchip RK3228 Evaluation board:
      Required root node properties:
-       - compatible = "rockchip,rk3228-evb", "rockchip,rk3228";
+      - compatible = "rockchip,rk3228-evb", "rockchip,rk3228";
+ - Rockchip RK3399 evb:
+     Required root node properties:
+       - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
index d06dd3eba05c7aabf3706c6c1a2d04d72b59ca9b,2988be977857c2ee6501c5a0275d5f47344510e0..3af48e8cc7d0ac45cff52efd161587cc891ee18a
@@@ -16,7 -16,6 +16,7 @@@ al    Annapurna Lab
  allwinner     Allwinner Technology Co., Ltd.
  alphascale    AlphaScale Integrated Circuits Systems, Inc.
  altr  Altera Corp.
 +amazon        Amazon.com, Inc.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  amd   Advanced Micro Devices (AMD), Inc.
  amlogic       Amlogic, Inc.
@@@ -30,7 -29,6 +30,7 @@@ arm   ARM Ltd
  armadeus      ARMadeus Systems SARL
  artesyn       Artesyn Embedded Technologies Inc.
  asahi-kasei   Asahi Kasei Corp.
 +aspeed        ASPEED Technology Inc.
  atlas Atlas Scientific LLC
  atmel Atmel Corporation
  auo   AU Optronics Corporation
@@@ -93,6 -91,7 +93,7 @@@ firefly       Firefl
  focaltech     FocalTech Systems Co.,Ltd
  fsl   Freescale Semiconductor
  ge    General Electric Company
+ geekbuying    GeekBuying
  GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  geniatech     Geniatech, Inc.
@@@ -154,7 -153,6 +155,7 @@@ mitsubishi Mitsubishi Electric Corporat
  mosaixtech    Mosaix Technologies, Inc.
  moxa  Moxa
  mpl   MPL AG
 +mqmaker       mqmaker Inc.
  msi   Micro-Star International Co. Ltd.
  mti   Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
  mundoreader   Mundo Reader S.L.
@@@ -180,7 -178,6 +181,7 @@@ option     Option N
  ortustech     Ortus Technology Co., Ltd.
  ovti  OmniVision Technologies
  ORCL  Oracle Corporation
 +oxsemi        Oxford Semiconductor, Ltd.
  panasonic     Panasonic Corporation
  parade        Parade Technologies Inc.
  pericom       Pericom Technology Inc.
@@@ -254,7 -251,6 +255,7 @@@ tplink     TP-LINK Technologies Co., Ltd
  tronfy        Tronfy
  tronsmart     Tronsmart
  truly Truly Semiconductors Limited
 +tyan  Tyan Computer Corporation
  upisemi       uPI Semiconductor Corp.
  urt   United Radiant Technology Corporation
  usi   Universal Scientific Industrial Co., Ltd.
@@@ -264,7 -260,6 +265,7 @@@ via        VIA Technologies, Inc
  virtio        Virtual I/O Device Specification, developed by the OASIS consortium
  vivante       Vivante Corporation
  voipac        Voipac Technologies s.r.o.
 +wd    Western Digital Corp.
  wexler        Wexler
  winbond Winbond Electronics corp.
  wlf   Wolfson Microelectronics
index ba04877515245bfd4c4649488ce518a868533fdd,f7a36dbbcb15460b67ecdb727873383e85f00fb2..c569f761d0902008718c27aa1d1c9daccc7a2822
                };
  
                sata1: sata@1a000000 {
-                       compatible = "apm,xgene-ahci";
+                       compatible = "apm,xgene-ahci-v2";
                        reg = <0x0 0x1a000000 0x0 0x1000>,
                              <0x0 0x1f200000 0x0 0x1000>,
                              <0x0 0x1f20d000 0x0 0x1000>,
                };
  
                sata2: sata@1a200000 {
-                       compatible = "apm,xgene-ahci";
+                       compatible = "apm,xgene-ahci-v2";
                        reg = <0x0 0x1a200000 0x0 0x1000>,
                              <0x0 0x1f210000 0x0 0x1000>,
                              <0x0 0x1f21d000 0x0 0x1000>,
                };
  
                sata3: sata@1a400000 {
-                       compatible = "apm,xgene-ahci";
+                       compatible = "apm,xgene-ahci-v2";
                        reg = <0x0 0x1a400000 0x0 0x1000>,
                              <0x0 0x1f220000 0x0 0x1000>,
                              <0x0 0x1f22d000 0x0 0x1000>,
                                     <0 113 4>,
                                     <0 114 4>,
                                     <0 115 4>;
 +                      channel = <12>;
                        port-id = <1>;
                        dma-coherent;
                        clocks = <&xge1clk 0>;
index b0ed44313a5bc134c4919f5b82b02eedfa01a590,6aebcf3a0be467257614a78287801f0c41f2673b..2adad8c8cd2743b33616644b27b6b12d7b32a418
@@@ -44,6 -44,7 +44,7 @@@
  
  /dts-v1/;
  /include/ "uniphier-ph1-ld20.dtsi"
+ /include/ "uniphier-ref-daughter.dtsi"
  /include/ "uniphier-support-card.dtsi"
  
  / {
@@@ -70,6 -71,7 +71,6 @@@
                i2c3 = &i2c3;
                i2c4 = &i2c4;
                i2c5 = &i2c5;
 -              i2c6 = &i2c6;
        };
  };
  
index 651c9d9d2d54658b7fa4eb73b1e0ed5f57d02995,8b908cd7eb04e19bddd7974d96f740d0ce57c872..95328808e3c12e8c71ff047b5690ea122fc5ae33
        };
  
        clocks {
+               refclk: ref {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <25000000>;
+               };
                uart_clk: uart_clk {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
  
                i2c2: i2c@58782000 {
                        compatible = "socionext,uniphier-fi2c";
 -                      status = "disabled";
                        reg = <0x58782000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 43 4>;
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&pinctrl_i2c2>;
                        clocks = <&i2c_clk>;
 -                      clock-frequency = <100000>;
 +                      clock-frequency = <400000>;
                };
  
                i2c3: i2c@58783000 {
  
                i2c4: i2c@58784000 {
                        compatible = "socionext,uniphier-fi2c";
 +                      status = "disabled";
                        reg = <0x58784000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 45 4>;
 +                      pinctrl-names = "default";
 +                      pinctrl-0 = <&pinctrl_i2c4>;
                        clocks = <&i2c_clk>;
 -                      clock-frequency = <400000>;
 +                      clock-frequency = <100000>;
                };
  
                i2c5: i2c@58785000 {
                        clock-frequency = <400000>;
                };
  
 -              i2c6: i2c@58786000 {
 -                      compatible = "socionext,uniphier-fi2c";
 -                      reg = <0x58786000 0x80>;
 -                      #address-cells = <1>;
 -                      #size-cells = <0>;
 -                      interrupts = <0 26 4>;
 -                      clocks = <&i2c_clk>;
 -                      clock-frequency = <400000>;
 -              };
 -
                system_bus: system-bus@58c00000 {
                        compatible = "socionext,uniphier-system-bus";
                        status = "disabled";
This page took 0.109018 seconds and 4 git commands to generate.