Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stm32mp151.dtsi

diff --git a/arch/arm/boot/dts/stm32mp151.dtsi b/arch/arm/boot/dts/stm32mp151.dtsi
index 8475790..3c75aba 100644 (file)
--- a/arch/arm/boot/dts/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/stm32mp151.dtsi
@@ -362,8 +362,10 @@
                        #size-cells = <0>;
                        compatible = "st,stm32-lptimer";
                        reg = <0x40009000 0x400>;
+                       interrupts-extended = <&exti 47 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc LPTIM1_K>;
                        clock-names = "mux";
+                       wakeup-source;
                        status = "disabled";
 
                        pwm {
@@ -999,7 +1001,7 @@
 
                dmamux1: dma-router@48002000 {
                        compatible = "st,stm32h7-dmamux";
-                       reg = <0x48002000 0x1c>;
+                       reg = <0x48002000 0x40>;
                        #dma-cells = <3>;
                        dma-requests = <128>;
                        dma-masters = <&dma1 &dma2>;
@@ -1047,7 +1049,7 @@
 
                sdmmc3: sdmmc@48004000 {
                        compatible = "arm,pl18x", "arm,primecell";
-                       arm,primecell-periphid = <0x10153180>;
+                       arm,primecell-periphid = <0x00253180>;
                        reg = <0x48004000 0x400>;
                        interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "cmd_irq";
@@ -1068,9 +1070,9 @@
                        resets = <&rcc USBO_R>;
                        reset-names = "dwc2";
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       g-rx-fifo-size = <256>;
+                       g-rx-fifo-size = <512>;
                        g-np-tx-fifo-size = <32>;
-                       g-tx-fifo-size = <128 128 64 64 64 64 32 32>;
+                       g-tx-fifo-size = <256 16 16 16 16 16 16 16>;
                        dr_mode = "otg";
                        usb33d-supply = <&usb33>;
                        status = "disabled";
@@ -1098,7 +1100,7 @@
                        resets = <&rcc CAMITF_R>;
                        clocks = <&rcc DCMI>;
                        clock-names = "mclk";
-                       dmas = <&dmamux1 75 0x400 0x0d>;
+                       dmas = <&dmamux1 75 0x400 0x01>;
                        dma-names = "tx";
                        status = "disabled";
                };
@@ -1156,8 +1158,10 @@
                        #size-cells = <0>;
                        compatible = "st,stm32-lptimer";
                        reg = <0x50021000 0x400>;
+                       interrupts-extended = <&exti 48 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc LPTIM2_K>;
                        clock-names = "mux";
+                       wakeup-source;
                        status = "disabled";
 
                        pwm {
@@ -1183,8 +1187,10 @@
                        #size-cells = <0>;
                        compatible = "st,stm32-lptimer";
                        reg = <0x50022000 0x400>;
+                       interrupts-extended = <&exti 50 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc LPTIM3_K>;
                        clock-names = "mux";
+                       wakeup-source;
                        status = "disabled";
 
                        pwm {
@@ -1203,8 +1209,10 @@
                lptimer4: timer@50023000 {
                        compatible = "st,stm32-lptimer";
                        reg = <0x50023000 0x400>;
+                       interrupts-extended = <&exti 52 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc LPTIM4_K>;
                        clock-names = "mux";
+                       wakeup-source;
                        status = "disabled";
 
                        pwm {
@@ -1217,8 +1225,10 @@
                lptimer5: timer@50024000 {
                        compatible = "st,stm32-lptimer";
                        reg = <0x50024000 0x400>;
+                       interrupts-extended = <&exti 53 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc LPTIM5_K>;
                        clock-names = "mux";
+                       wakeup-source;
                        status = "disabled";
 
                        pwm {
@@ -1284,7 +1294,7 @@
                        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc HASH1>;
                        resets = <&rcc HASH1_R>;
-                       dmas = <&mdma1 31 0x10 0x1000A02 0x0 0x0>;
+                       dmas = <&mdma1 31 0x2 0x1000A02 0x0 0x0>;
                        dma-names = "in";
                        dma-maxburst = <2>;
                        status = "disabled";
@@ -1348,8 +1358,8 @@
                        reg = <0x58003000 0x1000>, <0x70000000 0x10000000>;
                        reg-names = "qspi", "qspi_mm";
                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
-                       dmas = <&mdma1 22 0x10 0x100002 0x0 0x0>,
-                              <&mdma1 22 0x10 0x100008 0x0 0x0>;
+                       dmas = <&mdma1 22 0x2 0x100002 0x0 0x0>,
+                              <&mdma1 22 0x2 0x100008 0x0 0x0>;
                        dma-names = "tx", "rx";
                        clocks = <&rcc QSPI_K>;
                        resets = <&rcc QSPI_R>;
@@ -1360,7 +1370,7 @@
 
                sdmmc1: sdmmc@58005000 {
                        compatible = "arm,pl18x", "arm,primecell";
-                       arm,primecell-periphid = <0x10153180>;
+                       arm,primecell-periphid = <0x00253180>;
                        reg = <0x58005000 0x1000>;
                        interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "cmd_irq";
@@ -1375,7 +1385,7 @@
 
                sdmmc2: sdmmc@58007000 {
                        compatible = "arm,pl18x", "arm,primecell";
-                       arm,primecell-periphid = <0x10153180>;
+                       arm,primecell-periphid = <0x00253180>;
                        reg = <0x58007000 0x1000>;
                        interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "cmd_irq";
@@ -1426,7 +1436,7 @@
                        status = "disabled";
                };
 
-               usbh_ohci: usbh-ohci@5800c000 {
+               usbh_ohci: usb@5800c000 {
                        compatible = "generic-ohci";
                        reg = <0x5800c000 0x1000>;
                        clocks = <&rcc USBH>;
@@ -1435,7 +1445,7 @@
                        status = "disabled";
                };
 
-               usbh_ehci: usbh-ehci@5800d000 {
+               usbh_ehci: usb@5800d000 {
                        compatible = "generic-ehci";
                        reg = <0x5800d000 0x1000>;
                        clocks = <&rcc USBH>;
@@ -1563,6 +1573,11 @@
                        status = "disabled";
                };
 
+               tamp: tamp@5c00a000 {
+                       compatible = "st,stm32-tamp", "syscon", "simple-mfd";
+                       reg = <0x5c00a000 0x400>;
+               };
+
                /*
                 * Break node order to solve dependency probe issue between
                 * pinctrl and exti.
@@ -1739,6 +1754,8 @@
                        st,syscfg-holdboot = <&rcc 0x10C 0x1>;
                        st,syscfg-tz = <&rcc 0x000 0x1>;
                        st,syscfg-pdds = <&pwr_mcu 0x0 0x1>;
+                       st,syscfg-rsc-tbl = <&tamp 0x144 0xFFFFFFFF>;
+                       st,syscfg-m4-state = <&tamp 0x148 0xFFFFFFFF>;
                        status = "disabled";
                };
        };