From patchwork Thu Oct 25 09:57:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12498 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 C7F5023F9B for ; Thu, 25 Oct 2012 09:57:29 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7FABAA18319 for ; Thu, 25 Oct 2012 09:57:29 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so1107785iag.11 for ; Thu, 25 Oct 2012 02:57:29 -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=BIOMcHgiTtkl2vT1W04SdHHAYS/fER6/770oGk8oT5Q=; b=O+osHGhH+DB0Tmffuvf9hz3LM3J3lujao37zQNDCdHxj5/azDgol0zG5+jlJ288AmB mIEo8BX6vR6+QkXsYjBC9zzYnkV0OKXYDTPdpzrZgC3o7IdGmSH3+3dkdOyDSIVH4eaY eRz1T+v0lWAqO+mtaN/CoAyj7ZTAxKe2u7ikxVPGG1d5BX25cszv3qYBLI1AvCD2g1sx Sc3Io/jRW2po0aifkMycT2PPfR89sj+9Df/XZojV0xGNkhH+yOHl6T6MLgR9INpZb3YL nifndsrfSfTrf9FTZMtbspLe/XPRYn01gBO3t3jCfmdKTSb6jVDjLhE8Nv816aIQduYS 5iKA== Received: by 10.50.194.169 with SMTP id hx9mr5217888igc.70.1351159049205; Thu, 25 Oct 2012 02:57:29 -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 n20csp14756igt; Thu, 25 Oct 2012 02:57:28 -0700 (PDT) Received: by 10.216.207.199 with SMTP id n49mr11164303weo.136.1351159047877; Thu, 25 Oct 2012 02:57:27 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id b8si909656wix.46.2012.10.25.02.57.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 02:57:27 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-f50.google.com with SMTP id 16so1149381wgi.31 for ; Thu, 25 Oct 2012 02:57:27 -0700 (PDT) Received: by 10.216.141.152 with SMTP id g24mr11484126wej.113.1351159047365; Thu, 25 Oct 2012 02:57:27 -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.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 02:57:26 -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 4/8] ARM: ux500: List DT compatibility using platform names rather than by board Date: Thu, 25 Oct 2012 10:57:07 +0100 Message-Id: <1351159031-25391-5-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: ALoCoQlpDVs0xmJ7M2qFJRVNrbMKfsQzNRo7bUI/7k8Hy1crZR30XYsVjBb6ObtG0qWWoNzDXvVC So far, each ST-Ericsson board supported by Device Tree has been similar enough to run though a single DT_MACHINE_INIT call. On the back of that it has been suggested that we should reduce the number of compatible strings in our dt_compat structure. After subsequent discussion with Arnd Bergmann the conclusion was to list entries by platform as opposed to by board. The other suggestion was to use a single string which would cover all supported platforms, but any wildcard entries would include unsupported chipsets, such as the u5500 and potential new chips which no not yet have DT functionality. Hence, the best solution which encompasses all supported platforms, but no unsupported ones was to list the currently enabled four chipsets; u8500, u8540, u9500 and u9540 instead. Acked-by: Arnd Bergmann Signed-off-by: Lee Jones --- arch/arm/boot/dts/ccu9540.dts | 2 +- arch/arm/boot/dts/hrefprev60.dts | 2 +- arch/arm/boot/dts/hrefv60plus.dts | 2 +- arch/arm/boot/dts/snowball.dts | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts index 26dfe83..0430546 100644 --- a/arch/arm/boot/dts/ccu9540.dts +++ b/arch/arm/boot/dts/ccu9540.dts @@ -14,7 +14,7 @@ / { model = "ST-Ericsson CCU9540 platform with Device Tree"; - compatible = "st-ericsson,ccu9540"; + compatible = "st-ericsson,ccu9540", "st-ericsson,u9540"; memory { reg = <0x00000000 0x20000000>; diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts index cd9e535..b398946 100644 --- a/arch/arm/boot/dts/hrefprev60.dts +++ b/arch/arm/boot/dts/hrefprev60.dts @@ -16,7 +16,7 @@ / { model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; - compatible = "st-ericsson,mop500"; + compatible = "st-ericsson,mop500", "st-ericsson,u8500"; gpio_keys { button@1 { diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts index 82103a2..a01ac8f 100644 --- a/arch/arm/boot/dts/hrefv60plus.dts +++ b/arch/arm/boot/dts/hrefv60plus.dts @@ -16,7 +16,7 @@ / { model = "ST-Ericsson HREF (v60+) platform with Device Tree"; - compatible = "st-ericsson,hrefv60+"; + compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; gpio_keys { button@1 { diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 6a2b58b..9e02a91 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -14,7 +14,7 @@ / { model = "Calao Systems Snowball platform with device tree"; - compatible = "calaosystems,snowball-a9500"; + compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500"; memory { reg = <0x00000000 0x20000000>; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 472b49f..c65e7e3 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -330,11 +330,11 @@ static void __init u8500_init_machine(void) of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); } -static const char * u8500_dt_board_compat[] = { - "calaosystems,snowball-a9500", - "st-ericsson,hrefv60+", - "st-ericsson,mop500", - "st-ericsson,ccu9540", +static const char * stericsson_dt_platform_compat[] = { + "st-ericsson,u8500", + "st-ericsson,u8540", + "st-ericsson,u9500", + "st-ericsson,u9540", NULL, }; @@ -346,7 +346,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") .handle_irq = gic_handle_irq, .init_machine = u8500_init_machine, .init_late = NULL, - .dt_compat = u8500_dt_board_compat, + .dt_compat = stericsson_dt_platform_compat, MACHINE_END #endif