]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2016 23:58:28 +0000 (15:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2016 23:58:28 +0000 (15:58 -0800)
Pull ARM 64-bit DT updates from Arnd Bergmann:
 "A couple of interesting new SoC platforms are now supported, these are
  the respective DTS sources:

   - Samsung Exynos5433 mobile phone platform, including an (almost)
     fully supported phone reference board.
   - Hisilicon Hip07 server platform and D05 board, the latest iteration
     of their product line, now with 64 Cortex-A72 cores across two
     sockets.
   - Allwinner A64 SoC, the first 64-bit chip from their "sunxi" product
     line, used in Android tablets and ultra-cheap development boards
   - NXP LS1046A Communication processor, improving on the earlier
     LS1043A with faster CPU cores
   - Qualcomm MSM8992 (Snapdragon 808) and MSM8994 (Snapdragon 810)
     mobile phone SoCs
   - Early support for the Nvidia Tegra Tegra186 SoC
   - Amlogic S905D is a minor variant of their existing Android consumer
     product line
   - Rockchip PX5 automotive platform, a close relative of their popular
     rk3368 Android tablet chips

  Aside from the respective evaluation platforms for the above chips,
  there are only a few consumer devices and boards added this time:

   - Huawei Nexus 6P (Angler) mobile phone
   - LG Nexus 5x (Bullhead) mobile phone
   - Nexbox A1 and A95X Android TV boxes
   - Pine64 development board based on Allwinner A64
   - Globalscale Marvell ESPRESSOBin community board based on Armada 3700
   - Renesas "R-Car Starter Kit Pro" (M3ULCB) low-cost automotive board

  For the existing platforms, we get bug fixes and new peripheral
  support for Juno, Renesas, Uniphier, Amlogic, Samsung, Broadcom,
  Rockchip, Berlin, and ZTE"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (168 commits)
  arm64: dts: fix build errors from missing dependencies
  ARM64: dts: meson-gxbb: add SCPI pre-1.0 compatible
  ARM64: dts: meson-gxl: Add support for Nexbox A95X
  ARM64: dts: meson-gxm: Add support for the Nexbox A1
  ARM: dts: artpec: add pcie support
  arm64: dts: berlin4ct-dmp: add missing unit name to /memory node
  arm64: dts: berlin4ct-stb: add missing unit name to /memory node
  arm64: dts: berlin4ct: add missing unit name to /soc node
  arm64: dts: qcom: msm8916: Add ddr support to sdhc1
  arm64: dts: exynos: Enable HS400 mode for eMMC for TM2
  ARM: dts: Add xo to sdhc clock node on qcom platforms
  ARM64: dts: Add support for Meson GXM
  dt-bindings: add rockchip RK1108 Evaluation board
  arm64: dts: NS2: Add PCI PHYs
  arm64: dts: NS2: enable sdio1
  arm64: dts: exynos: Add the mshc_2 node for supporting T-Flash
  arm64: tegra: Add NVIDIA P2771 board support
  arm64: tegra: Enable PSCI on P3310
  arm64: tegra: Add NVIDIA P3310 processor module support
  arm64: tegra: Add GPIO controllers on Tegra186
  ...

23 files changed:
1  2 
Documentation/devicetree/bindings/arm/qcom.txt
Documentation/devicetree/bindings/arm/rockchip.txt
Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
Documentation/devicetree/bindings/arm/shmobile.txt
Documentation/devicetree/bindings/i2c/trivial-devices.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm64/boot/dts/arm/juno-base.dtsi
arch/arm64/boot/dts/arm/juno-r1.dts
arch/arm64/boot/dts/arm/juno-r2.dts
arch/arm64/boot/dts/arm/juno.dts
arch/arm64/boot/dts/broadcom/ns2-svk.dts
arch/arm64/boot/dts/broadcom/ns2.dtsi
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
arch/arm64/boot/dts/marvell/armada-3720-db.dts
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
arch/arm64/boot/dts/renesas/r8a7795.dtsi
arch/arm64/boot/dts/renesas/r8a7796.dtsi
arch/arm64/boot/dts/rockchip/rk3368.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi
arch/arm64/boot/dts/zte/zx296718.dtsi

index 43abf4e0a0a5474932e0aed5dd0b224ebefb2def,eb4057e77c23a85844f4aab29d5d17d72349eb47..028d16e721862effcf95ee4e9055856255e99879
@@@ -21,8 -21,9 +21,10 @@@ The 'SoC' element must be one of the fo
        apq8096
        msm8916
        msm8974
+       msm8992
+       msm8994
        msm8996
 +      mdm9615
  
  The 'board' element must be one of the following strings:
  
index 3c7acf22957a365afebe45eb0b8ac12ae2c0b43b,29bf24ca0b7b53503e3d9c618b5db54e55d8feca..5d8229d74a5fe526c6911d398894a321478be559
@@@ -51,9 -47,9 +51,9 @@@ Boards
      compatible = "renesas,bockw", "renesas,r8a7778"
    - Genmai (RTK772100BC00000BR)
      compatible = "renesas,genmai", "renesas,r7s72100"
 -  - Gose
 +  - Gose (RTP0RC7793SEB00010S)
      compatible = "renesas,gose", "renesas,r8a7793"
-   - H3ULCB (RTP0RC7795SKB00010S)
+   - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKB00010S)
      compatible = "renesas,h3ulcb", "renesas,r8a7795";
    - Henninger
      compatible = "renesas,henninger", "renesas,r8a7791"
