ARM: dts: logicpd-torpedo: Resyc DTS files with Linux 5.17-rc5

Resyc DTS files with Linux 5.17-rc5.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/dts/logicpd-torpedo-35xx-devkit.dts b/arch/arm/dts/logicpd-torpedo-35xx-devkit.dts
index 7675bc3fa8689457461f5726534794d5c971a09f..cb08aa62d96715fa9d24f3def3b268d7d037bf5f 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-35xx-devkit.dts
+++ b/arch/arm/dts/logicpd-torpedo-35xx-devkit.dts
@@ -9,5 +9,13 @@
 
 / {
        model = "LogicPD Zoom OMAP35xx Torpedo Development Kit";
-       compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3";
+       compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3430", "ti,omap3";
+};
+
+&omap3_pmx_core {
+       isp1763_pins: pinmux_isp1763_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x2154,  PIN_INPUT_PULLUP | MUX_MODE4)        /* sdmmc1_dat6.gpio_128 */
+               >;
+       };
 };

diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
index 18c27e85051f74f0e24e45e6ccf80788fb1248ab..07ea822fe40528fd521ce856b56c4aaa43db058a 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts
@@ -50,6 +50,20 @@
        };
 };
 
+&uart2 {
+       /delete-property/dma-names;
+       bluetooth {
+               compatible = "ti,wl1283-st";
+               enable-gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>; /* gpio 162 */
+               max-speed = <3000000>;
+       };
+};
+
+/* The DM3730 has a faster L3 than OMAP35, so increase pixel clock */
+&mt9p031_out {
+       pixel-clock-frequency = <90000000>;
+};
+
 &omap3_pmx_core {
        mmc3_pins: pinmux_mm3_pins {
                pinctrl-single,pins = <
@@ -71,3 +85,12 @@
                >;
        };
 };
+
+/* The gpio muxing between omap3530 and dm3730 is different for GPIO_128 */
+&omap3_pmx_wkup {
+       isp1763_pins: pinmux_isp1763_pins {
+               pinctrl-single,pins = <
+                       OMAP3_WKUP_IOPAD(0x2a58, PIN_INPUT_PULLUP | MUX_MODE4)  /* reserved.gpio_128 */
+               >;
+       };
+};

diff --git a/arch/arm/dts/logicpd-torpedo-baseboard.dtsi b/arch/arm/dts/logicpd-torpedo-baseboard.dtsi
index 642e809e757a150e29e284533521d9a0bbfdaa32..b4664ab002566b5f1173cdeeebc1de78ecfc98ba 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-baseboard.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-baseboard.dtsi
@@ -65,6 +65,7 @@
                pinctrl-0 = <&pwm_pins>;
                ti,timers = <&timer10>;
                #pwm-cells = <3>;
+               ti,clock-source = <0x01>;
        };
 
 };
@@ -80,6 +81,8 @@
 };
 
 &mcbsp2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcbsp2_pins>;
        status = "okay";
 };
 
@@ -90,7 +93,8 @@
 
 &gpmc {
        ranges = <0 0 0x30000000 0x1000000      /* CS0: 16MB for NAND */
-                 1 0 0x2c000000 0x1000000>;    /* CS1: 16MB for LAN9221 */
+                 1 0 0x2c000000 0x1000000      /* CS1: 16MB for LAN9221 */
+                 6 0 0x28000000 0x1000000>;    /* CS6: 16MB for ISP1763 */
 
        ethernet@gpmc {
                pinctrl-names = "default";
@@ -99,16 +103,60 @@
                interrupts = <1 IRQ_TYPE_LEVEL_LOW>;            /* gpio129 */
                reg = <1 0 0xff>;
        };
+
+       usb@6,0 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&isp1763_pins>;
+               compatible = "nxp,usb-isp1763";
+               reg = <0x6 0x0 0xff>;
+               interrupt-parent = <&gpio5>;
+               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupt-names = "host";
+               bus-width = <16>;
+               dr_mode = "host";
+               gpmc,mux-add-data = <0>;
+               gpmc,device-width = <2>;
+               gpmc,wait-pin = <0>;
+               gpmc,burst-length = <4>;
+               gpmc,cycle2cycle-samecsen = <1>;
+               gpmc,cycle2cycle-diffcsen = <1>;
+               gpmc,cs-on-ns = <0>;
+               gpmc,cs-rd-off-ns = <45>;
+               gpmc,cs-wr-off-ns = <45>;
+               gpmc,adv-on-ns = <0>;
+               gpmc,adv-rd-off-ns = <0>;
+               gpmc,adv-wr-off-ns = <0>;
+               gpmc,oe-on-ns = <0>;
+               gpmc,oe-off-ns = <45>;
+               gpmc,we-on-ns = <0>;
+               gpmc,we-off-ns = <25>;
+               gpmc,rd-cycle-ns = <60>;
+               gpmc,wr-cycle-ns = <45>;
+               gpmc,access-ns = <35>;
+               gpmc,page-burst-access-ns = <0>;
+               gpmc,bus-turnaround-ns = <0>;
+               gpmc,cycle2cycle-delay-ns = <60>;
+               gpmc,wait-monitoring-ns = <0>;
+               gpmc,clk-activation-ns = <0>;
+               gpmc,wr-data-mux-bus-ns = <5>;
+               gpmc,wr-access-ns = <20>;
+       };
 };
 
