ftCommunity / ftcommunity-TXT

Fischertechnik ROBOTICS TXT firmware, community edition
http://cfw.ftcommunity.de/
GNU General Public License v3.0
46 stars 33 forks source link

Check device tree for changes #236

Open ski7777 opened 1 year ago

ski7777 commented 1 year ago

Just a quick diff between original ft device tree and our version:

dtdiff ft.dtb ftc.dtb
--- /dev/fd/63  2023-01-09 15:31:21.314589668 +0100
+++ /dev/fd/62  2023-01-09 15:31:21.314589668 +0100
@@ -50,8 +50,8 @@

        fixedregulator@0 {
                compatible = "regulator-fixed";
-               linux,phandle = <0x37>;
-               phandle = <0x37>;
+               linux,phandle = <0x38>;
+               phandle = <0x38>;
                regulator-boot-on;
                regulator-max-microvolt = <0x4c4b40>;
                regulator-min-microvolt = <0x4c4b40>;
@@ -61,7 +61,7 @@
        fixedregulator@1 {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <0x3d 0x02 0x00>;
+               gpio = <0x35 0x02 0x00>;
                linux,phandle = <0x3e>;
                phandle = <0x3e>;
                regulator-boot-on;
@@ -71,26 +71,22 @@
                startup-delay-us = <0x11170>;
        };

+       gpio-poweroff {
+               compatible = "gpio-poweroff";
+               gpios = <0x51 0x11 0x00>;
+       };
+
        gpio_buttons@0 {
                #address-cells = <0x01>;
                #size-cells = <0x00>;
+               autorepeat;
                compatible = "gpio-keys";

                switch@1 {
                        gpio-key,wakeup = <0x01>;
                        gpios = <0x51 0x10 0x01>;
                        label = "txt-pwr";
-                       linux,code = <0x3b>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led@1 {
-                       default-state = "off";
-                       gpios = <0x51 0x11 0x00>;
-                       label = "off-uc";
+                       linux,code = <0x74>;
                };
        };

@@ -116,10 +112,6 @@
                        ti,hwmods = "aes";
                };

-               btwilink {
-                       compatible = "btwilink";
-               };
-
                can@481cc000 {
                        clock-names = "fck";
                        clocks = <0x42>;
@@ -310,8 +302,8 @@
                        gpio-controller;
                        interrupt-controller;
                        interrupts = <0x60>;
-                       linux,phandle = <0x36>;
-                       phandle = <0x36>;
+                       linux,phandle = <0x37>;
+                       phandle = <0x37>;
                        reg = <0x44e07000 0x1000>;
                        ti,hwmods = "gpio1";
                        ti,no-reset-on-init;
@@ -348,8 +340,8 @@
                        gpio-controller;
                        interrupt-controller;
                        interrupts = <0x3e>;
-                       linux,phandle = <0x3d>;
-                       phandle = <0x3d>;
+                       linux,phandle = <0x35>;
+                       phandle = <0x35>;
                        reg = <0x481ae000 0x1000>;
                        ti,hwmods = "gpio4";
                        ti,no-reset-on-init;
@@ -472,7 +464,7 @@
                        clock-frequency = <0x61a80>;
                        compatible = "ti,omap4-i2c";
                        interrupts = <0x46>;
-                       pinctrl-0 = <0x35>;
+                       pinctrl-0 = <0x36>;
                        pinctrl-names = "default";
                        reg = <0x44e0b000 0x1000>;
                        sleep-sequence = <0x22d251f>;
@@ -487,18 +479,18 @@

                        tps@2d {
                                compatible = "ti,tps65910";
-                               interrupt-parent = <0x36>;
+                               interrupt-parent = <0x37>;
                                interrupts = <0x06 0x04>;
                                reg = <0x2d>;
                                ti,en-ck32k-xtal;
-                               vcc1-supply = <0x37>;
-                               vcc2-supply = <0x37>;
-                               vcc3-supply = <0x37>;
-                               vcc4-supply = <0x37>;
-                               vcc5-supply = <0x37>;
-                               vcc6-supply = <0x37>;
-                               vcc7-supply = <0x37>;
-                               vccio-supply = <0x37>;
+                               vcc1-supply = <0x38>;
+                               vcc2-supply = <0x38>;
+                               vcc3-supply = <0x38>;
+                               vcc4-supply = <0x38>;
+                               vcc5-supply = <0x38>;
+                               vcc6-supply = <0x38>;
+                               vcc7-supply = <0x38>;
+                               vccio-supply = <0x38>;

                                regulators {
                                        #address-cells = <0x01>;
@@ -529,8 +521,8 @@
                                        };

                                        regulator@12 {
-                                               linux,phandle = <0x3a>;
-                                               phandle = <0x3a>;
+                                               linux,phandle = <0x3b>;
+                                               phandle = <0x3b>;
                                                reg = <0x0c>;
                                                regulator-always-on;
                                                regulator-compatible = "vmmc";
@@ -613,7 +605,7 @@
                        clock-frequency = <0x61a80>;
                        compatible = "ti,omap4-i2c";
                        interrupts = <0x47>;
-                       pinctrl-0 = <0x38>;
+                       pinctrl-0 = <0x39>;
                        pinctrl-names = "default";
                        reg = <0x4802a000 0x1000>;
                        status = "okay";
@@ -639,14 +631,6 @@
                        reg = <0x48200000 0x1000>;
                };

-               kim {
-                       baud_rate = <0x2dc6c0>;
-                       compatible = "kim";
-                       dev_name = "/dev/ttyO3";
-                       flow_cntrl = <0x01>;
-                       nshutdown_gpio = <0x61>;
-               };
-
                l4_wkup@44c00000 {
                        #address-cells = <0x01>;
                        #size-cells = <0x01>;
@@ -1273,8 +1257,8 @@
                                        compatible = "ti,am335x-edma-crossbar";
                                        dma-masters = <0x2c>;
                                        dma-requests = <0x20>;
-                                       linux,phandle = <0x39>;
-                                       phandle = <0x39>;
+                                       linux,phandle = <0x3a>;
+                                       phandle = <0x3a>;
                                        reg = <0xf90 0x40>;
                                };

@@ -1302,14 +1286,14 @@
                                        };

                                        pinmux_i2c0_pins {
-                                               linux,phandle = <0x35>;
-                                               phandle = <0x35>;
+                                               linux,phandle = <0x36>;
+                                               phandle = <0x36>;
                                                pinctrl-single,pins = <0x188 0x28 0x18c 0x28>;
                                        };

                                        pinmux_i2c1_pins {
-                                               linux,phandle = <0x38>;
-                                               phandle = <0x38>;
+                                               linux,phandle = <0x39>;
+                                               phandle = <0x39>;
                                                pinctrl-single,pins = <0x158 0x32 0x15c 0x32>;
                                        };

@@ -1320,14 +1304,14 @@
                                        };

                                        pinmux_mmc1_pins {
-                                               linux,phandle = <0x3b>;
-                                               phandle = <0x3b>;
+                                               linux,phandle = <0x3c>;
+                                               phandle = <0x3c>;
                                                pinctrl-single,pins = <0xf0 0x30 0xf4 0x30 0xf8 0x30 0xfc 0x30 0x100 0x30 0x104 0x30 0x1a8 0x2f>;
                                        };

                                        pinmux_mmc1_pins_sleep {
-                                               linux,phandle = <0x3c>;
-                                               phandle = <0x3c>;
+                                               linux,phandle = <0x3d>;
+                                               phandle = <0x3d>;
                                                pinctrl-single,pins = <0xf0 0x27 0xf4 0x27 0xf8 0x27 0xfc 0x27 0x100 0x27 0x104 0x27 0x1a8 0x2f>;
                                        };

@@ -1607,14 +1591,14 @@
                };

                mmc@47810000 {
-                       #address-cells = <0x01>;
-                       #size-cells = <0x00>;
                        bus-width = <0x04>;
+                       cap-power-off-card;
                        compatible = "ti,omap4-hsmmc";
                        dma-names = "tx\0rx";
-                       dmas = <0x39 0x0c 0x00 0x01 0x39 0x0d 0x00 0x02>;
+                       dmas = <0x3a 0x0c 0x00 0x01 0x3a 0x0d 0x00 0x02>;
                        interrupts = <0x1d>;
                        keep-power-in-suspend;
+                       non-removable;
                        pinctrl-0 = <0x3f 0x40>;
                        pinctrl-1 = <0x41 0x40>;
                        pinctrl-names = "default\0sleep";
@@ -1628,7 +1612,7 @@

                        wlcore@0 {
                                compatible = "ti,wl1831";
-                               interrupt-parent = <0x36>;
+                               interrupt-parent = <0x37>;
                                interrupts = <0x1c 0x04>;
                                ref-clock-frequency = <0x249f000>;
                                reg = <0x02>;
@@ -1637,13 +1621,13 @@

                mmc@48060000 {
                        bus-width = <0x04>;
-                       cd-gpios = <0x3d 0x14 0x01>;
+                       cd-gpios = <0x35 0x14 0x01>;
                        compatible = "ti,omap4-hsmmc";
                        dma-names = "tx\0rx";
-                       dmas = <0x39 0x18 0x00 0x00 0x39 0x19 0x00 0x00>;
+                       dmas = <0x3a 0x18 0x00 0x00 0x3a 0x19 0x00 0x00>;
                        interrupts = <0x40>;
-                       pinctrl-0 = <0x3b>;
-                       pinctrl-1 = <0x3c>;
+                       pinctrl-0 = <0x3c>;
+                       pinctrl-1 = <0x3d>;
                        pinctrl-names = "default\0sleep";
                        reg = <0x48060000 0x1000>;
                        status = "okay";
@@ -1651,7 +1635,7 @@
                        ti,hwmods = "mmc1";
                        ti,needs-special-hs-handling;
                        ti,needs-special-reset;
-                       vmmc-supply = <0x3a>;
+                       vmmc-supply = <0x3b>;
                };

                mmc@481d8000 {
@@ -1727,7 +1711,6 @@
                serial@481a6000 {
                        clock-frequency = <0x2dc6c00>;
                        compatible = "ti,am3352-uart\0ti,omap3-uart";
-                       has-hw-flow-control;
                        interrupts = <0x2c>;
                        pinctrl-0 = <0x33>;
                        pinctrl-1 = <0x34>;
@@ -1735,6 +1718,11 @@
                        reg = <0x481a6000 0x2000>;
                        status = "okay";
                        ti,hwmods = "uart4";
+
+                       bluetooth {
+                               compatible = "ti,wl1831-st";
+                               enable-gpios = <0x35 0x01 0x00>;
+                       };
                };

                serial@481a8000 {
@@ -1795,7 +1783,7 @@
                        ti,spi-num-cs = <0x02>;

                        spidev@1 {
-                               compatible = "rohm,dh2228fv";
+                               compatible = "spidev";
                                reg = <0x00>;
                                spi-max-frequency = <0x989680>;
                        };
@@ -1908,7 +1896,8 @@

                        tsc {
                                compatible = "ti,am3359-tsc";
-                               ti,coordinate-readouts = <0x05>;
+                               ti,charge-delay = <0x20000>;
+                               ti,coordinate-readouts = <0x07>;
                                ti,wire-config = <0x00 0x11 0x22 0x33>;
                                ti,wires = <0x04>;
                                ti,x-plate-resistance = <0xc8>;