@@@ -65,7 -61,9 +65,9 @@@
      compatible = "renesas,kzm9g", "renesas,sh73a0"
    - Lager (RTP0RC7790SEB00010S)
      compatible = "renesas,lager", "renesas,r8a7790"
 -  - Marzen
+   - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKB00010S)
+     compatible = "renesas,m3ulcb", "renesas,r8a7796";
 +  - Marzen (R0P7779A00010S)
      compatible = "renesas,marzen", "renesas,r8a7779"
    - Porter (M2-LCDP)
      compatible = "renesas,porter", "renesas,r8a7791"
index 448c831753f85a3870b75539fc046b70c08aaf07,7de215da9f5585033f37f2d95bb654d5716a4397..16d3b5e7f5d1f52d1bf3c5f98220ba4f09b99b8f
@@@ -197,8 -186,8 +197,9 @@@ neonode            Neonode Inc
  netgear       NETGEAR
  netlogic      Broadcom Corporation (formerly NetLogic Microsystems)
  netxeon               Shenzhen Netxeon Technology CO., LTD
+ nexbox        Nexbox
  newhaven      Newhaven Display International
 +ni    National Instruments
  nintendo      Nintendo
  nokia Nokia
  nuvoton       Nuvoton Technology Corporation
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index 773ed593da4d976b7d65374e71a0eab1f823a025,863503d78f57e0830d591b6c66f2670840de70a1..4fcdeca3a983e2d4489cb3347f6973a4b1c22952
  
                #include "ns2-clock.dtsi"
  
 +              enet: ethernet@61000000 {
 +                      compatible = "brcm,ns2-amac";
 +                      reg = <0x61000000 0x1000>,
 +                            <0x61090000 0x1000>,
 +                            <0x61030000 0x100>;
 +                      reg-names = "amac_base", "idm_base", "nicpm_base";
 +                      interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
 +                      phy-handle = <&gphy0>;
 +                      phy-mode = "rgmii";
 +                      status = "disabled";
 +              };
 +
+               pdc0: iproc-pdc0@612c0000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x612c0000 0x445>;  /* PDC FS0 regs */
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+               pdc1: iproc-pdc1@612e0000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x612e0000 0x445>;  /* PDC FS1 regs */
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+               pdc2: iproc-pdc2@61300000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x61300000 0x445>;  /* PDC FS2 regs */
+                       interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
+               pdc3: iproc-pdc3@61320000 {
+                       compatible = "brcm,iproc-pdc-mbox";
+                       reg = <0x61320000 0x445>;  /* PDC FS3 regs */
+                       interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
+                       #mbox-cells = <1>;
+                       brcm,rx-status-len = <32>;
+                       brcm,use-bcm-hdr;
+               };
                dma0: dma@61360000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x61360000 0x1000>;
index d058e56db72d46f8d6b9cd4444c76219ffd0e9ef,aa5a0fbf2cdff765340098868ae249bb4966cee2..e5935f28848c564ae3627c6314248dc82070bcbc
                        clocks = <&sysclk>;
                };
  
 +              dcfg: dcfg@1e00000 {
 +                      compatible = "fsl,ls2080a-dcfg", "syscon";
 +                      reg = <0x0 0x1e00000 0x0 0x10000>;
 +                      little-endian;
 +              };
 +
