From patchwork Fri Feb 13 01:40:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 5822801 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 20FF29F37F for ; Fri, 13 Feb 2015 01:40:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39F30200F3 for ; Fri, 13 Feb 2015 01:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4AB420263 for ; Fri, 13 Feb 2015 01:40:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751734AbbBMBkn (ORCPT ); Thu, 12 Feb 2015 20:40:43 -0500 Received: from mail-pd0-f174.google.com ([209.85.192.174]:37538 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441AbbBMBkm (ORCPT ); Thu, 12 Feb 2015 20:40:42 -0500 Received: by pdbfl12 with SMTP id fl12so15876766pdb.4 for ; Thu, 12 Feb 2015 17:40:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=p4sdIvat0IOFzhMQMY0S8Oyix0U6Skly9Bm28kcWeHQ=; b=HOrbCwYA7x8RuJ6Fx4xBlnGlo3stBQaPU1HWyZ1mo5Vp0n5a2fyuOKKCp9DBt4NuaG n385yIS/wRWo0QiGsOaPRGBkz9Tc6Xjztk/jiBNHk2TAfFERu4Ks0B5kE+cyq/iTfEmQ B7KTY7qlW0cnMFNpCMYhFw8RTq5E4CgpwrpoKgKC0enzrqblDB15OBtUCKc55BxSDdCn 6nVk6VgtP9D6VtjeAxuT2LMRzSVZwdLu4Cn9/eHRMyaPRUKrTRSSD3wKtzzUBmIYFy8h rI6gUSqGD0Ucp0BUHV85qaVljSmUdrVka6XDsdWtZgGhyKAvHAeQcTJ4TlPbC1BJBHAi MVtA== X-Gm-Message-State: ALoCoQmf/9xm7flp0K0mt3jajiAg75ti+V0j1rfiaWEuWcrmCLnPdhokn9PH6OhLN4Ach0ZFh1cD X-Received: by 10.70.56.6 with SMTP id w6mr11054057pdp.69.1423791642501; Thu, 12 Feb 2015 17:40:42 -0800 (PST) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id l2sm4931680pbq.50.2015.02.12.17.40.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Feb 2015 17:40:41 -0800 (PST) From: Nobuhiro Iwamatsu To: horms+renesas@verge.net.au Cc: linux-sh@vger.kernel.org, greet@linux-m68k.org, Nobuhiro Iwamatsu Subject: [PATCH 2/2 v2] ARM: shmobile: Add support SOC_BUS to R-Car Gen2 Date: Fri, 13 Feb 2015 10:40:22 +0900 Message-Id: <1423791622-30610-2-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1423791622-30610-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1423791622-30610-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This provides information through SOC_BUS to sysfs. And this moves all on-SoC devices from /sys/devices/platform to /sys/devices/socX/. Signed-off-by: Nobuhiro Iwamatsu Acked-by: Geert Uytterhoeven --- V2: - Remove rcar_gen2_get_revision and rcar_gen2_get_cpu_id. - Change read only once and store PRR. - Change display of revision. - Add machine field. - Add more patch description. arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/setup-rcar-gen2.c | 38 ++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 1b4fafe..4246579 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -18,6 +18,7 @@ config ARCH_RCAR_GEN2 bool select PM_RCAR if PM || SMP select RENESAS_IRQC + select SOC_BUS select SYS_SUPPORTS_SH_CMT select PCI_DOMAINS if PCI diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 4cc8492..8bc06aa 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include "common.h" @@ -209,19 +211,47 @@ void __init rcar_gen2_reserve(void) } #define PRR 0xFF000044 -static unsigned int __init rcar_gen2_get_cut(void) +static u32 __init rcar_gen2_get_prr(void) { void __iomem *addr = ioremap_nocache(PRR, 4); u32 data = ioread32(addr); iounmap(addr); - return (data & 0xFF) + 0x10; + return data; } void __init rcar_gen2_init_machine(void) { - system_rev = rcar_gen2_get_cut(); + struct soc_device_attribute *soc_dev_attr; + struct soc_device *soc_dev; + struct device *parent = NULL; + u32 prr; + + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); + if (!soc_dev_attr) + goto out; + + prr = rcar_gen2_get_prr(); + system_rev = (prr & 0xFF) + 0x10; + + soc_dev_attr->machine = of_flat_dt_get_machine_name(); + soc_dev_attr->family = kasprintf(GFP_KERNEL, "Renesas R-Car Gen2"); + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%u.%u", + system_rev >> 4, system_rev & 0xF); + soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%04x", + (prr & 0x7F00) >> 8); + + soc_dev = soc_device_register(soc_dev_attr); + if (IS_ERR(soc_dev)) { + kfree(soc_dev_attr->family); + kfree(soc_dev_attr->revision); + kfree(soc_dev_attr->soc_id); + kfree(soc_dev_attr); + goto out; + } - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + parent = soc_device_to_device(soc_dev); +out: + of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); }