From patchwork Thu Oct 25 09:57:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12496 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 70F4223F9B for ; Thu, 25 Oct 2012 09:57:27 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 269FEA18CE1 for ; Thu, 25 Oct 2012 09:57:27 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so1862475iej.11 for ; Thu, 25 Oct 2012 02:57:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=NiBTy8/6MLJge7d28DcCm6CfbSulLC2902YyJHPRggM=; b=IEPLs49ogKeC3k98lDYyBSDkzCmM2pR9iWfqh6ge+Hp7LCL+QQ3isluTHQxvBJalK/ tC/Tlz7SRrBoxOH07/CAwacIjwmkN+SvjvzZv31NmvMCTOZuHnlAWWFCfQSejsO1SZoF HC2qx7Fw4JRu7FDf0Jy650FGxEz+Uzrdv4jiLSxjRdif13t7ApMHTJCaGrLvVTh+goq7 KKAwxo/90cSB/9IbC6N9v/ncT/ByAo483Jogj6/dPaP6kFUBfgCmv/8F67LNNciqfTL+ KCNyREPXsb/5xbVRmYniJw1KosyUHXRXwdzIDHaw1ueIxA1AtQvP6RWEHbaQMpr2iZPf g4yg== Received: by 10.50.168.37 with SMTP id zt5mr5262577igb.57.1351159046894; Thu, 25 Oct 2012 02:57:26 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp14748igt; Thu, 25 Oct 2012 02:57:26 -0700 (PDT) Received: by 10.216.212.225 with SMTP id y75mr11149409weo.39.1351159045323; Thu, 25 Oct 2012 02:57:25 -0700 (PDT) Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by mx.google.com with ESMTPS id u12si260708wed.126.2012.10.25.02.57.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 02:57:25 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f42.google.com with SMTP id fm10so3459622wgb.1 for ; Thu, 25 Oct 2012 02:57:24 -0700 (PDT) Received: by 10.216.212.66 with SMTP id x44mr10655142weo.123.1351159044813; Thu, 25 Oct 2012 02:57:24 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id az2sm9125291wib.10.2012.10.25.02.57.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 02:57:24 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 2/8] ARM: ux500: Rename references to the ccu9540 dev board accordingly Date: Thu, 25 Oct 2012 10:57:05 +0100 Message-Id: <1351159031-25391-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351159031-25391-1-git-send-email-lee.jones@linaro.org> References: <1351159031-25391-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlnVLk+u3/Cns7WBLc4F+lZk/GtIxowFitnwKEOwQ805YmrCPe+ebIyYyZS6dVVnaOP0tFS When enabling ST-Ericsson's ccu9540 development board the board's full name has not been used. This patch adapts all references of the board's short name to how it should be referenced. Reviewed-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/{u9540.dts => ccu9540.dts} | 4 ++-- arch/arm/mach-ux500/cpu-db8500.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/boot/dts/{u9540.dts => ccu9540.dts} (93%) diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/ccu9540.dts similarity index 93% rename from arch/arm/boot/dts/u9540.dts rename to arch/arm/boot/dts/ccu9540.dts index 95892ec..26dfe83 100644 --- a/arch/arm/boot/dts/u9540.dts +++ b/arch/arm/boot/dts/ccu9540.dts @@ -13,8 +13,8 @@ /include/ "dbx5x0.dtsi" / { - model = "ST-Ericsson U9540 platform with Device Tree"; - compatible = "st-ericsson,u9540"; + model = "ST-Ericsson CCU9540 platform with Device Tree"; + compatible = "st-ericsson,ccu9540"; memory { reg = <0x00000000 0x20000000>; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 0b15591..6e9a06d 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -320,8 +320,8 @@ static void __init u8500_init_machine(void) snowball_pinmaps_init(); else if (of_machine_is_compatible("st-ericsson,hrefv60+")) hrefv60_pinmaps_init(); - else if (of_machine_is_compatible("st-ericsson,u9540")) {} - /* TODO: Add u9540 pinmaps. */ + else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} + /* TODO: Add pinmaps for ccu9540 board. */ /* TODO: Export SoC, USB, cpu-freq and DMA40 */ parent = u8500_of_init_devices(); @@ -334,7 +334,7 @@ static const char * u8500_dt_board_compat[] = { "calaosystems,snowball-a9500", "st-ericsson,hrefv60+", "st-ericsson,mop500", - "st-ericsson,u9540", + "st-ericsson,ccu9540", NULL, };