shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM64: dts: rk3399-box: rename files for box-rev1

Browse Source 
Make dts files in order as follows:
rk3399.dtsi
rk3399-box.dtsi
rk3399-box-rev1.dts
rk3399-box-rev2.dts
...

Change-Id: I93d1fb4380d0c84a14fc3476b7435b1abe4989d2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
This commit is contained in:
Jianqun Xu
2016-07-27 11:18:28 +08:00
committed by Huang, Tao
parent a5f740a128
commit 54e5bf9f3a
3 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/Makefile
View File

@@ -3,7 +3,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3366-tb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-tb-sheep.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-box-808-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-box-rev2-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-box-rev1.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev1-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev1-android-next.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev1-cros.dtb

49
arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts Normal file
View File

@@ -0,0 +1,49 @@
/*
* Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include "rk3399-box.dtsi"
/ {
model = "Rockchip RK3399 Board rev1 (BOX)";
compatible = "rockchip-box-rev1","rockchip,rk3399-box";
};

12
arch/arm64/boot/dts/rockchip/rk3399-box-rev2-android.dts → arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
View File

@@ -39,17 +39,13 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include <dt-bindings/pwm/pwm.h>
#include <dt-bindings/input/input.h>
#include "rk3399.dtsi"
#include "rk3399-android.dtsi"
/ {
model = "Rockchip RK3399 Box Board rev2 (Android)";
compatible = "rockchip,rk3399";
compatible = "rockchip,rk3399-box","rockchip,rk3399";
vcc1v8_s0: vcc1v8-s0 {
compatible = "regulator-fixed";
@@ -211,8 +207,8 @@
};
&sdmmc {
clock-frequency = <150000000>;
clock-freq-min-max = <400000 150000000>;
clock-frequency = <100000000>;
clock-freq-min-max = <400000 100000000>;
supports-sd;
bus-width = <4>;
cap-mmc-highspeed;
@@ -227,7 +223,7 @@
};
&sdio0 {
clock-frequency = <140000000>;
clock-frequency = <100000000>;
clock-freq-min-max = <200000 100000000>;
supports-sdio;
bus-width = <4>;