[PATCH V2 1/2] ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114

[PATCH V2 1/2] ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114

[Joseph Lo]

The PMC HW is not 100% compatible across all Tegra series. We need to
specify each of them in the DT match table.

Signed-off-by: Joseph Lo <josephl@nvidia.com>
---
V2:
* fix the typo and the chip order in DT match table
---
 arch/arm/mach-tegra/pmc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index d4fdb5f..5d79d34 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -36,6 +36,8 @@ static inline void tegra_pmc_writel(u32 val, u32 reg)
 
 #ifdef CONFIG_OF
 static const struct of_device_id matches[] __initconst = {
+	{ .compatible = "nvidia,tegra114-pmc" },
+	{ .compatible = "nvidia,tegra30-pmc" },
 	{ .compatible = "nvidia,tegra20-pmc" },
 	{ }
 };
-- 
1.8.1.1

[PATCH V2 2/2] ARM: dts: tegra: fix the PMC compatible string

[Joseph Lo]

The PMC HW is not 100% compatible across all Tegra series. We need to
specify them in DT.

Signed-off-by: Joseph Lo <josephl@nvidia.com>
---
V2:
* fix typo
---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 arch/arm/boot/dts/tegra30.dtsi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index 1dfaf28..e4ddedd 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -99,7 +99,7 @@
 	};
 
 	pmc {
-		compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc";
+		compatible = "nvidia,tegra114-pmc";
 		reg = <0x7000e400 0x400>;
 	};
 
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 767803e..6ae82e7 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -422,7 +422,7 @@
 	};
 
 	pmc {
-		compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc";
+		compatible = "nvidia,tegra30-pmc";
 		reg = <0x7000e400 0x400>;
 	};
 
-- 
1.8.1.1

[PATCH V2 1/2] ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114

[Stephen Warren]

On 02/26/2013 07:27 PM, Joseph Lo wrote:
> The PMC HW is not 100% compatible across all Tegra series. We need to
> specify each of them in the DT match table.

Seems reasonable. I plan to apply for 3.10 when I can.

[PATCH V2 1/2] ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114

[Stephen Warren]

On 02/26/2013 07:27 PM, Joseph Lo wrote:
> The PMC HW is not 100% compatible across all Tegra series. We need to
> specify each of them in the DT match table.

I have applied these two patches to Tegra's for-3.10/cleanup branch.