Merge tag 'u-boot-amlogic-20181207' of git://git.denx.de/u-boot-amlogic

[platform/kernel/u-boot.git] / arch / arm / dts / r8a7794-alt.dts

diff --git a/arch/arm/dts/r8a7794-alt.dts b/arch/arm/dts/r8a7794-alt.dts
index bde6e47..ef7e2a8 100644 (file)
--- a/arch/arm/dts/r8a7794-alt.dts
+++ b/arch/arm/dts/r8a7794-alt.dts
@@ -15,7 +15,9 @@
 
        aliases {
                serial0 = &scif2;
+               i2c9 = &gpioi2c1;
                i2c10 = &gpioi2c4;
+               i2c11 = &i2chdmi;
                i2c12 = &i2cexio4;
        };
 
@@ -135,18 +137,56 @@
                clock-frequency = <148500000>;
        };
 
+       gpioi2c1: i2c-9 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "i2c-gpio";
+               status = "disabled";
+               scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       };
+
        gpioi2c4: i2c-10 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "i2c-gpio";
                status = "disabled";
-               gpios = <&gpio4 9 GPIO_ACTIVE_HIGH /* sda */
-                        &gpio4 8 GPIO_ACTIVE_HIGH /* scl */
-                       >;
+               scl-gpios = <&gpio4 8 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&gpio4 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                i2c-gpio,delay-us = <5>;
        };
 
        /*
+        * A fallback to GPIO is provided for I2C1.
+        */
+       i2chdmi: i2c-11 {
+               compatible = "i2c-demux-pinctrl";
+               i2c-parent = <&i2c1>, <&gpioi2c1>;
+               i2c-bus-name = "i2c-hdmi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               composite-in@20 {
+                       compatible = "adi,adv7180";
+                       reg = <0x20>;
+                       remote = <&vin0>;
+
+                       port {
+                               adv7180: endpoint {
+                                       bus-width = <8>;
+                                       remote-endpoint = <&vin0ep>;
+                               };
+                       };
+               };
+
+               eeprom@50 {
+                       compatible = "renesas,r1ex24002", "atmel,24c02";
+                       reg = <0x50>;
+                       pagesize = <16>;
+               };
+       };
+
+       /*
         * I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).
         * A fallback to GPIO is provided.
         */
@@ -293,6 +333,11 @@
        status = "okay";
 };
 
+&rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+};
+
 &sdhi0 {
        pinctrl-0 = <&sdhi0_pins>;
        pinctrl-1 = <&sdhi0_pins_uhs>;
@@ -322,23 +367,9 @@
 
 &i2c1 {
        pinctrl-0 = <&i2c1_pins>;
-       pinctrl-names = "default";
+       pinctrl-names = "i2c-hdmi";
 
-       status = "okay";
        clock-frequency = <400000>;
-
-       composite-in@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-               remote = <&vin0>;
-
-               port {
-                       adv7180: endpoint {
-                               bus-width = <8>;
-                               remote-endpoint = <&vin0ep>;
-                       };
-               };
-       };
 };
 
 &i2c4 {
@@ -352,9 +383,6 @@
        pinctrl-names = "default";
 
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
                vin0ep: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;