diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-19 15:07:38 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-19 15:07:38 +0200 |
commit | b8c48a1111c8ddebe859860f16e2176fb6148c9f (patch) | |
tree | 6c3f46e89eb6cecb7707aa46506d8c43ffb05e65 /dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts | |
parent | b7893351580db1a4cc34a69a16624a5ef121c888 (diff) | |
parent | bee7083638439457f600252a8cea2c5e4165f5cd (diff) | |
download | barebox-b8c48a1111c8ddebe859860f16e2176fb6148c9f.tar.gz barebox-b8c48a1111c8ddebe859860f16e2176fb6148c9f.tar.xz |
Merge branch 'for-next/dts'
Diffstat (limited to 'dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts')
-rw-r--r-- | dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts b/dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts index a1078b3e1c..38dfdde5c1 100644 --- a/dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/dts/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts @@ -51,7 +51,7 @@ / { compatible = "nexbox,a95x", "amlogic,meson-gxbb"; model = "NEXBOX A95X"; - + aliases { serial0 = &uart_AO; }; @@ -171,6 +171,13 @@ }; }; +&cec_AO { + status = "okay"; + pinctrl-0 = <&ao_cec_pins>; + pinctrl-names = "default"; + hdmi-phandle = <&hdmi_tx>; +}; + ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; @@ -225,7 +232,8 @@ &sd_emmc_a { status = "okay"; pinctrl-0 = <&sdio_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdio_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; #address-cells = <1>; #size-cells = <0>; @@ -246,7 +254,8 @@ &sd_emmc_b { status = "okay"; pinctrl-0 = <&sdcard_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdcard_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; bus-width = <4>; cap-sd-highspeed; @@ -264,10 +273,10 @@ &sd_emmc_c { status = "okay"; pinctrl-0 = <&emmc_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; bus-width = <8>; - cap-sd-highspeed; cap-mmc-highspeed; max-frequency = <200000000>; non-removable; |