leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: gru: Add extra device-tree settings

Browse Source 
Add some U-Boot-specific settings. These should really go in the
*u-boot.dtsi file, but it seems that rk3399 does not use that yet.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Simon Glass 2019-01-21 14:53:35 -07:00 committed by Philipp Tomsich
parent aa48c94ca8
commit 08c85b57a5
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/dts/rk3399-gru-bob.dts
View File

@ -7,6 +7,7 @@
/dts-v1/; /dts-v1/;
#include "rk3399-gru-chromebook.dtsi" #include "rk3399-gru-chromebook.dtsi"
#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi"
/ { / {
model = "Google Bob"; model = "Google Bob";

1
arch/arm/dts/rk3399-gru-chromebook.dtsi
View File

@ -232,6 +232,7 @@
&edp { &edp {
status = "okay"; status = "okay";
rockchip,panel = <&edp_panel>;
ports { ports {
edp_out: port@1 { edp_out: port@1 {
reg = <1>; reg = <1>;

21
arch/arm/dts/rk3399-gru.dtsi
View File

@ -11,7 +11,13 @@
/ { / {
chosen { chosen {
u-boot,dm-pre-reloc;
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
u-boot,spl-boot-order = &spi_flash;
};
config {
u-boot,spl-payload-offset = <0x40000>;
}; };
/* /*
@ -539,12 +545,14 @@ ap_i2c_audio: &i2c8 {
&spi1 { &spi1 {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-1 = <&spi1_sleep>; pinctrl-1 = <&spi1_sleep>;
spiflash@0 { spi_flash: spiflash@0 {
compatible = "jedec,spi-nor"; u-boot,dm-pre-reloc;
compatible = "jedec,spi-nor", "spi-flash";
reg = <0>; reg = <0>;
/* May run faster once verified. */ /* May run faster once verified. */
@ -558,12 +566,16 @@ ap_i2c_audio: &i2c8 {
&spi5 { &spi5 {
status = "okay"; status = "okay";
spi-activate-delay = <100>;
spi-max-frequency = <3000000>;
spi-deactivate-delay = <200>;
cros_ec: ec@0 { cros_ec: ec@0 {
compatible = "google,cros-ec-spi"; compatible = "google,cros-ec-spi";
reg = <0>; reg = <0>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <1 IRQ_TYPE_LEVEL_LOW>; interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
ec-interrupt = <&gpio0 1 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ec_ap_int_l>; pinctrl-0 = <&ec_ap_int_l>;
spi-max-frequency = <3000000>; spi-max-frequency = <3000000>;
@ -618,6 +630,7 @@ ap_i2c_audio: &i2c8 {
&uart2 { &uart2 {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
&usb_host0_ohci { &usb_host0_ohci {
@ -650,8 +663,8 @@ ap_i2c_audio: &i2c8 {
status = "okay"; status = "okay";
}; };
#include <arm/cros-ec-keyboard.dtsi> #include <cros-ec-keyboard.dtsi>
#include <arm/cros-ec-sbs.dtsi> #include <cros-ec-sbs.dtsi>
&pinctrl { &pinctrl {
/* /*