[ meson64 ] Le Potato U-boot general fixes

consolidates a few odds and ends from the vendor U-boot tree.
https://github.com/libre-computer-project/libretech-u-boot
This commit is contained in:
tonymac32
2019-11-26 01:55:28 -05:00
parent f75fb92740
commit 8d10472bd2

View File

@@ -0,0 +1,82 @@
diff --git a/arch/arm/dts/meson-gx.dtsi b/arch/arm/dts/meson-gx.dtsi
index f1e5cdba..221923c1 100644
--- a/arch/arm/dts/meson-gx.dtsi
+++ b/arch/arm/dts/meson-gx.dtsi
@@ -181,6 +181,8 @@
#size-cells = <2>;
ranges;
+ u-boot,dm-spl;
+
cbus: bus@c1100000 {
compatible = "simple-bus";
reg = <0x0 0xc1100000 0x0 0x100000>;
@@ -505,6 +507,7 @@
interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
+ u-boot,dm-spl;
/* CVBS VDAC output port */
cvbs_vdac_port: port@0 {
@@ -523,7 +526,9 @@
hdmi_tx: hdmi-tx@c883a000 {
compatible = "amlogic,meson-gx-dw-hdmi";
- reg = <0x0 0xc883a000 0x0 0x1c>;
+ reg = <0x0 0xc883a000 0x0 0x1c>,
+ <0x0 0xc883c000 0x0 0x1000>;
+ reg-names = "hdmitx", "hhi";
interrupts = <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts b/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts
index a23252ef..c92b67a6 100644
--- a/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts
@@ -54,16 +54,18 @@
compatible = "gpio-leds";
system {
- label = "librecomputer:system-status";
+ label = "librecomputer:green:disk";
gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
default-state = "on";
panic-indicator;
};
blue {
- label = "librecomputer:blue";
+ label = "librecomputer:blue:cpu";
gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat";
+ linux,default-trigger = "activity";
+ default-state = "off";
};
};
@@ -118,8 +120,8 @@
vddio_boot: regulator-vddio_boot {
compatible = "regulator-fixed";
regulator-name = "VDDIO_BOOT";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
};
};
@@ -254,9 +256,9 @@
bus-width = <8>;
cap-mmc-highspeed;
- mmc-ddr-3_3v;
- max-frequency = <50000000>;
- non-removable;
+ mmc-ddr-1_8v;
+ mmc-hs200-1_8v;
+ max-frequency = <200000000>;
disable-wp;
mmc-pwrseq = <&emmc_pwrseq>;