Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f480960 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.9-rockchip-dts32-1' of... 

Merge tag 'v4.9-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts32 changes for 4.9" from Heiko Stübner:

32bit Rockchip devicetree changes containing two new rk3288 boards (Fennec
and Firefly-reload), display support for the rk3288-evb, support for the
recently added firmware reboot-flag support and some housekeeping cleanups.

* tag 'v4.9-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add sensor-supplies on PopMetal-RK3288 board
  ARM: dts: rockchip: fix L3G4200D i2c address on PopMetal-RK3288 board
  ARM: dts: rockchip: enable usbotg for Popemtal-rk3288 board
  ARM: dts: rockchip: add missing regulators for firefly reload board
  ARM: dts: rockchip: remove excess sd properties from firefly reload
  ARM: dts: rockchip: add syscon-reboot-mode DT node
  soc: rockchip: add reboot-mode header
  ARM: dts: rockchip: move rk3288 usbphy under the GRF node
  ARM: dts: rockchip: add rk3288-firefly-reload
  ARM: dts: rockchip: add dts for RK3288-Fennec boards
  ARM: dts: rockchip: add the panel power supply for rk3288-evb board with rk808 pmu
  ARM: dts: rockchip: add the panel power supply for rk3288-evb board with act8846 pmu
  ARM: dts: rockchip: add eDP/panel display device nodes for rk3288-evb
parents d9d37f70 4314f4b6

Documentation/devicetree/bindings/arm/rockchip.txt

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ Rockchip platforms device tree bindings 
    or

      - compatible = "firefly,firefly-rk3288-beta", "rockchip,rk3288";



- Firefly Firefly-RK3288 Reload board:

    Required root node properties:

      - compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";



- ChipSPARK PopMetal-RK3288 board:

    Required root node properties:

      - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
@@ -110,6 +114,10 @@ Rockchip platforms device tree bindings 
- Rockchip RK3229 Evaluation board:

     - compatible = "rockchip,rk3229-evb", "rockchip,rk3229";



- Rockchip RK3288 Fennec board:

    Required root node properties:

     - compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";



- Rockchip RK3399 evb:

    Required root node properties:

      - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -625,8 +625,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3229-evb.dtb \

	rk3288-evb-act8846.dtb \

	rk3288-evb-rk808.dtb \

	rk3288-fennec.dtb \

	rk3288-firefly-beta.dtb \

	rk3288-firefly.dtb \

	rk3288-firefly-reload.dtb \

	rk3288-miqi.dtb \

	rk3288-popmetal.dtb \

	rk3288-r89.dtb \

arch/arm/boot/dts/rk3036.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/pinctrl/rockchip.h>

#include <dt-bindings/clock/rk3036-cru.h>

#include <dt-bindings/soc/rockchip,boot-mode.h>

#include "skeleton.dtsi"



/ {
@@ -313,8 +314,17 @@ 
	};



	grf: syscon@20008000 {

		compatible = "rockchip,rk3036-grf", "syscon";

		compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd";

		reg = <0x20008000 0x1000>;



		reboot-mode {

			compatible = "syscon-reboot-mode";

			offset = <0x1d8>;

			mode-normal = <BOOT_NORMAL>;

			mode-recovery = <BOOT_RECOVERY>;

			mode-bootloader = <BOOT_FASTBOOT>;

			mode-loader = <BOOT_BL_DOWNLOAD>;

		};

	};



	acodec: acodec-ana@20030000 {

arch/arm/boot/dts/rk3288-evb-act8846.dts

+4 −0
Original line number Diff line number Diff line
@@ -206,6 +206,10 @@ 
	};

};



&panel {

	power-supply = <&vcc_lcd>;

};



&pinctrl {

	lcd {

		lcd_en: lcd-en  {

arch/arm/boot/dts/rk3288-evb-rk808.dts

+4 −0
Original line number Diff line number Diff line
@@ -233,3 +233,7 @@ 
		};

	};

};



&panel {

	power-supply = <&vcc_lcd>;

};