Commit 72fb2c85 authored by Jerome Brunet's avatar Jerome Brunet Committed by Kevin Hilman

ARM64: dts: meson-gxl-s905x-libretech-cc: fixup board definition

The libretech CC derives less from the p212 than initially thought.
Several voltage regulators are different and the capabilities of the
sdcard and emmc also differ.

Deriving from the p212 is not convient anymore so the libretech is now
derived from s905x definition directly.

Fixes: cd84aff1 ("ARM64: dts: meson-gxl: Add Libre Technology CC support")
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 6620f146
...@@ -10,12 +10,20 @@ ...@@ -10,12 +10,20 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include "meson-gxl-s905x-p212.dtsi" #include "meson-gxl-s905x.dtsi"
/ { / {
compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl"; compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl";
model = "Libre Technology CC"; model = "Libre Technology CC";
aliases {
serial0 = &uart_AO;
};
chosen {
stdout-path = "serial0:115200n8";
};
cvbs-connector { cvbs-connector {
compatible = "composite-video-connector"; compatible = "composite-video-connector";
...@@ -26,6 +34,11 @@ cvbs_connector_in: endpoint { ...@@ -26,6 +34,11 @@ cvbs_connector_in: endpoint {
}; };
}; };
emmc_pwrseq: emmc-pwrseq {
compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
};
hdmi-connector { hdmi-connector {
compatible = "hdmi-connector"; compatible = "hdmi-connector";
type = "a"; type = "a";
...@@ -53,6 +66,39 @@ blue { ...@@ -53,6 +66,39 @@ blue {
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x80000000>;
};
vcc_3v3: regulator-vcc_3v3 {
compatible = "regulator-fixed";
regulator-name = "VCC_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
vcc_card: regulator-vcc-card {
compatible = "regulator-gpio";
regulator-name = "VCC_CARD";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
gpios-states = <0>;
states = <3300000 0>,
<1800000 1>;
};
vddio_boot: regulator-vddio_boot {
compatible = "regulator-fixed";
regulator-name = "VDDIO_BOOT";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
}; };
&cvbs_vdac_port { &cvbs_vdac_port {
...@@ -61,6 +107,16 @@ cvbs_vdac_out: endpoint { ...@@ -61,6 +107,16 @@ cvbs_vdac_out: endpoint {
}; };
}; };
&ethmac {
status = "okay";
};
&ir {
status = "okay";
pinctrl-0 = <&remote_input_ao_pins>;
pinctrl-names = "default";
};
&hdmi_tx { &hdmi_tx {
status = "okay"; status = "okay";
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
...@@ -73,20 +129,43 @@ hdmi_tx_tmds_out: endpoint { ...@@ -73,20 +129,43 @@ hdmi_tx_tmds_out: endpoint {
}; };
}; };
/* /* SD card */
* The following devices exists but are exposed on the general &sd_emmc_b {
* purpose GPIO header. End user may well decide to use those pins status = "okay";
* for another purpose pinctrl-0 = <&sdcard_pins>;
*/ pinctrl-names = "default";
bus-width = <4>;
cap-sd-highspeed;
max-frequency = <100000000>;
disable-wp;
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
cd-inverted;
&sd_emmc_a { vmmc-supply = <&vcc_3v3>;
status = "disabled"; vqmmc-supply = <&vcc_card>;
}; };
&uart_A { /* eMMC */
status = "disabled"; &sd_emmc_c {
status = "okay";
pinctrl-0 = <&emmc_pins>;
pinctrl-names = "default";
bus-width = <8>;
cap-mmc-highspeed;
max-frequency = <50000000>;
non-removable;
disable-wp;
mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vddio_boot>;
}; };
&wifi32k { &uart_AO {
status = "disabled"; status = "okay";
pinctrl-0 = <&uart_ao_a_pins>;
pinctrl-names = "default";
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment