Squashed 'dts/upstream/' changes from aaba2d45dc2a..b35b9bd1d4ee

[thirdparty/u-boot.git] / src / arm64 / amlogic / meson-s4-s805x2-aq222.dts

diff --git a/src/arm64/amlogic/meson-s4-s805x2-aq222.dts b/src/arm64/amlogic/meson-s4-s805x2-aq222.dts
index c1f322c7398261b5d7aa47310d31c0786139f16e..983caddc409c35b4b396650935a1cfb84ab10d21 100644 (file)
--- a/src/arm64/amlogic/meson-s4-s805x2-aq222.dts
+++ b/src/arm64/amlogic/meson-s4-s805x2-aq222.dts
@@ -15,7 +15,7 @@
        #size-cells = <2>;
 
        aliases {
-               serial0 = &uart_B;
+               serial0 = &uart_b;
        };
 
        memory@0 {
@@ -23,9 +23,20 @@
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               /* 52 MiB reserved for ARM Trusted Firmware */
+               secmon_reserved: secmon@5000000 {
+                       reg = <0x0 0x05000000 0x0 0x3400000>;
+                       no-map;
+               };
+       };
 };
 
-&uart_B {
+&uart_b {
        status = "okay";
 };
 
@@ -34,3 +45,48 @@
        pinctrl-0 = <&remote_pins>;
        pinctrl-names = "default";
 };
+
+&nand {
+       status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               nand-on-flash-bbt;
+
+               partition@0 {
+                       label = "boot";
+                       reg = <0x0 0x00200000>;
+               };
+               partition@200000 {
+                       label = "env";
+                       reg = <0x00200000 0x00400000>;
+               };
+               partition@600000 {
+                       label = "system";
+                       reg = <0x00600000 0x00a00000>;
+               };
+               partition@1000000 {
+                       label = "rootfs";
+                       reg = <0x01000000 0x03000000>;
+               };
+               partition@4000000 {
+                       label = "media";
+                       reg = <0x04000000 0x8000000>;
+               };
+       };
+};
+
+&spicc0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spicc0_pins_x>;
+       cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>;
+};