redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Addition of missing board compatible names and their vendor-prefixes 

as well as the dts portions of the pinctrl rework.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJTbhKOAAoJEPOmecmc0R2BjM4H/2Ib1MZbZ4cUGyUG508aAnNx
 3mYI/a9Iir6yJvRHENQfWSS0uxggn4Q0W0upVgagDf07PwDxoAH9ISmjTHjII6tN
 2OAHbXQGBa16dN5y6fiVZDAf9SYexaSlWODKb/hqKxt28safl/HAvJYoI42SOKRG
 /D3FMi5DPeFNYTvUeROU0mdOvM3q9S6TMYrcPpdNPqzxFkPKUJsFA9tCu6Gpsk/x
 F90YAMlWdgWD8OjRYdzp4iIRQS97XFTSIZcDScDasCMXnGOX6RMd6x1AqFr93y3K
 zkqjzdCu4OoZhOiFbY0RUoS+CZUj9tROnX851nJ9TIVfA+71bSFjE0cXRWDLYH0=
 =fTm7
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
hifive-unleashed-5.1
Olof Johansson 2014-05-19 22:02:16 -07:00
parent 61e810d364 56f2b894dc
commit 80c2e8876c
7 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/devicetree/bindings/arm/rockchip.txt 100644
View File

@ -0,0 +1,10 @@
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";

2
Documentation/devicetree/bindings/vendor-prefixes.txt
View File

@ -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

1
arch/arm/boot/dts/rk3066a-bqcurie2.dts
View File

@ -18,6 +18,7 @@
/ {
model = "bq Curie 2";
compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
memory {
reg = <0x60000000 0x40000000>;

2
arch/arm/boot/dts/rk3066a.dtsi
View File

@ -79,7 +79,7 @@
pinctrl@20008000 {
compatible = "rockchip,rk3066a-pinctrl";
reg = <0x20008000 0x150>;
rockchip,grf = <&grf>;
#address-cells = <1>;
#size-cells = <1>;
ranges;

1
arch/arm/boot/dts/rk3188-radxarock.dts
View File

@ -17,6 +17,7 @@
/ {
model = "Radxa Rock";
compatible = "radxa,rock", "rockchip,rk3188";
memory {
reg = <0x60000000 0x80000000>;

9
arch/arm/boot/dts/rk3188.dtsi
View File

@ -75,17 +75,16 @@
pinctrl@20008000 {
compatible = "rockchip,rk3188-pinctrl";
reg = <0x20008000 0xa0>,
<0x20008164 0x1a0>;
reg-names = "base", "pull";
rockchip,grf = <&grf>;
rockchip,pmu = <&pmu>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
gpio0: gpio0@0x2000a000 {
compatible = "rockchip,rk3188-gpio-bank0";
reg = <0x2000a000 0x100>,
<0x20004064 0x8>;
reg = <0x2000a000 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk_gates8 9>;

9
arch/arm/boot/dts/rk3xxx.dtsi
View File

@ -31,11 +31,16 @@
reg = <0x1013c000 0x100>;
};
pmu@20004000 {
compatible = "rockchip,rk3066-pmu";
pmu: pmu@20004000 {
compatible = "rockchip,rk3066-pmu", "syscon";
reg = <0x20004000 0x100>;
};
grf: grf@20008000 {
compatible = "syscon";
reg = <0x20008000 0x200>;
};
gic: interrupt-controller@1013d000 {
compatible = "arm,cortex-a9-gic";
interrupt-controller;