Merge tag 'versatile-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup

Versatile cleanups for the v4.7 series:
- Dynamically detect and print HBI numbers in SoC sysfs
- Hide the unused "pmu_device"

* tag 'versatile-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: hide unused 'pmu_device' object
  soc: versatile: dynamically detect RealView HBI numbers

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 6 insertions, 15 deletions

diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index b9f0757787ac..be1cec5fe3ad 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -248,6 +248,7 @@ static struct resource realview_pbx_isp1761_resources[] = {
         },
 };
 
+#ifdef CONFIG_CACHE_L2X0
 static struct resource pmu_resources[] = {
         [0] = {
                 .start          = IRQ_PBX_PMU_CPU0,
@@ -277,6 +278,7 @@ static struct platform_device pmu_device = {
         .num_resources          = ARRAY_SIZE(pmu_resources),
         .resource               = pmu_resources,
 };
+#endif
 
 static void __init gic_init_irq(void)
 {
diff --git a/drivers/soc/versatile/soc-realview.c b/drivers/soc/versatile/soc-realview.c
index c337764de867..282e371378ce 100644
--- a/drivers/soc/versatile/soc-realview.c
+++ b/drivers/soc/versatile/soc-realview.c
@@ -31,18 +31,6 @@ static const struct of_device_id realview_soc_of_match[] = {
 
 static u32 realview_coreid;
 
-static const char *realview_board_str(u32 id)
-{
-        switch ((id >> 16) & 0xfff) {
-        case 0x0147:
-                return "HBI-0147";
-        case 0x0159:
-                return "HBI-0159";
-        default:
-                return "Unknown";
-        }
-}
-
 static const char *realview_arch_str(u32 id)
 {
         switch ((id >> 8) & 0xf) {
@@ -69,7 +57,7 @@ static ssize_t realview_get_board(struct device *dev,
                               struct device_attribute *attr,
                               char *buf)
 {
-        return sprintf(buf, "%s\n", realview_board_str(realview_coreid));
+        return sprintf(buf, "HBI-%03x\n", ((realview_coreid >> 16) & 0xfff));
 }
 
 static struct device_attribute realview_board_attr =
@@ -133,8 +121,9 @@ static int realview_soc_probe(struct platform_device *pdev)
         device_create_file(soc_device_to_device(soc_dev), &realview_arch_attr);
         device_create_file(soc_device_to_device(soc_dev), &realview_build_attr);
 
-        dev_info(&pdev->dev, "RealView Syscon Core ID: 0x%08x\n",
-                 realview_coreid);
+        dev_info(&pdev->dev, "RealView Syscon Core ID: 0x%08x, HBI-%03x\n",
+                 realview_coreid,
+                 ((realview_coreid >> 16) & 0xfff));
         /* FIXME: add attributes for SoC to sysfs */
         return 0;
 }