+&hdqw1w {
+       pinctrl-names = "default";
+       pinctrl-0 = <&hdq_pins>;
+};
+
+
 &vpll2 {
        regulator-always-on;
 };
 
 &dss {
-       status = "ok";
+       status = "okay";
        vdds_dsi-supply = <&vpll2>;
-       vdda_video-supply = <&video_reg>;
+       vdda_video-supply = <&vpll2>;
        pinctrl-names = "default";
        pinctrl-0 = <&dss_dpi_pins1>;
        port {
@@ -124,44 +172,19 @@
                display0 = &lcd0;
        };
 
-       video_reg: video_reg {
-               pinctrl-names = "default";
-               pinctrl-0 = <&panel_pwr_pins>;
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-supply";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio5 27 GPIO_ACTIVE_HIGH>;    /* gpio155, lcd INI */
-       };
-
        lcd0: display {
-               compatible = "panel-dpi";
+               /* This isn't the exact LCD, but the timings meet spec */
+               compatible = "newhaven,nhd-4.3-480272ef-atxl";
                label = "15";
-               status = "okay";
-               /* default-on; */
                pinctrl-names = "default";
-
+               pinctrl-0 = <&panel_pwr_pins>;
+               backlight = <&bl>;
+               enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;
                port {
                        lcd_in: endpoint {
                                remote-endpoint = <&dpi_out>;
                        };
                };
-
-               panel-timing {
-                       clock-frequency = <9000000>;
-                       hactive = <480>;
-                       vactive = <272>;
-                       hfront-porch = <3>;
-                       hback-porch = <2>;
-                       hsync-len = <42>;
-                       vback-porch = <3>;
-                       vfront-porch = <4>;
-                       vsync-len = <11>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
        };
 
        bl: backlight {
@@ -193,6 +216,12 @@
                >;
        };
 
+       hdq_pins: hdq_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x21c6, PIN_INPUT_PULLUP | MUX_MODE0) /* hdq_sio */
+               >;
+       };
+
        pwm_pins: pinmux_pwm_pins {
                pinctrl-single,pins = <
                        OMAP3_CORE1_IOPAD(0x20B8, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE3)       /* gpmc_ncs5.gpt_10_pwm_evt */

diff --git a/arch/arm/dts/logicpd-torpedo-som.dtsi b/arch/arm/dts/logicpd-torpedo-som.dtsi
index 3fdd0a72f87f795b43d049a262ae5e3d7df2b967..3a5228562b0d4ea250fc9c23bbb85cb05269043d 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-som.dtsi
@@ -35,6 +35,11 @@
        };
 };
 
+/* The Torpedo doesn't route the USB host pins */
+&usbhshost {
+       status = "disabled";
+};
+
 &gpmc {
        ranges = <0 0 0x30000000 0x1000000>;    /* CS0: 16MB for NAND */
 
@@ -192,3 +197,7 @@
 &twl_gpio {
        ti,use-leds;
 };
+
+&twl_keypad {
+       status = "disabled";
+};