From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <4847AE52.5000809@grandegger.com> Date: Thu, 05 Jun 2008 11:13:54 +0200 From: Wolfgang Grandegger MIME-Version: 1.0 To: Linuxppc-dev@ozlabs.org Subject: [PATCH v2 4/4] [POWERPC] 85xx: correct vendor prefix in DTS files for TQM85xx modules Content-Type: text/plain; charset=ISO-8859-1 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Like for the TQM5200, the vendor prefix "tqc," is now used for all TQM85xx modules from TQ-Components GmbH (http://www.tqc.de) in the corresponding DTS files. Signed-off-by: Wolfgang Grandegger --- arch/powerpc/boot/dts/tqm8540.dts | 4 ++-- arch/powerpc/boot/dts/tqm8541.dts | 4 ++-- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 4 ++-- arch/powerpc/boot/dts/tqm8548.dts | 4 ++-- arch/powerpc/boot/dts/tqm8555.dts | 4 ++-- arch/powerpc/boot/dts/tqm8560.dts | 4 ++-- arch/powerpc/platforms/85xx/tqm85xx.c | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) Index: linux-2.6/arch/powerpc/boot/dts/tqm8540.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8540.dts +++ linux-2.6/arch/powerpc/boot/dts/tqm8540.dts @@ -12,8 +12,8 @@ /dts-v1/; / { - model = "tqm,8540"; - compatible = "tqm,8540", "tqm,85xx"; + model = "tqc,8540"; + compatible = "tqc,8540", "tqc,85xx"; #address-cells = <1>; #size-cells = <1>; Index: linux-2.6/arch/powerpc/boot/dts/tqm8541.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8541.dts +++ linux-2.6/arch/powerpc/boot/dts/tqm8541.dts @@ -12,8 +12,8 @@ /dts-v1/; / { - model = "tqm,8541"; - compatible = "tqm,8541", "tqm,85xx"; + model = "tqc,8541"; + compatible = "tqc,8541", "tqc,85xx"; #address-cells = <1>; #size-cells = <1>; Index: linux-2.6/arch/powerpc/boot/dts/tqm8548-bigflash.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ linux-2.6/arch/powerpc/boot/dts/tqm8548-bigflash.dts @@ -13,8 +13,8 @@ /dts-v1/; / { - model = "tqm,8548"; - compatible = "tqm,8548", "tqm,85xx"; + model = "tqc,8548"; + compatible = "tqc,8548", "tqc,85xx"; #address-cells = <1>; #size-cells = <1>; Index: linux-2.6/arch/powerpc/boot/dts/tqm8548.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8548.dts +++ linux-2.6/arch/powerpc/boot/dts/tqm8548.dts @@ -13,8 +13,8 @@ /dts-v1/; / { - model = "tqm,8548"; - compatible = "tqm,8548", "tqm,85xx"; + model = "tqc,8548"; + compatible = "tqc,8548", "tqc,85xx"; #address-cells = <1>; #size-cells = <1>; Index: linux-2.6/arch/powerpc/boot/dts/tqm8555.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8555.dts +++ linux-2.6/arch/powerpc/boot/dts/tqm8555.dts @@ -12,8 +12,8 @@ /dts-v1/; / { - model = "tqm,8555"; - compatible = "tqm,8555", "tqm,85xx"; + model = "tqc,8555"; + compatible = "tqc,8555", "tqc,85xx"; #address-cells = <1>; #size-cells = <1>; Index: linux-2.6/arch/powerpc/boot/dts/tqm8560.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8560.dts +++ linux-2.6/arch/powerpc/boot/dts/tqm8560.dts @@ -13,8 +13,8 @@ /dts-v1/; / { - model = "tqm,8560"; - compatible = "tqm,8560", "tqm,85xx"; + model = "tqc,8560"; + compatible = "tqc,8560", "tqc,85xx"; #address-cells = <1>; #size-cells = <1>; Index: linux-2.6/arch/powerpc/platforms/85xx/tqm85xx.c =================================================================== --- linux-2.6.orig/arch/powerpc/platforms/85xx/tqm85xx.c +++ linux-2.6/arch/powerpc/platforms/85xx/tqm85xx.c @@ -175,11 +175,11 @@ static int __init tqm85xx_probe(void) { unsigned long root = of_get_flat_dt_root(); - if ((of_flat_dt_is_compatible(root, "tqm,8540")) || - (of_flat_dt_is_compatible(root, "tqm,8541")) || - (of_flat_dt_is_compatible(root, "tqm,8548")) || - (of_flat_dt_is_compatible(root, "tqm,8555")) || - (of_flat_dt_is_compatible(root, "tqm,8560"))) + if ((of_flat_dt_is_compatible(root, "tqc,8540")) || + (of_flat_dt_is_compatible(root, "tqc,8541")) || + (of_flat_dt_is_compatible(root, "tqc,8548")) || + (of_flat_dt_is_compatible(root, "tqc,8555")) || + (of_flat_dt_is_compatible(root, "tqc,8560"))) return 1; return 0;