projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c4f33e)
arm64: dts: g12a/g12b: correct i2c timeout interrupt number
authorJian Hu <jian.hu@amlogic.com>
Tue, 10 Jul 2018 11:43:49 +0000 (19:43 +0800)
committerYixun Lan <yixun.lan@amlogic.com>
Wed, 11 Jul 2018 06:52:14 +0000 (23:52 -0700)
PD#169865: arm64: dts: g12a/g12b: correct i2c timeout interrupt number

I2c timeout interrupt number has changed since g12a SoC, the timeout
interrupt have not used in i2c controller driver, the function will
probably be added later.

Change-Id: I2aca009bacfda0bc2636e48032de71c9aa42cacb
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
arch/arm64/boot/dts/amlogic/mesong12a.dtsi patch | blob | blame | history
arch/arm64/boot/dts/amlogic/mesong12b.dtsi patch | blob | blame | history

diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index 1e5e1d9fbb50c4d77eb17930ec2d74cdd8fdc9be..00624ad3790f3ac7abb676e375a2f43c91db7377 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -586,7 +586,7 @@
                                status = "disabled";
                                reg = <0x0 0x1f000 0x0 0x20>;
                                interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 91 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -598,7 +598,7 @@
                                status = "disabled";
                                reg = <0x0 0x1e000 0x0 0x20>;
                                interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 92 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -610,7 +610,7 @@
                                status = "disabled";
                                reg = <0x0 0x1d000 0x0 0x20>;
                                interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 94 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -622,7 +622,7 @@
                                status = "disabled";
                                reg = <0x0 0x1c000 0x0 0x20>;
                                interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 95 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -719,7 +719,8 @@
                                compatible = "amlogic,meson-g12a-i2c";
                                status = "disabled";
                                reg = <0x0 0x05000 0x0 0x20>;
-                               interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
+                               interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 201 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index ee4926364326f2183c9b3dc4530c4b7ab1893b06..6f19d493046829662ec0c7fb12d9fe47886bdfe7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -567,7 +567,7 @@
                                status = "disabled";
                                reg = <0x0 0x1f000 0x0 0x20>;
                                interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 91 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -579,7 +579,7 @@
                                status = "disabled";
                                reg = <0x0 0x1e000 0x0 0x20>;
                                interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 92 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -591,7 +591,7 @@
                                status = "disabled";
                                reg = <0x0 0x1d000 0x0 0x20>;
                                interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 94 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -603,7 +603,7 @@
                                status = "disabled";
                                reg = <0x0 0x1c000 0x0 0x20>;
                                interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
+                                       <GIC_SPI 95 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;
@@ -700,7 +700,8 @@
                                compatible = "amlogic,meson-g12b-i2c";
                                status = "disabled";
                                reg = <0x0 0x05000 0x0 0x20>;
-                               interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
+                               interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 201 IRQ_TYPE_EDGE_RISING>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&clkc CLKID_I2C>;