Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2015 17:36:52 +0000 (09:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2015 17:36:52 +0000 (09:36 -0800)
Pull ARM SoC DT updates from Olof Johansson:
 "DT changes continue to be the bulk of our merge window contents.

  We continue to have a large set of changes across the board as new
  platforms and drivers are added.

  Some of the new platforms are:
   - Alphascale ASM9260
   - Marvell Armada 388
   - CSR Atlas7
   - TI Davinci DM816x
   - Hisilicon HiP01
   - ST STiH418

  There have also been some sweeping changes, including relicensing of
  DTS contents from GPL to GPLv2+/X11 so that the same files can be
  reused in other non-GPL projects more easily.  There's also been
  changes to the DT Makefile to make it a little less conflict-ridden
  and churny down the road"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
  ARM: dts: Add PPMU node for exynos4412-trats2
  ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
  ARM: dts: Add PPMU dt node for exynos4 and exynos4210
  ARM: dts: Add PPMU dt node for exynos3250
  ARM: dts: add mipi dsi device node for exynos4415
  ARM: dts: add fimd device node for exynos4415
  ARM: dts: Add syscon phandle to the video-phy node for Exynos4
  ARM: dts: Add sound nodes for exynos4412-trats2
  ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
  ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
  ARM: dts: Add max77693 charger node for exynos4412-trats2
  ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
  ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
  ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2
  ARM: dts: am57xx-beagle-x15: Fix USB2 mode
  ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
  ARM: dts: dra72-evm: Add extcon nodes for USB
  ARM: dts: dra7-evm: Add extcon nodes for USB
  ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
  ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
  ...

47 files changed:
1  2 
Documentation/devicetree/bindings/serial/of-serial.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/armada-370-netgear-rn102.dts
arch/arm/boot/dts/armada-370-netgear-rn104.dts
arch/arm/boot/dts/armada-38x.dtsi
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/berlin2q.dtsi
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos4210-trats.dts
arch/arm/boot/dts/exynos4210-universal_c210.dts
arch/arm/boot/dts/exynos4210.dtsi
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm/boot/dts/exynos4x12.dtsi
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5420.dtsi
arch/arm/boot/dts/imx6qdl.dtsi
arch/arm/boot/dts/imx6sx-sdb.dts
arch/arm/boot/dts/omap3-n900.dts
arch/arm/boot/dts/r8a7790-lager.dts
arch/arm/boot/dts/r8a7791-koelsch.dts
arch/arm/boot/dts/rk3288-evb-rk808.dts
arch/arm/boot/dts/rk3288-evb.dtsi
arch/arm/boot/dts/rk3288.dtsi
arch/arm/boot/dts/sama5d3xmb.dtsi
arch/arm/boot/dts/sama5d4.dtsi
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
arch/arm/boot/dts/sun5i-a10s.dtsi
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
arch/arm/boot/dts/sun5i-a13.dtsi
arch/arm/boot/dts/sun6i-a31.dtsi
arch/arm/boot/dts/sun7i-a20-bananapi.dts
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
arch/arm/boot/dts/sun7i-a20.dtsi
arch/arm/boot/dts/sun8i-a23.dtsi
arch/arm/boot/dts/sun9i-a80-optimus.dts
arch/arm/boot/dts/sun9i-a80.dtsi
arch/arm/boot/dts/vf610-twr.dts
include/dt-bindings/clock/rk3288-cru.h

index 0229b71dc74bcf5d17a8191f33e65f381a36d5a2,e02e14d95e0f506e2bf86617a40b264efa3d49d1..389ca1347a771cb049994db077fc38d2d04b7020
@@@ -8,10 -7,11 +8,11 @@@ abcn  Abracon Corporatio
  active-semi   Active-Semi International Inc
  ad    Avionic Design GmbH
  adapteva      Adapteva, Inc.
 +adh   AD Holdings Plc.
  adi   Analog Devices, Inc.
  aeroflexgaisler       Aeroflex Gaisler AB
 -ak    Asahi Kasei Corp.
  allwinner     Allwinner Technology Co., Ltd.
+ alphascale    AlphaScale Integrated Circuits Systems, Inc.
  altr  Altera Corp.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  amd   Advanced Micro Devices (AMD), Inc.
@@@ -37,10 -36,9 +39,11 @@@ chipspark   ChipSPAR
  chrp  Common Hardware Reference Platform
  chunghwa      Chunghwa Picture Tubes Ltd.
  cirrus        Cirrus Logic, Inc.
+ cloudengines  Cloud Engines, Inc.
  cnm   Chips&Media, Inc.
 +cnxt  Conexant Systems, Inc.
  cortina       Cortina Systems, Inc.
 +cosmic        Cosmic Circuits
  crystalfontz  Crystalfontz America, Inc.
  dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom       DAVICOM Semiconductor, Inc.
@@@ -59,12 -57,11 +62,13 @@@ epcos      EPCOS A
  epfl  Ecole Polytechnique Fédérale de Lausanne
  epson Seiko Epson Corp.
  est   ESTeem Wireless Modems
 +ettus NI Ettus Research
  eukrea  Eukréa Electromatique
  everest       Everest Semiconductor Co. Ltd.
 +everspin      Everspin Technologies, Inc.
  excito        Excito
  fcs   Fairchild Semiconductor
+ firefly       Firefly
  fsl   Freescale Semiconductor
  GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 8e45ea44317e59a06a284b02fe75b5e702087883,7c15880bc8ba0ffcc13c1617a846d450e605a456..67c832c9dcf140d6203d742810a374aff867ef69
        pd_lcd1: lcd1-power-domain@10023CA0 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023CA0 0x20>;
+               #power-domain-cells = <0>;
        };
  
 +      l2c: l2-cache-controller@10502000 {
 +              compatible = "arm,pl310-cache";
 +              reg = <0x10502000 0x1000>;
 +              cache-unified;
 +              cache-level = <2>;
 +              arm,tag-latency = <2 2 1>;
 +              arm,data-latency = <2 2 1>;
 +      };
 +
        gic: interrupt-controller@10490000 {
                cpu-offset = <0x8000>;
        };
