From patchwork Mon Feb 1 20:35:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100999 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp300811lbb; Mon, 1 Feb 2016 12:37:31 -0800 (PST) X-Received: by 10.66.232.132 with SMTP id to4mr40950745pac.95.1454359051390; Mon, 01 Feb 2016 12:37:31 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id os10si26190273pac.121.2016.02.01.12.37.30; Mon, 01 Feb 2016 12:37:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932159AbcBAUh0 (ORCPT + 30 others); Mon, 1 Feb 2016 15:37:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:65471 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753453AbcBAUhX (ORCPT ); Mon, 1 Feb 2016 15:37:23 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0Lc8iD-1Zgrto1u3J-00jYda; Mon, 01 Feb 2016 21:36:13 +0100 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] ARM: davinci: limit DT support to DA850 Date: Mon, 1 Feb 2016 21:35:55 +0100 Message-Id: <1454358962-640598-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454358962-640598-1-git-send-email-arnd@arndb.de> References: <1454358962-640598-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:4O4no95oyGYMGGF+29qB4ROTawNaOolJst4jr++U/4bmjZg9PuR HdZFMW6soIHR4UfccLHAnlhFnK42EavN9vwHM/og2KL4tn1cs26+xxWUenlMXRIKOaf660i loIgrMQrV2Wd4NafZGXpjweMqFTpag53mtY+sG5C2KT/1SmVOv9cqeSOEs6hLDJWKNPQH0y dhvuWng0AMpWYFA+YTFPg== X-UI-Out-Filterresults: notjunk:1; V01:K0:dgdWK3W+35M=:upD9Egx4MWJ2jBBhatFlRb uRXgJQG/TGq1/NfDsBbli/M6G35lBV6U+7Nq1yiJN5u5rm3iTPxv1q+7Q8p5dXx8VbMGwe2Gd CxIrwE8xSwdSTQZX6Q/cUKu1wXOYI5o9EmP2JGJKXU6B/PE68pOv2sEKud04sncIA3+sHjfMJ 56rF8w+WOj7VoLPPxyLQwWyfAXUXzlkgogv5gJfnRDXyqPceiCj07+VzibLwr5+nnq0gxxBK/ +CrSngZcI2VQrLG4jzKWS8+S7DEWSJfCV7cRgc96tTtqiO4iSQJycQ7wFlQd+RYeW7pATQik0 rE3XJWzB23OiIqpLORQkTAXJJB8YTqsjYBGxy8z6mBzSUW/i1W3FdywANcy08s2ihyE28tgz2 pAdbVSLwE396MzQ1Bo6+m8LwYUo5wHvI8X2tpcVjwP5MX4tgo3eja5yOqaKdmCwD8gY3jLRfc G/JqB/d0ktv5rztQpOFt+iAca5ig5WwCOMOdJlQOI/A5ze5cI07AJJs1XKrt7FjYH1DgyyQva F9nxTxlnRVpDruThbqROl/CfccwRWESMGSsApYUtGFrB4uRKzitguwVwfXaHUq+0eh9Ug1yUl zXUn2NT/gv8V3OPljMDzHij+XEFrzRGWr3Z8kZCaccS/hW3g/2cB32xZ5n8HFEVfRjgvle76a HPnX8LNIEwNt9lEZ01Fab+MFps6KvYtSAP2p3BO0Pb9iNZ3xmlHW0UOqcXhLyIaF1XOc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When da8xx-dt.c is built with onlu DA830 support but not DA850 support enabled, we get a compiler warning about unused symbols: arch/arm/mach-davinci/da8xx-dt.c:28:20: warning: 'da8xx_init_irq' defined but not used [-Wunused-function] static void __init da8xx_init_irq(void) arch/arm/mach-davinci/da8xx-dt.c:33:30: warning: 'da850_auxdata_lookup' defined but not used [-Wunused-variable] static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { Obviously none of the file make sense for DA830, so we should not even attempt this, so we can avoid the warning by ensuring it is only built for 850, not 830. Signed-off-by: Arnd Bergmann --- arch/arm/mach-davinci/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 83e0f40f9ff1..6124c69154c3 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -68,7 +68,7 @@ comment "DaVinci Board Type" config MACH_DA8XX_DT bool "Support DA8XX platforms using device tree" default y - depends on ARCH_DAVINCI_DA8XX + depends on ARCH_DAVINCI_DA850 select PINCTRL help Say y here to include support for TI DaVinci DA850 based using From patchwork Mon Feb 1 20:35:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100998 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp300959lbb; Mon, 1 Feb 2016 12:37:46 -0800 (PST) X-Received: by 10.98.42.81 with SMTP id q78mr41008669pfq.142.1454359065907; Mon, 01 Feb 2016 12:37:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h68si48270447pfj.161.2016.02.01.12.37.42; Mon, 01 Feb 2016 12:37:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932287AbcBAUhk (ORCPT + 30 others); Mon, 1 Feb 2016 15:37:40 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:52195 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932160AbcBAUhh (ORCPT ); Mon, 1 Feb 2016 15:37:37 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0Ma2mt-1adlBx2aeV-00LncC; Mon, 01 Feb 2016 21:36:22 +0100 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ARM: davinci: avoid unused mityomapl138_pn_info variable Date: Mon, 1 Feb 2016 21:35:56 +0100 Message-Id: <1454358962-640598-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454358962-640598-1-git-send-email-arnd@arndb.de> References: <1454358962-640598-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:ZJxgn152zU/EhB6Rhxof4LvkvDZVD8aGnOCNQWtggqsTK4c5puY EVQrFmNYKqyYUPQQFyY+iKocXlu1bDYOdoIyptsJD82WKOWkcBLdvTHRcOqJUaFGqkbh6Qx Nd5jTwm9D765JluzYszX0TodcP2MTk+GYMhFRgPN3oDiarEcs8g0IXmtPsfw4idk4bXj5Xg kiJ3sHM9hipIE4kDsuqKw== X-UI-Out-Filterresults: notjunk:1; V01:K0:vYhuBCXzvfc=:NSwlh54vZt3CDxgFe+OHYj CM93OYkeJGyGcdfvnSTkZoNcMC8jtjlydbowrkjyUvvfmsf76FztPL9Ye99Dwjg2AbiClRJLW TTyIwuGAw/ePq56ucwaQt2STsz/HWSoDHb34nBCB52XYnkO3dsREhOsyjBHG5Nxb5bPcYRNz2 eWYZ8DuVQD7dG72AoFqRllooto8QFFWoqUFEPChdvO7cvQP4EG7JlRrWAHnLylk7RKDvy14US E7giynxXsylAHg9H/JYYSGFDsZLBphOl+4762LO2R6+S0YNwXwJ8Qo0kXVJbEaPq2y2GO7V+l uYl2hLoMZ0/lSeDeDrJ8mzNJy3NNyv1//fotQtN4aN8Cz/GvHTP1nXWQZgNU1qfuS/BVcMVD6 W9ETQbA72kCImXvTvdJx2flWb3b3Ewf7PwdK8fGQKgniDkj/w+7FVKvb5EwalFUsG2zZT8KDT nZBZteD6EK1RAD5o4WCkuw645aW85nlIAycidNS5nVnPmZ4fADuXXXj7Im315Dwgu6ZuRaPDO IoaG6kfpMeVjpNAQIv0TMvj1U6BKRj4/ocNrv0aY4fKwwZsq/6BMvBB63JfeIlQYuRb8bpv4S 4IvW/FNMCvLkgy3VcJru467T+50QOmKrLKsucov8vNiizLrwp83+PpB+NE2BwK5EPzRr63r38 OvJ7ODDaJxeRw9bf/W08TzgQMbS8cELl0PtkDhiHxm3aRO/mCZgViB46jGu5xbQZ60XM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mityomapl138_pn_info structure belongs into the CPU_FREQ support that is hidden behind an #ifdef, and causes a harmless warning when that support is disabled: mach-davinci/board-mityomapl138.c:59:28: error: 'mityomapl138_pn_info' defined but not used [-Werror=unused-variable] This moves the variable definition where it belongs. Signed-off-by: Arnd Bergmann --- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index de1316bf643a..c1f4b34785db 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -51,6 +51,7 @@ struct factory_config { static struct factory_config factory_config; +#ifdef CONFIG_CPU_FREQ struct part_no_info { const char *part_no; /* part number string of interest */ int max_freq; /* khz */ @@ -87,7 +88,6 @@ static struct part_no_info mityomapl138_pn_info[] = { }, }; -#ifdef CONFIG_CPU_FREQ static void mityomapl138_cpufreq_init(const char *partnum) { int i, ret; From patchwork Mon Feb 1 20:35:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101000 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp300369lbb; Mon, 1 Feb 2016 12:36:47 -0800 (PST) X-Received: by 10.66.164.10 with SMTP id ym10mr40301995pab.141.1454359007136; Mon, 01 Feb 2016 12:36:47 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wb3si27159104pab.114.2016.02.01.12.36.40; Mon, 01 Feb 2016 12:36:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753866AbcBAUgi (ORCPT + 30 others); Mon, 1 Feb 2016 15:36:38 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:56000 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753740AbcBAUgh (ORCPT ); Mon, 1 Feb 2016 15:36:37 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0Le4eS-1ZjN1m1tG8-00ptE7; Mon, 01 Feb 2016 21:36:30 +0100 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] ARM: davinci: DA8xx+DMx combined kernels need PATCH_PHYS_VIRT Date: Mon, 1 Feb 2016 21:35:57 +0100 Message-Id: <1454358962-640598-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454358962-640598-1-git-send-email-arnd@arndb.de> References: <1454358962-640598-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:WIRCFlHkvToG1YwtbwVKgwgGX80LkAQ47KlsUHItfZ8FNWkKuH2 RT/cdGD3etNwZsI+LTOWJ4gwyZN8zKBtvTECFLS02QMOZ2jPbhG1k5ockhRuuAkzjV7L5JN trOK/EcPukJwOmmDI+WmShwqki9pFX2fpAoFZOhXBZC/gKNPrf6jct/g4sc4EXnaqomY9xV aXxUnVeVVIGG7WlWGDwBw== X-UI-Out-Filterresults: notjunk:1; V01:K0:6AIOYITCLcE=:TsFEyVJaikvdtUOz0q8HvT xSItl0A8bjte4bCfdoqd6J/UkpU665I76+ldIYeWAOVSZnD1PjRdCoQzsjI6qggqu1tyhISvM ih7Fo9BchfRkBGoRXGpV2p2vSXls9lP2BYiaV3iJTDsrzqIl5hiyvJN5FWxa8juwCuijnvO+2 OCZQhz7Dw/EuvNvD/6k6/x7Cp8k1ZfVcrDH5tR3eusubJlPHuzC95Xho6pP8QoLl7633zl6MH FTb8kTmMINRsrIIGdVrZ4kIrOQVBCppOT3sQMryUWma97OeCVOMTmooMYU7zoTNo36nMQklEh NJSa6+ndoO6vHYe5tUhLkXBurV+0f3fBFVISrKDZ6NDhlqTgX2jyLE8aeNnhB99w00cZeqJ9+ QSFeZIftLlj74FjuYepvbWN19wOuUsB6aaU95lYSq/FZpcMqcUntlHjY1WHzE4bAUcrvkVPvr NYzT+JjuARfN/4hVw7bgj75Ett3Ji/ea560woaV3QkCIwN1ySx9xOiar2IzTog8wmVMGVfd/0 +yec3nqh2ukHUCrEp5KseUV/9D0mYrYniAzFTD2Je27SZ0U3t05OEMmVH4aiaDTKfV5/uVIwY wyF+XbZew2SMSomZ6mJjiZlGCUCmAXfkE7wI1rzFEpxiPRnk2NBnv9C04TJOxczuL1eQjWQD3 pNTsBD1bzn0C32RskcNgYYnXku4wdtwRvBRYk8O42YaR1c/EEq+gjOtWdY/NMqk0avis= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We already forbid that combination when AUTO_ZRELADDR is disabled, for the same reason that the two have their RAM at different physical addresses as seen from the CPU. This does the same change for PATCH_PHYS_VIRT: if you disable either of the options, Kconfig now enforces that you have to pick one or the other SoC family. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 1 + arch/arm/mach-davinci/Kconfig | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.7.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21d79b2531cc..8b10ccf4077e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -612,6 +612,7 @@ config ARCH_DAVINCI select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP + select CPU_ARM926T select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 6124c69154c3..8f54be83ec15 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -9,7 +9,6 @@ config CP_INTC config ARCH_DAVINCI_DMx bool - select CPU_ARM926T menu "TI DaVinci Implementations" @@ -32,7 +31,7 @@ config ARCH_DAVINCI_DM646x config ARCH_DAVINCI_DA830 bool "DA830/OMAP-L137/AM17x based system" - depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR + depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) select ARCH_DAVINCI_DA8XX # needed on silicon revs 1.0, 1.1: select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE @@ -40,13 +39,12 @@ config ARCH_DAVINCI_DA830 config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" - depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR + depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) select ARCH_DAVINCI_DA8XX select CP_INTC config ARCH_DAVINCI_DA8XX bool - select CPU_ARM926T config ARCH_DAVINCI_DM365 bool "DaVinci 365 based system" From patchwork Mon Feb 1 20:35:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100997 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp301041lbb; Mon, 1 Feb 2016 12:37:53 -0800 (PST) X-Received: by 10.98.13.195 with SMTP id 64mr41687549pfn.164.1454359073677; Mon, 01 Feb 2016 12:37:53 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7si48302521pfn.223.2016.02.01.12.37.51; Mon, 01 Feb 2016 12:37:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932382AbcBAUhu (ORCPT + 30 others); Mon, 1 Feb 2016 15:37:50 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:54461 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932160AbcBAUhq (ORCPT ); Mon, 1 Feb 2016 15:37:46 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LbZwx-1ZfE1y2sBv-00lCGW; Mon, 01 Feb 2016 21:36:33 +0100 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] ARM: davinci: make I2C support optional Date: Mon, 1 Feb 2016 21:35:58 +0100 Message-Id: <1454358962-640598-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454358962-640598-1-git-send-email-arnd@arndb.de> References: <1454358962-640598-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:JBMiqi5vC+g4KKuHawy0IozKKVIH3X3/TWtcYXLJkstILFC9PoK re1J3gU5bJKubMdWaM8l2vv+O87e7UMTtHi/J79tq1z3XvRZZWFo9QEJY9ljsKWY7rt/FFx 3gytU3kRKYOtmtL04D7zXGhQHbKS62h4LxDdIBo+zw2wGx+nnsjfRHzvJa5DphEp062u9FT ehkulMvZOR5G/jcKdYPXw== X-UI-Out-Filterresults: notjunk:1; V01:K0:g+1ER4ByLyg=:77lPf3c0HQ0I5BULsOG2tA Ik3M9/DKBo38JBUFYk6Fq3wwrtsd+wDkODR+E91taxCStKawtyZOEVcsoumQOqCHdiksLyC+S MTHts7erENffrAm1U+4IxTCK7S+bC+KbCn1wyQYRQtjf1kvCJ5LUYhx4TCE24VjMkHe64uC+F BLyxDz2AEKnCaZldglBjRRBvFUdyrE/GasKgxPsrF9/KeCmlgEqw4lps6FiEatKVktUeQwKbq oaMr9828bqQP2FusIBkKXRwqUTSc47AzhznCjyLvFJLbYX2bSNi1oDVb7zQdQY8Tx6ZPXewJ5 2/yKb5PsNtZc/wziArsvy0yztm5ySKgwHX2Fks0o6yBYsmFKO3NbiI/ilcdqPWxWkK24U/9/W vfqz4jSoGvA+Ff56iPfamgjAI80/3zvKIKzdcz7Dq5i84pRncBndbKOgFQfXxduHpPxxafwoB 4kaCVEDId5QXt+SXu8sCxJs8m0pFWkD6N1zxSMjsxjmVpJRKdDw7VUaKnCJJ7ulcdW+dOPc7K SwHbTOr1Fe5A/hj0dFEYrtoSmFP0KD8RGdx/4HoRO1rlqjTG34w8S90SFIVUVnguvAR75FxeS 3NkUzjRyj7GH9jm8sKq+XaEmJRpTCrW+pTTprHEv5AyM/YyT1Pk+JRf0zd1uRdkpDc7YvkfZD Q0u0063M4NYjCY/1LN6Ln73p7snCmU+LRUlgo+7fYEg3I7YP6MH4q4GruxzN60eKOZY0= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The davinci platform has tried to get support for the EEPROM right, but failed to get a clean build so far. At the moment, we get a warning whenever CONFIG_SYSFS is disabled, as that is needed by EEPROM_AT24: warning: (MACH_DAVINCI_EVM && MACH_SFFSDR && MACH_DAVINCI_DM6467_EVM && MACH_DAVINCI_DM365_EVM && MACH_DAVINCI_DA830_EVM && MACH_MITYOMAPL138 && MACH_MINI2440) selects EEPROM_AT24 which has unmet direct dependencies (I2C && SYSFS) Kevin Hilman initially added the 'select' to ensure that EEPROM_AT24 is always enabled in machines that really want it for normal operation (i.e. for reading the MAC address). This broke when I2C was disabled, and Russell King followed up with another patch to select that as well. I now see that the SYSFS dependency is still missing, which leaves us with three options: a) add 'select SYSFS' in addition to the others b) change AT24_EEPPROM to work without sysfs (should be possible) c) remove all those selects again and get the files to build when I2C is disabled. I would really hate to do a) because adding select statements that hardwire user-selectable symbols is generally a bad idea. I first tried b) but then ended up redoing the patch from scratch to approach c), so we can also remove the other selects. I checked that CONFIG_I2C is still enabled with davinci_all_defconfig, so that does not have to change. Signed-off-by: Arnd Bergmann Fixes: 45b146d746ea ("ARM: Davinci: Fix I2C build errors") Fixes: 22ca466847ad ("davinci: kconfig: select at24 eeprom for selected boards") --- arch/arm/mach-davinci/Kconfig | 14 +------------- arch/arm/mach-davinci/board-dm644x-evm.c | 8 ++++++-- arch/arm/mach-davinci/board-dm646x-evm.c | 7 +++++++ 3 files changed, 14 insertions(+), 15 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 8f54be83ec15..c1d2cb4ec04f 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -76,8 +76,6 @@ config MACH_DAVINCI_EVM bool "TI DM644x EVM" default ARCH_DAVINCI_DM644x depends on ARCH_DAVINCI_DM644x - select EEPROM_AT24 - select I2C help Configure this option to specify the whether the board used for development is a DM644x EVM @@ -85,8 +83,6 @@ config MACH_DAVINCI_EVM config MACH_SFFSDR bool "Lyrtech SFFSDR" depends on ARCH_DAVINCI_DM644x - select EEPROM_AT24 - select I2C help Say Y here to select the Lyrtech Small Form Factor Software Defined Radio (SFFSDR) board. @@ -117,8 +113,6 @@ config MACH_DAVINCI_DM6467_EVM bool "TI DM6467 EVM" default ARCH_DAVINCI_DM646x depends on ARCH_DAVINCI_DM646x - select EEPROM_AT24 - select I2C select MACH_DAVINCI_DM6467TEVM help Configure this option to specify the whether the board used @@ -131,8 +125,6 @@ config MACH_DAVINCI_DM365_EVM bool "TI DM365 EVM" default ARCH_DAVINCI_DM365 depends on ARCH_DAVINCI_DM365 - select EEPROM_AT24 - select I2C help Configure this option to specify whether the board used for development is a DM365 EVM @@ -141,9 +133,7 @@ config MACH_DAVINCI_DA830_EVM bool "TI DA830/OMAP-L137/AM17x Reference Platform" default ARCH_DAVINCI_DA830 depends on ARCH_DAVINCI_DA830 - select EEPROM_AT24 - select GPIO_PCF857X - select I2C + select GPIO_PCF857X if I2C help Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module. @@ -212,8 +202,6 @@ endchoice config MACH_MITYOMAPL138 bool "Critical Link MityDSP-L138/MityARM-1808 SoM" depends on ARCH_DAVINCI_DA850 - select EEPROM_AT24 - select I2C help Say Y here to select the Critical Link MityDSP-L138/MityARM-1808 System on Module. Information on this SoM may be found at diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 7a20507a3eef..68cc09907828 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -267,7 +267,7 @@ static struct platform_device rtc_dev = { static struct snd_platform_data dm644x_evm_snd_data; /*----------------------------------------------------------------------*/ - +#ifdef CONFIG_I2C /* * I2C GPIO expanders */ @@ -612,6 +612,7 @@ static void __init evm_init_i2c(void) i2c_add_driver(&dm6446evm_msp_driver); i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info)); } +#endif #define VENC_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) @@ -780,7 +781,9 @@ static __init void davinci_evm_init(void) pr_warn("%s: Cannot configure AEMIF\n", __func__); +#ifdef CONFIG_I2C evm_leds[7].default_trigger = "nand-disk"; +#endif if (HAS_NOR) pr_warn("WARNING: both NAND and NOR flash are enabled; disable one of them.\n"); } else if (HAS_NOR) @@ -789,9 +792,10 @@ static __init void davinci_evm_init(void) platform_add_devices(davinci_evm_devices, ARRAY_SIZE(davinci_evm_devices)); +#ifdef CONFIG_I2C evm_init_i2c(); - davinci_setup_mmc(0, &dm6446evm_mmc_config); +#endif dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg); davinci_serial_init(dm644x_serial_device); diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index ee6ab7e8d3b0..f702d4fc8eb8 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -121,6 +121,7 @@ static struct platform_device davinci_nand_device = { #define HAS_ATA IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) +#ifdef CONFIG_I2C /* CPLD Register 0 bits to control ATA */ #define DM646X_EVM_ATA_RST BIT(0) #define DM646X_EVM_ATA_PWD BIT(1) @@ -316,6 +317,7 @@ static struct at24_platform_data eeprom_info = { .setup = davinci_get_mac_addr, .context = (void *)0x7f00, }; +#endif static u8 dm646x_iis_serializer_direction[] = { TX_MODE, RX_MODE, INACTIVE_MODE, INACTIVE_MODE, @@ -346,6 +348,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = { }, }; +#ifdef CONFIG_I2C static struct i2c_client *cpld_client; static int cpld_video_probe(struct i2c_client *client, @@ -710,6 +713,7 @@ static void __init evm_init_i2c(void) evm_init_cpld(); evm_init_video(); } +#endif #define DM6467T_EVM_REF_FREQ 33000000 @@ -764,7 +768,10 @@ static __init void evm_init(void) if (ret) pr_warn("%s: GPIO init failed: %d\n", __func__, ret); +#ifdef CONFIG_I2C evm_init_i2c(); +#endif + davinci_serial_init(dm646x_serial_device); dm646x_init_mcasp0(&dm646x_evm_snd_data[0]); dm646x_init_mcasp1(&dm646x_evm_snd_data[1]);