| Message ID | 1461638206-20473-5-git-send-email-jay.xu@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Dienstag, 26. April 2016, 10:36:46 schrieb Jianqun Xu: > This patch add rk3399-evb.dts for RK3399 evaluation board. > Tested on RK3399 evb. > > Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> > --- > changes in v3: > - add more compatible (Doug) > - add modle > > arch/arm64/boot/dts/rockchip/Makefile | 1 + > arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 125 > ++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) > create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-evb.dts > > diff --git a/arch/arm64/boot/dts/rockchip/Makefile > b/arch/arm64/boot/dts/rockchip/Makefile index df37865..7037a16 100644 > --- a/arch/arm64/boot/dts/rockchip/Makefile > +++ b/arch/arm64/boot/dts/rockchip/Makefile > @@ -1,6 +1,7 @@ > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb > > always := $(dtb-y) > subdir-y := $(dts-dirs) > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts > b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts new file mode 100644 > index 0000000..c3370bd > --- /dev/null > +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts > @@ -0,0 +1,125 @@ > +/* > + * 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 <dt-bindings/pwm/pwm.h> > +#include "rk3399.dtsi" > + > +/ { > + model = "Rockchip RK3399 Evaluation Board"; > + compatible = "rockchip,rk3399-evb", "rockchip,rk3399", > + "google,rk3399evb-rev2", google,rk3399evb-rev1", > + "google,rk3399evb-rev0" ; can you check against which compatibles that coreboot really matches? As we said that the evb changed between rev1 and rev2, I would expect the compatible to be something like compatible = "rockchip,rk3399-evb", "google,rk3399evb-rev2", "rockchip,rk3399"; leaving out the rev1 and rev0 > + > + vdd_center: vdd-center { > + compatible = "pwm-regulator"; > + pwms = <&pwm3 0 25000 0>; > + regulator-name = "vdd_center"; > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <1400000>; > + regulator-always-on; > + regulator-boot-on; > + status = "okay"; > + }; Can you check if this runs stable with the pwm-regulator in mainline please? I.e. Boris' rework series hasn't landed yet and at least on Veyron I remember the pwm-regulator having reliability issues or something like that. > + > + vcc3v3_sys: vcc3v3-sys { > + compatible = "regulator-fixed"; > + regulator-name = "vcc3v3_sys"; > + regulator-always-on; > + regulator-boot-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + vcc_phy: vcc-phy-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vcc_phy"; > + regulator-always-on; > + regulator-boot-on; > + }; > +}; > + > +&pwm0 { > + status = "okay"; > +}; > + > +&pwm2 { > + status = "okay"; > +}; > + > +&pwm3 { > + status = "okay"; > +}; > + > +&uart2 { > + status = "okay"; > +}; > + > +&usb_host0_ehci { > + status = "okay"; > +}; > + > +&usb_host0_ohci { > + status = "okay"; > +}; > + > +&usb_host1_ehci { > + status = "okay"; > +}; > + > +&usb_host1_ohci { > + status = "okay"; > +}; > + > +&pinctrl { > + pmic { > + pmic_int_l: pmic-int-l { > + rockchip,pins = > + <1 21 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + > + pmic_dvs2: pmic-dvs2 { > + rockchip,pins = > + <1 18 RK_FUNC_GPIO &pcfg_pull_down>; > + }; > + }; > +};
Hi, On Tue, Apr 26, 2016 at 5:37 AM, Heiko Stübner <heiko@sntech.de> wrote: >> + model = "Rockchip RK3399 Evaluation Board"; >> + compatible = "rockchip,rk3399-evb", "rockchip,rk3399", >> + "google,rk3399evb-rev2", google,rk3399evb-rev1", >> + "google,rk3399evb-rev0" ; > > can you check against which compatibles that coreboot really matches? > > As we said that the evb changed between rev1 and rev2, I would expect the > compatible to be something like > > compatible = "rockchip,rk3399-evb", "google,rk3399evb-rev2", > "rockchip,rk3399"; > > leaving out the rev1 and rev0 What Heiko suggests seems reasonable to me. It all depends on what your bootloader is doing and what you guys want to do. Chrome OS designs that I've worked on have had board strappings that you can read a board ID from and that's how the BIOS (like coreboot) will figure out which board ID it is running on. I'm not aware of such strappings on rk3399-evb. Do they exist? Of course, even without strappings it's possible to get the bootloader to work sanely. You can either define the revision number at build time or you can store the revision number somewhere non-volatile. -Doug
On 2016?04?26? 20:37, Heiko Stübner wrote: > Am Dienstag, 26. April 2016, 10:36:46 schrieb Jianqun Xu: >> This patch add rk3399-evb.dts for RK3399 evaluation board. >> Tested on RK3399 evb. >> >> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> >> --- >> changes in v3: >> - add more compatible (Doug) >> - add modle >> >> arch/arm64/boot/dts/rockchip/Makefile | 1 + >> arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 125 >> ++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) >> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-evb.dts >> >> diff --git a/arch/arm64/boot/dts/rockchip/Makefile >> b/arch/arm64/boot/dts/rockchip/Makefile index df37865..7037a16 100644 >> --- a/arch/arm64/boot/dts/rockchip/Makefile >> +++ b/arch/arm64/boot/dts/rockchip/Makefile >> @@ -1,6 +1,7 @@ >> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb >> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb >> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb >> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb >> >> always := $(dtb-y) >> subdir-y := $(dts-dirs) >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts >> b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts new file mode 100644 >> index 0000000..c3370bd >> --- /dev/null >> +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts >> @@ -0,0 +1,125 @@ >> +/* >> + * 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 <dt-bindings/pwm/pwm.h> >> +#include "rk3399.dtsi" >> + >> +/ { >> + model = "Rockchip RK3399 Evaluation Board"; >> + compatible = "rockchip,rk3399-evb", "rockchip,rk3399", >> + "google,rk3399evb-rev2", google,rk3399evb-rev1", >> + "google,rk3399evb-rev0" ; > > can you check against which compatibles that coreboot really matches? > > As we said that the evb changed between rev1 and rev2, I would expect the > compatible to be something like > > compatible = "rockchip,rk3399-evb", "google,rk3399evb-rev2", > "rockchip,rk3399"; > > leaving out the rev1 and rev0 > ok, it will be fixed in next version, thanks >> + >> + vdd_center: vdd-center { >> + compatible = "pwm-regulator"; >> + pwms = <&pwm3 0 25000 0>; >> + regulator-name = "vdd_center"; >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <1400000>; >> + regulator-always-on; >> + regulator-boot-on; >> + status = "okay"; >> + }; > > Can you check if this runs stable with the pwm-regulator in mainline please? > I.e. Boris' rework series hasn't landed yet and at least on Veyron I remember > the pwm-regulator having reliability issues or something like that. > ok, I will test stablity on rk3399 evb, and to find out what issue does veyron encounter. and could you share a link about Boris'rework series patches ? thanks > >> + >> + vcc3v3_sys: vcc3v3-sys { >> + compatible = "regulator-fixed"; >> + regulator-name = "vcc3v3_sys"; >> + regulator-always-on; >> + regulator-boot-on; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> + >> + vcc_phy: vcc-phy-regulator { >> + compatible = "regulator-fixed"; >> + regulator-name = "vcc_phy"; >> + regulator-always-on; >> + regulator-boot-on; >> + }; >> +}; >> + >> +&pwm0 { >> + status = "okay"; >> +}; >> + >> +&pwm2 { >> + status = "okay"; >> +}; >> + >> +&pwm3 { >> + status = "okay"; >> +}; >> + >> +&uart2 { >> + status = "okay"; >> +}; >> + >> +&usb_host0_ehci { >> + status = "okay"; >> +}; >> + >> +&usb_host0_ohci { >> + status = "okay"; >> +}; >> + >> +&usb_host1_ehci { >> + status = "okay"; >> +}; >> + >> +&usb_host1_ohci { >> + status = "okay"; >> +}; >> + >> +&pinctrl { >> + pmic { >> + pmic_int_l: pmic-int-l { >> + rockchip,pins = >> + <1 21 RK_FUNC_GPIO &pcfg_pull_up>; >> + }; >> + >> + pmic_dvs2: pmic-dvs2 { >> + rockchip,pins = >> + <1 18 RK_FUNC_GPIO &pcfg_pull_down>; >> + }; >> + }; >> +}; > > > >
Hi Doug? On 2016?04?27? 04:53, Doug Anderson wrote: > Hi, > > On Tue, Apr 26, 2016 at 5:37 AM, Heiko Stübner <heiko@sntech.de> wrote: >>> + model = "Rockchip RK3399 Evaluation Board"; >>> + compatible = "rockchip,rk3399-evb", "rockchip,rk3399", >>> + "google,rk3399evb-rev2", google,rk3399evb-rev1", >>> + "google,rk3399evb-rev0" ; >> >> can you check against which compatibles that coreboot really matches? >> >> As we said that the evb changed between rev1 and rev2, I would expect the >> compatible to be something like >> >> compatible = "rockchip,rk3399-evb", "google,rk3399evb-rev2", >> "rockchip,rk3399"; >> >> leaving out the rev1 and rev0 > > What Heiko suggests seems reasonable to me. > > It all depends on what your bootloader is doing and what you guys want > to do. Chrome OS designs that I've worked on have had board > strappings that you can read a board ID from and that's how the BIOS > (like coreboot) will figure out which board ID it is running on. I'm > not aware of such strappings on rk3399-evb. Do they exist? > > Of course, even without strappings it's possible to get the bootloader > to work sanely. You can either define the revision number at build > time or you can store the revision number somewhere non-volatile. > yes, I will talk with coreboot developer about this, maybe to fix it in coreboot and just keep simple in dtsi file. thanks Jianqun > > -Doug > > >
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index df37865..7037a16 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -1,6 +1,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts new file mode 100644 index 0000000..c3370bd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts @@ -0,0 +1,125 @@ +/* + * 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 <dt-bindings/pwm/pwm.h> +#include "rk3399.dtsi" + +/ { + model = "Rockchip RK3399 Evaluation Board"; + compatible = "rockchip,rk3399-evb", "rockchip,rk3399", + "google,rk3399evb-rev2", google,rk3399evb-rev1", + "google,rk3399evb-rev0" ; + + vdd_center: vdd-center { + compatible = "pwm-regulator"; + pwms = <&pwm3 0 25000 0>; + regulator-name = "vdd_center"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1400000>; + regulator-always-on; + regulator-boot-on; + status = "okay"; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vcc_phy: vcc-phy-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_phy"; + regulator-always-on; + regulator-boot-on; + }; +}; + +&pwm0 { + status = "okay"; +}; + +&pwm2 { + status = "okay"; +}; + +&pwm3 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; + +&usb_host1_ehci { + status = "okay"; +}; + +&usb_host1_ohci { + status = "okay"; +}; + +&pinctrl { + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = + <1 21 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + pmic_dvs2: pmic-dvs2 { + rockchip,pins = + <1 18 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; +};
This patch add rk3399-evb.dts for RK3399 evaluation board. Tested on RK3399 evb. Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- changes in v3: - add more compatible (Doug) - add modle arch/arm64/boot/dts/rockchip/Makefile | 1 + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 125 ++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-evb.dts