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

Commit 80c2e887 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.16-rockchip-dt' of... 

Merge tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: devicetree changes for v3.16" from Heiko Stübner:

Addition of missing board compatible names and their vendor-prefixes
as well as the dts portions of the pinctrl rework.

* tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: convert pinctrl nodes to new bindings
  ARM: dts: rockchip: add root compatible properties
  of: add mundoreader and radxa vendor prefixes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 61e810d3 56f2b894

Documentation/devicetree/bindings/arm/rockchip.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Rockchip platforms device tree bindings

---------------------------------------



- bq Curie 2 tablet:

    Required root node properties:

      - compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";



- Radxa Rock board:

    Required root node properties:

      - compatible = "radxa,rock", "rockchip,rk3188";

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ microchip Microchip Technology Inc. 
mosaixtech	Mosaix Technologies, Inc.

moxa	Moxa

mpl	MPL AG

mundoreader	Mundo Reader S.L.

mxicy	Macronix International Co., Ltd.

national	National Semiconductor

neonode		Neonode Inc.
@@ -98,6 +99,7 @@ powervr PowerVR (deprecated, use img) 
qca	Qualcomm Atheros, Inc.

qcom	Qualcomm Technologies, Inc

qnap	QNAP Systems, Inc.

radxa	Radxa

raidsonic	RaidSonic Technology GmbH

ralink	Mediatek/Ralink Technology Corp.

ramtron	Ramtron International

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


/ {

	model = "bq Curie 2";

	compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";



	memory {

		reg = <0x60000000 0x40000000>;

arch/arm/boot/dts/rk3066a.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 


		pinctrl@20008000 {

			compatible = "rockchip,rk3066a-pinctrl";

			reg = <0x20008000 0x150>;

			rockchip,grf = <&grf>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

arch/arm/boot/dts/rk3188-radxarock.dts

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


/ {

	model = "Radxa Rock";

	compatible = "radxa,rock", "rockchip,rk3188";



	memory {

		reg = <0x60000000 0x80000000>;