From c1866508e33ef0061aef9af877cf68f037e12a23 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Fri, 29 Jul 2016 14:46:40 +0800 Subject: [PATCH] arm64: dts: rockchip: manage the evb cros for rk3399 Add the rk3399-evb-cros.dtsi for cros private. Also, we should add the rev3 dts to support it. Change-Id: Ie68d4352474c7ea02c188e2c2176244709ac1b48 Signed-off-by: Caesar Wang --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-evb-cros.dtsi | 134 ++++++++++++++++++ .../dts/rockchip/rk3399-evb-rev1-cros.dts | 89 +----------- .../dts/rockchip/rk3399-evb-rev2-cros.dts | 89 +----------- .../dts/rockchip/rk3399-evb-rev3-cros.dts | 51 +++++++ 5 files changed, 188 insertions(+), 176 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 90947e54783e..c6f7a8005040 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev2-android.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev2-android-next.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev2-cros.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev3-android.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev3-cros.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-fpga.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-gru.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r0.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi new file mode 100644 index 000000000000..f6dcffa7894d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -0,0 +1,134 @@ +/* + * 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. + */ + +/ { + model = "Rockchip RK3399 Evaluation Board (Chrome OS)"; + compatible = "google,rk3399evb", "rockchip,rk3399-evb", "rockchip,rk3399"; + + edp_panel: edp-panel { + compatible = "lg,lp097qx1-spa1", "panel-simple"; + backlight = <&backlight>; + power-supply = <&vcc3v3_s0>; + enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; + + ports { + panel_in_edp: endpoint { + remote-endpoint = <&edp_out_panel>; + }; + }; + }; + + hdmi_codec: hdmi-codec { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "HDMI-CODEC"; + + simple-audio-card,cpu { + sound-dai = <&i2s2>; + }; + + simple-audio-card,codec { + sound-dai = <&hdmi>; + }; + }; +}; + +&mipi_dsi { + status = "okay"; + panel { + compatible ="boe,tv080wum-nl0"; + reg = <0>; + backlight = <&backlight>; + enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; +}; + +&edp { + status = "disabled"; + + ports { + edp_out: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + edp_out_panel: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_in_edp>; + }; + }; + }; +}; + +&hdmi { + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <0>; + status = "okay"; +}; + +&i2s2 { + #sound-dai-cells = <0>; + status = "okay"; +}; + +&vopb { + status = "okay"; +}; + +&vopb_mmu { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; + +&display_subsystem { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts index aa89a924d9af..bf27556295ec 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -43,96 +43,9 @@ /dts-v1/; #include "rk3399-evb-rev1.dtsi" +#include "rk3399-evb-cros.dtsi" / { model = "Rockchip RK3399 Evaluation Board v1 (Chrome OS)"; compatible = "google,rk3399evb-rev1", "rockchip,rk3399-evb-rev1", "rockchip,rk3399"; - - edp_panel: edp-panel { - compatible = "lg,lp097qx1-spa1", "panel-simple"; - backlight = <&backlight>; - power-supply = <&vcc3v3_s0>; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - - ports { - panel_in_edp: endpoint { - remote-endpoint = <&edp_out_panel>; - }; - }; - }; - - hdmi_codec: hdmi-codec { - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,name = "HDMI-CODEC"; - - simple-audio-card,cpu { - sound-dai = <&i2s2>; - }; - - simple-audio-card,codec { - sound-dai = <&hdmi>; - }; - }; -}; - -&mipi_dsi { - status = "okay"; - panel { - compatible ="boe,tv080wum-nl0"; - reg = <0>; - backlight = <&backlight>; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; -}; - -&edp { - status = "disabled"; - - ports { - edp_out: port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - edp_out_panel: endpoint@0 { - reg = <0>; - remote-endpoint = <&panel_in_edp>; - }; - }; - }; -}; - -&hdmi { - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <0>; - status = "okay"; -}; - -&i2s2 { - #sound-dai-cells = <0>; - status = "okay"; -}; - -&vopb { - status = "okay"; -}; - -&vopb_mmu { - status = "okay"; -}; - -&vopl { - status = "okay"; -}; - -&vopl_mmu { - status = "okay"; -}; - -&display_subsystem { - status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts index 5a7e865f3d4e..2daf9f1235f3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -43,96 +43,9 @@ /dts-v1/; #include "rk3399-evb-rev2.dtsi" +#include "rk3399-evb-cros.dtsi" / { model = "Rockchip RK3399 Evaluation Board v2 (Chrome OS)"; compatible = "google,rk3399evb-rev2", "rockchip,rk3399-evb-rev2", "rockchip,rk3399"; - - edp_panel: edp-panel { - compatible = "lg,lp097qx1-spa1", "panel-simple"; - backlight = <&backlight>; - power-supply = <&vcc3v3_s0>; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - - ports { - panel_in_edp: endpoint { - remote-endpoint = <&edp_out_panel>; - }; - }; - }; - - hdmi_codec: hdmi-codec { - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,name = "HDMI-CODEC"; - - simple-audio-card,cpu { - sound-dai = <&i2s2>; - }; - - simple-audio-card,codec { - sound-dai = <&hdmi>; - }; - }; -}; - -&mipi_dsi { - status = "okay"; - panel { - compatible ="boe,tv080wum-nl0"; - reg = <0>; - backlight = <&backlight>; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; -}; - -&edp { - status = "disabled"; - - ports { - edp_out: port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - edp_out_panel: endpoint@0 { - reg = <0>; - remote-endpoint = <&panel_in_edp>; - }; - }; - }; -}; - -&hdmi { - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <0>; - status = "okay"; -}; - -&i2s2 { - #sound-dai-cells = <0>; - status = "okay"; -}; - -&vopb { - status = "okay"; -}; - -&vopb_mmu { - status = "okay"; -}; - -&vopl { - status = "okay"; -}; - -&vopl_mmu { - status = "okay"; -}; - -&display_subsystem { - status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts new file mode 100644 index 000000000000..e1bb5f129680 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts @@ -0,0 +1,51 @@ +/* + * 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-evb-rev3.dtsi" +#include "rk3399-evb-cros.dtsi" + +/ { + model = "Rockchip RK3399 Evaluation Board v3 (Chrome OS)"; + compatible = "google,rk3399evb-rev3", "rockchip,rk3399-evb-rev3", "rockchip,rk3399"; +}; -- 2.34.1