+               tmu: tmu@1f80000 {
+                       compatible = "fsl,qoriq-tmu";
+                       reg = <0x0 0x1f80000 0x0 0x10000>;
+                       interrupts = <0 23 0x4>;
+                       fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>;
+                       fsl,tmu-calibration = <0x00000000 0x00000026
+                                              0x00000001 0x0000002d
+                                              0x00000002 0x00000032
+                                              0x00000003 0x00000039
+                                              0x00000004 0x0000003f
+                                              0x00000005 0x00000046
+                                              0x00000006 0x0000004d
+                                              0x00000007 0x00000054
+                                              0x00000008 0x0000005a
+                                              0x00000009 0x00000061
+                                              0x0000000a 0x0000006a
+                                              0x0000000b 0x00000071
+                                              0x00010000 0x00000025
+                                              0x00010001 0x0000002c
+                                              0x00010002 0x00000035
+                                              0x00010003 0x0000003d
+                                              0x00010004 0x00000045
+                                              0x00010005 0x0000004e
+                                              0x00010006 0x00000057
+                                              0x00010007 0x00000061
+                                              0x00010008 0x0000006b
+                                              0x00010009 0x00000076
+                                              0x00020000 0x00000029
+                                              0x00020001 0x00000033
+                                              0x00020002 0x0000003d
+                                              0x00020003 0x00000049
+                                              0x00020004 0x00000056
+                                              0x00020005 0x00000061
+                                              0x00020006 0x0000006d
+                                              0x00030000 0x00000021
+                                              0x00030001 0x0000002a
+                                              0x00030002 0x0000003c
+                                              0x00030003 0x0000004e>;
+                       little-endian;
+                       #thermal-sensor-cells = <1>;
+               };
+               thermal-zones {
+                       cpu_thermal: cpu-thermal {
+                               polling-delay-passive = <1000>;
+                               polling-delay = <5000>;
+                               thermal-sensors = <&tmu 4>;
+                               trips {
+                                       cpu_alert: cpu-alert {
+                                               temperature = <75000>;
+                                               hysteresis = <2000>;
+                                               type = "passive";
+                                       };
+                                       cpu_crit: cpu-crit {
+                                               temperature = <85000>;
+                                               hysteresis = <2000>;
+                                               type = "critical";
+                                       };
+                               };
+                               cooling-maps {
+                                       map0 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu0 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                                       map1 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu2 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                                       map2 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu4 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                                       map3 {
+                                               trip = <&cpu_alert>;
+                                               cooling-device =
+                                                       <&cpu6 THERMAL_NO_LIMIT
+                                                       THERMAL_NO_LIMIT>;
+                                       };
+                               };
+                       };
+               };
                serial0: serial@21c0500 {
                        compatible = "fsl,ns16550", "ns16550a";
                        reg = <0x0 0x21c0500 0x0 0x100>;
index 625dda713548da785d1fe3ced864d469dd4b4276,a39a702b904da73c831afbdec969b76847e59f6d..bbf594bce930ed8bd7bce231790b4535b252a943
                        #power-domain-cells = <0>;
                };
  
 +              rst: reset-controller@e6160000 {
 +                      compatible = "renesas,r8a7795-rst";
 +                      reg = <0 0xe6160000 0 0x0200>;
 +              };
 +
+               prr: chipid@fff00044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xfff00044 0 4>;
+               };
                sysc: system-controller@e6180000 {
                        compatible = "renesas,r8a7795-sysc";
                        reg = <0 0xe6180000 0 0x0400>;
index 75c8c55a824835bf29e61f162aef99c76ffc65d0,41a050d2f1925552d41e8bf6a6701cd04b7d6dfa..28ba59a00cd86934ad335c2f261b3a0176175f7f
                        #power-domain-cells = <0>;
                };
  
 +              rst: reset-controller@e6160000 {
 +                      compatible = "renesas,r8a7796-rst";
 +                      reg = <0 0xe6160000 0 0x0200>;
 +              };
 +
+               prr: chipid@fff00044 {
+                       compatible = "renesas,prr";
+                       reg = <0 0xfff00044 0 4>;
+               };
                sysc: system-controller@e6180000 {
                        compatible = "renesas,r8a7796-sysc";
                        reg = <0 0xe6180000 0 0x0400>;
Simple merge