| From 45f10d24cf6048201ab0c6e0842457148c1337c8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 21 Sep 2018 12:14:46 +0200 |
| Subject: arm64: tegra: I2C on Tegra194 is not compatible with Tegra114 |
| |
| From: Thierry Reding <treding@nvidia.com> |
| |
| [ Upstream commit d9fd22447ba59a9b53a202fade977e82bfba8d8d ] |
| |
| Tegra194 contains a version of the I2C controller that is no longer |
| compatible with the version found in Tegra114. |
| |
| Signed-off-by: Thierry Reding <treding@nvidia.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi |
| index a4dfcd19b9e88..9fc14bb9a0aff 100644 |
| --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi |
| +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi |
| @@ -118,7 +118,7 @@ |
| }; |
| |
| gen1_i2c: i2c@3160000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x03160000 0x10000>; |
| interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -143,7 +143,7 @@ |
| }; |
| |
| cam_i2c: i2c@3180000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x03180000 0x10000>; |
| interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -157,7 +157,7 @@ |
| |
| /* shares pads with dpaux1 */ |
| dp_aux_ch1_i2c: i2c@3190000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x03190000 0x10000>; |
| interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -171,7 +171,7 @@ |
| |
| /* shares pads with dpaux0 */ |
| dp_aux_ch0_i2c: i2c@31b0000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x031b0000 0x10000>; |
| interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -184,7 +184,7 @@ |
| }; |
| |
| gen7_i2c: i2c@31c0000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x031c0000 0x10000>; |
| interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -197,7 +197,7 @@ |
| }; |
| |
| gen9_i2c: i2c@31e0000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x031e0000 0x10000>; |
| interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -264,7 +264,7 @@ |
| }; |
| |
| gen2_i2c: i2c@c240000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x0c240000 0x10000>; |
| interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| @@ -277,7 +277,7 @@ |
| }; |
| |
| gen8_i2c: i2c@c250000 { |
| - compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c"; |
| + compatible = "nvidia,tegra194-i2c"; |
| reg = <0x0c250000 0x10000>; |
| interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; |
| #address-cells = <1>; |
| -- |
| 2.20.1 |
| |