index 8bc97c415c9a6f4dba7574b8adec446a172b23a5,af59cab53bd959770788401a191d8219519082f7..f5e0ae780d6ce8dd25622abed741b03416570f03
        pd_isp: isp-power-domain@10023CA0 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10023CA0 0x20>;
+               #power-domain-cells = <0>;
        };
  
 +      l2c: l2-cache-controller@10502000 {
 +              compatible = "arm,pl310-cache";
 +              reg = <0x10502000 0x1000>;
 +              cache-unified;
 +              cache-level = <2>;
 +              arm,tag-latency = <2 2 1>;
 +              arm,data-latency = <3 2 1>;
 +              arm,double-linefill = <1>;
 +              arm,double-linefill-incr = <0>;
 +              arm,double-linefill-wrap = <1>;
 +              arm,prefetch-drop = <1>;
 +              arm,prefetch-offset = <7>;
 +      };
 +
        clock: clock-controller@10030000 {
                compatible = "samsung,exynos4412-clock";
                reg = <0x10030000 0x20000>;
Simple merge
Simple merge
index 2109d0763c1b6dca448449ba74709c6ced666cbb,f6c6a6e1cf3d1368e38eed5401c4f1d47ebcfb1f..d6c69ec443149da28012034ceea65ac2ba522539
                        vpu: vpu@02040000 {
                                compatible = "cnm,coda960";
                                reg = <0x02040000 0x3c000>;
 -                              interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>,
 -                                           <0 12 IRQ_TYPE_LEVEL_HIGH>;
 +                              interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>,
 +                                           <0 3 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "bit", "jpeg";
                                clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
-                                        <&clks IMX6QDL_CLK_MMDC_CH0_AXI>,
-                                        <&clks IMX6QDL_CLK_OCRAM>;
-                               clock-names = "per", "ahb", "ocram";
+                                        <&clks IMX6QDL_CLK_MMDC_CH0_AXI>;
+                               clock-names = "per", "ahb";
                                resets = <&src 1>;
                                iram = <&ocram>;
                        };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 910dcad2088a43c6a3e2756a18fffaba1a3ede61,1141850d0acb998a04dfbffb14fb75f03cb546d8..d771f687a13b50abad6f87ad6fb476e1d4377da9
                        bias-disable;
                };
  
 +              pcfg_pull_none_12ma: pcfg-pull-none-12ma {
 +                      bias-disable;
 +                      drive-strength = <12>;
 +              };
 +
+               sleep {
+                       global_pwroff: global-pwroff {
+                               rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+                       ddrio_pwroff: ddrio-pwroff {
+                               rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+                       ddr0_retention: ddr0-retention {
+                               rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
+                       };
+                       ddr1_retention: ddr1-retention {
+                               rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
+                       };
+               };
                i2c0 {
                        i2c0_xfer: i2c0-xfer {
                                rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
Simple merge
Simple merge
Simple merge
Simple merge
index c556688f8b8ba400a7bef986690e40a633f836e2,fd85720ec6a204ca2464206b8a98c890f64b761b..4910393d1b09013bcb929dc6325d8ddbd6a7d945
  / {
        interrupt-parent = <&intc>;
  
 -      aliases {
 -              serial0 = &uart1;
 -              serial1 = &uart3;
 -      };
 -
+       chosen {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               framebuffer@0 {
+                       compatible = "allwinner,simple-framebuffer",
+                                    "simple-framebuffer";
+                       allwinner,pipeline = "de_be0-lcd0";
+                       clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
+                       status = "disabled";
+               };
+       };
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
Simple merge
Simple merge
index 86584fcf5e323bc43489c79be74e43ef8931d3a2,d049443348301892f4c45134d0a612eeaddb8a3b..dd34527293e465d4739cf4518bbd8b292a61989b
  / {
        interrupt-parent = <&gic>;
  
 -      aliases {
 -              serial0 = &uart0;
 -              serial1 = &uart1;
 -              serial2 = &uart2;
 -              serial3 = &uart3;
 -              serial4 = &uart4;
 -              serial5 = &r_uart;
 -      };
 -
+       chosen {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               framebuffer@0 {
+                       compatible = "allwinner,simple-framebuffer",
+                                    "simple-framebuffer";
+                       allwinner,pipeline = "de_be0-lcd0";
+                       clocks = <&pll6 0>;
+                       status = "disabled";
+               };
+       };
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
Simple merge
Simple merge
index 1c34c24efe088c1887ddd4fc2412c6dbffa277d4,1e626335acf3d66ade8596e37921264138e4b9a1..dea419708d73ed112fd63a4c8bea747fd087e3ee
  #define SCLK_SDIO0_SAMPLE     119
  #define SCLK_SDIO1_SAMPLE     120
  #define SCLK_EMMC_SAMPLE      121
+ #define SCLK_USBPHY480M_SRC   122
+ #define SCLK_PVTM_CORE                123
+ #define SCLK_PVTM_GPU         124
  
 +#define SCLK_MAC              151
 +#define SCLK_MACREF_OUT               152
 +
  #define DCLK_VOP0             190
  #define DCLK_VOP1             191