Merge tag 'soc-dt-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / freescale / fsl-ls1012a.dtsi

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 1e3fe38..fe9093b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -290,7 +290,7 @@
                dcfg: dcfg@1ee0000 {
                        compatible = "fsl,ls1012a-dcfg",
                                     "syscon";
-                       reg = <0x0 0x1ee0000 0x0 0x10000>;
+                       reg = <0x0 0x1ee0000 0x0 0x1000>;
                        big-endian;
                };
 
@@ -351,24 +351,26 @@
                };
 
                i2c0: i2c@2180000 {
-                       compatible = "fsl,vf610-i2c";
+                       compatible = "fsl,ls1012a-i2c", "fsl,vf610-i2c";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x2180000 0x0 0x10000>;
                        interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
                                            QORIQ_CLK_PLL_DIV(4)>;
+                       scl-gpios = <&gpio0 2 0>;
                        status = "disabled";
                };
 
                i2c1: i2c@2190000 {
-                       compatible = "fsl,vf610-i2c";
+                       compatible = "fsl,ls1012a-i2c", "fsl,vf610-i2c";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x2190000 0x0 0x10000>;
                        interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
                                            QORIQ_CLK_PLL_DIV(4)>;
+                       scl-gpios = <&gpio0 13 0>;
                        status = "disabled";
                };
 
@@ -499,6 +501,7 @@
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
+                       snps,host-vbus-glitches;
                };
 
                sata: sata@3200000 {
@@ -550,6 +553,7 @@
                                        <0000 0 0 2 &gic 0 111 IRQ_TYPE_LEVEL_HIGH>,
                                        <0000 0 0 3 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>,
                                        <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+                       big-endian;
                        status = "disabled";
                };