From patchwork Fri Jan 29 14:06:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101034 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139148lbb; Fri, 29 Jan 2016 06:07:56 -0800 (PST) X-Received: by 10.98.93.136 with SMTP id n8mr13579013pfj.88.1454076476074; Fri, 29 Jan 2016 06:07:56 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pz5si2451145pac.133.2016.01.29.06.07.55; Fri, 29 Jan 2016 06:07:56 -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 S1756336AbcA2OHt (ORCPT + 30 others); Fri, 29 Jan 2016 09:07:49 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:56012 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756130AbcA2OHo (ORCPT ); Fri, 29 Jan 2016 09:07:44 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M7Jry-1aCYps4AeU-00x3a9; Fri, 29 Jan 2016 15:07:11 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , Michael Turquette , Stephen Boyd , "Rafael J. Wysocki" , Viresh Kumar , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 1/9] ARM: pxa: define clock registers as __iomem Date: Fri, 29 Jan 2016 15:06:25 +0100 Message-Id: <1454076396-3563101-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:+Oi/U4N4LwHF7xBWL6FPUX6znUGFNV2YHMIkd+hqVgF+estcLiu TOjy3YfU7fXYA9LZubxeeBpYjScn3PMcQte9UkaRkVzLGPw33oygkfs4r0cdXmGkSgmxOoJ hxx7EMGKeol0s8EZjV7obCA9F/L9oQtyErcnhssxcgENtj76hhg13ItZ1EshFOR7IndMbeA UAbMDknPoU17O6MU33MVA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rJsWyuJ3FU8=:6xT5Vj1RlJ3SXYeffjZYmn ZgdStzmsc29NOmoXH7v0Z5lC/qxHRMjrV6lP9DGjxicKmsRPxQf7dzRflXJt70jPyeXmvBHHZ bIKrxc1k4wgz/RNl3TirOIu0F4vaZrpolgAHaJKlmbpfPpcs0YMBK3frAyIr74WqJ8EADl4PS 9evptvdZrWHBC6Z528YG2L/QJQq30MASreTzhlIKio0i7uU75c0riNjxbbvNdwD/eBn/dQYPp BxbFXXLzUJD5yBxqgC65SF6nM93iZkRw1PBeZvzR2OZwf4Oa9Yb38IxN1GQpbKKBGYIWBqwbp fQdQu8OfyQunliZnwEpOqbap96UXABGqW+YrRIMrSwiQGuTrGNo8SxNMk6kxDk6eG5H7uPvFP BCKWj4jiyeu2gpRHjkPkYN+MLeMUOQj2Zr6a/vHzS0+QZMf5fYctKIn4RTQySIfPPwUPG14Pp tRMZkkLXyHx4fU1FCJuHpoYykPlRXw8trO5ciubexbLwbpwZLUe+lvVT9U2elqyV8/mF5crN0 dSoCZ3PK6hILqaYJHxGVDqRz/D+dLaMUPHo/rvR5qc0PgUJLPy3q+70f0FzU7psltf9o8TKj0 0uZtkOXOBR6oWSykYUAeUjwRHt61jybR2kYMYxyWe/Eya0OGY4LbOazZekvqanAGjDXcjTpNp /goP7OiZsI3ltGdTmtnxpQRsV00qqe/CYi7LTEUmoWhZjDftWUw5BcyPg4TJL40bQndY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We should not dereference registers as pointers, so use readl/writel instead for these registers. The clock registers are accessed in multiple files, so we have to change them all at once. I stumbled over these registers while looking at something unrelated. There are in fact other registers with the same problem, but I did not try to address those at this point. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/gumstix.c | 6 ++--- arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 8 +++---- arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- drivers/clk/pxa/clk-pxa25x.c | 12 +++++----- drivers/clk/pxa/clk-pxa27x.c | 34 ++++++++++++++-------------- drivers/clk/pxa/clk-pxa3xx.c | 3 +-- drivers/cpufreq/pxa2xx-cpufreq.c | 2 +- 8 files changed, 34 insertions(+), 35 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index 6815a9357774..9c5b2fb054f9 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c @@ -139,14 +139,14 @@ static void gumstix_setup_bt_clock(void) { int timeout = 500; - if (!(OSCC & OSCC_OOK)) + if (!(readl(OSCC) & OSCC_OOK)) pr_warn("32kHz clock was not on. Bootloader may need to be updated\n"); else return; - OSCC |= OSCC_OON; + writel(readl(OSCC) | OSCC_OON, OSCC); do { - if (OSCC & OSCC_OOK) + if (readl(OSCC) & OSCC_OOK) break; udelay(1); } while (--timeout); diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h index f1dd62946b36..5537d5601d70 100644 --- a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h @@ -134,10 +134,10 @@ /* * PXA2xx specific Core clock definitions */ -#define CCCR __REG(0x41300000) /* Core Clock Configuration Register */ -#define CCSR __REG(0x4130000C) /* Core Clock Status Register */ -#define CKEN __REG(0x41300004) /* Clock Enable Register */ -#define OSCC __REG(0x41300008) /* Oscillator Configuration Register */ +#define CCCR io_p2v(0x41300000) /* Core Clock Configuration Register */ +#define CCSR io_p2v(0x4130000C) /* Core Clock Status Register */ +#define CKEN io_p2v(0x41300004) /* Clock Enable Register */ +#define OSCC io_p2v(0x41300008) /* Oscillator Configuration Register */ #define CCCR_N_MASK 0x0380 /* Run Mode Frequency to Turbo Mode Frequency Multiplier */ #define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */ diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h index f4d48d20754e..888bf7ade15a 100644 --- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h @@ -18,7 +18,7 @@ /* * Oscillator Configuration Register (OSCC) */ -#define OSCC __REG(0x41350000) /* Oscillator Configuration Register */ +#define OSCC io_p2v(0x41350000) /* Oscillator Configuration Register */ #define OSCC_PEN (1 << 11) /* 13MHz POUT */ diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index 515b7ddda8aa..3b94ecfb9426 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c @@ -910,7 +910,7 @@ static void __init zeus_map_io(void) PMCR = PSPR = 0; /* enable internal 32.768Khz oscillator (ignore OSCC_OOK) */ - OSCC |= OSCC_OON; + writel(readl(OSCC) | OSCC_OON, OSCC); /* Some clock cycles later (from OSCC_ON), programme PCFR (OPDE...). * float chip selects and PCMCIA */ diff --git a/drivers/clk/pxa/clk-pxa25x.c b/drivers/clk/pxa/clk-pxa25x.c index b7747229db9a..a9353cd4ce17 100644 --- a/drivers/clk/pxa/clk-pxa25x.c +++ b/drivers/clk/pxa/clk-pxa25x.c @@ -84,7 +84,7 @@ unsigned int pxa25x_get_clk_frequency_khz(int info) static unsigned long clk_pxa25x_memory_get_rate(struct clk_hw *hw, unsigned long parent_rate) { - unsigned long cccr = CCCR; + unsigned long cccr = readl(CCCR); unsigned int m = M_clk_mult[(cccr >> 5) & 0x03]; return parent_rate / m; @@ -99,7 +99,7 @@ PARENTS(pxa25x_osc3) = { "osc_3_6864mhz", "osc_3_6864mhz" }; #define PXA25X_CKEN(dev_id, con_id, parents, mult, div, \ bit, is_lp, flags) \ PXA_CKEN(dev_id, con_id, bit, parents, mult, div, mult, div, \ - is_lp, &CKEN, CKEN_ ## bit, flags) + is_lp, CKEN, CKEN_ ## bit, flags) #define PXA25X_PBUS95_CKEN(dev_id, con_id, bit, mult_hp, div_hp, delay) \ PXA25X_CKEN(dev_id, con_id, pxa25x_pbus95_parents, mult_hp, \ div_hp, bit, NULL, 0) @@ -112,10 +112,10 @@ PARENTS(pxa25x_osc3) = { "osc_3_6864mhz", "osc_3_6864mhz" }; #define PXA25X_CKEN_1RATE(dev_id, con_id, bit, parents, delay) \ PXA_CKEN_1RATE(dev_id, con_id, bit, parents, \ - &CKEN, CKEN_ ## bit, 0) + CKEN, CKEN_ ## bit, 0) #define PXA25X_CKEN_1RATE_AO(dev_id, con_id, bit, parents, delay) \ PXA_CKEN_1RATE(dev_id, con_id, bit, parents, \ - &CKEN, CKEN_ ## bit, CLK_IGNORE_UNUSED) + CKEN, CKEN_ ## bit, CLK_IGNORE_UNUSED) static struct desc_clk_cken pxa25x_clocks[] __initdata = { PXA25X_PBUS95_CKEN("pxa2xx-mci.0", NULL, MMC, 1, 5, 0), @@ -162,7 +162,7 @@ MUX_RO_RATE_RO_OPS(clk_pxa25x_core, "core"); static unsigned long clk_pxa25x_run_get_rate(struct clk_hw *hw, unsigned long parent_rate) { - unsigned long cccr = CCCR; + unsigned long cccr = readl(CCCR); unsigned int n2 = N2_clk_mult[(cccr >> 7) & 0x07]; return (parent_rate / n2) * 2; @@ -173,7 +173,7 @@ RATE_RO_OPS(clk_pxa25x_run, "run"); static unsigned long clk_pxa25x_cpll_get_rate(struct clk_hw *hw, unsigned long parent_rate) { - unsigned long clkcfg, cccr = CCCR; + unsigned long clkcfg, cccr = readl(CCCR); unsigned int l, m, n2, t; asm("mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg)); diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c index 5b82d30baf9f..fc2abf97edd7 100644 --- a/drivers/clk/pxa/clk-pxa27x.c +++ b/drivers/clk/pxa/clk-pxa27x.c @@ -85,7 +85,7 @@ unsigned int pxa27x_get_clk_frequency_khz(int info) bool pxa27x_is_ppll_disabled(void) { - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); return ccsr & (1 << CCCR_PPDIS_BIT); } @@ -93,7 +93,7 @@ bool pxa27x_is_ppll_disabled(void) #define PXA27X_CKEN(dev_id, con_id, parents, mult_hp, div_hp, \ bit, is_lp, flags) \ PXA_CKEN(dev_id, con_id, bit, parents, 1, 1, mult_hp, div_hp, \ - is_lp, &CKEN, CKEN_ ## bit, flags) + is_lp, CKEN, CKEN_ ## bit, flags) #define PXA27X_PBUS_CKEN(dev_id, con_id, bit, mult_hp, div_hp, delay) \ PXA27X_CKEN(dev_id, con_id, pxa27x_pbus_parents, mult_hp, \ div_hp, bit, pxa27x_is_ppll_disabled, 0) @@ -106,10 +106,10 @@ PARENTS(pxa27x_membus) = { "lcd_base", "lcd_base" }; #define PXA27X_CKEN_1RATE(dev_id, con_id, bit, parents, delay) \ PXA_CKEN_1RATE(dev_id, con_id, bit, parents, \ - &CKEN, CKEN_ ## bit, 0) + CKEN, CKEN_ ## bit, 0) #define PXA27X_CKEN_1RATE_AO(dev_id, con_id, bit, parents, delay) \ PXA_CKEN_1RATE(dev_id, con_id, bit, parents, \ - &CKEN, CKEN_ ## bit, CLK_IGNORE_UNUSED) + CKEN, CKEN_ ## bit, CLK_IGNORE_UNUSED) static struct desc_clk_cken pxa27x_clocks[] __initdata = { PXA27X_PBUS_CKEN("pxa2xx-uart.0", NULL, FFUART, 2, 42, 1), @@ -151,7 +151,7 @@ static unsigned long clk_pxa27x_cpll_get_rate(struct clk_hw *hw, unsigned long clkcfg; unsigned int t, ht; unsigned int l, L, n2, N; - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); asm("mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg)); t = clkcfg & (1 << 0); @@ -171,8 +171,8 @@ static unsigned long clk_pxa27x_lcd_base_get_rate(struct clk_hw *hw, unsigned long parent_rate) { unsigned int l, osc_forced; - unsigned long ccsr = CCSR; - unsigned long cccr = CCCR; + unsigned long ccsr = readl(CCSR); + unsigned long cccr = readl(CCCR); l = ccsr & CCSR_L_MASK; osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); @@ -193,7 +193,7 @@ static unsigned long clk_pxa27x_lcd_base_get_rate(struct clk_hw *hw, static u8 clk_pxa27x_lcd_base_get_parent(struct clk_hw *hw) { unsigned int osc_forced; - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); if (osc_forced) @@ -222,7 +222,7 @@ static unsigned long clk_pxa27x_core_get_rate(struct clk_hw *hw, { unsigned long clkcfg; unsigned int t, ht, b, osc_forced; - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); asm("mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg)); @@ -242,7 +242,7 @@ static u8 clk_pxa27x_core_get_parent(struct clk_hw *hw) { unsigned long clkcfg; unsigned int t, ht, b, osc_forced; - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); if (osc_forced) @@ -263,7 +263,7 @@ MUX_RO_RATE_RO_OPS(clk_pxa27x_core, "core"); static unsigned long clk_pxa27x_run_get_rate(struct clk_hw *hw, unsigned long parent_rate) { - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); unsigned int n2 = (ccsr & CCSR_N2_MASK) >> CCSR_N2_SHIFT; return (parent_rate / n2) * 2; @@ -285,7 +285,7 @@ static unsigned long clk_pxa27x_system_bus_get_rate(struct clk_hw *hw, { unsigned long clkcfg; unsigned int b, osc_forced; - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); asm("mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg)); @@ -302,7 +302,7 @@ static unsigned long clk_pxa27x_system_bus_get_rate(struct clk_hw *hw, static u8 clk_pxa27x_system_bus_get_parent(struct clk_hw *hw) { unsigned int osc_forced; - unsigned long ccsr = CCSR; + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); if (osc_forced) @@ -318,8 +318,8 @@ static unsigned long clk_pxa27x_memory_get_rate(struct clk_hw *hw, unsigned long parent_rate) { unsigned int a, l, osc_forced; - unsigned long cccr = CCCR; - unsigned long ccsr = CCSR; + unsigned long cccr = readl(CCCR); + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); a = cccr & (1 << CCCR_A_BIT); @@ -337,8 +337,8 @@ static unsigned long clk_pxa27x_memory_get_rate(struct clk_hw *hw, static u8 clk_pxa27x_memory_get_parent(struct clk_hw *hw) { unsigned int osc_forced, a; - unsigned long cccr = CCCR; - unsigned long ccsr = CCSR; + unsigned long cccr = readl(CCCR); + unsigned long ccsr = readl(CCSR); osc_forced = ccsr & (1 << CCCR_CPDIS_BIT); a = cccr & (1 << CCCR_A_BIT); diff --git a/drivers/clk/pxa/clk-pxa3xx.c b/drivers/clk/pxa/clk-pxa3xx.c index 4af4eed5f89f..ea679718601c 100644 --- a/drivers/clk/pxa/clk-pxa3xx.c +++ b/drivers/clk/pxa/clk-pxa3xx.c @@ -334,8 +334,7 @@ static void __init pxa3xx_base_clocks_init(void) clk_register_clk_pxa3xx_system_bus(); clk_register_clk_pxa3xx_ac97(); clk_register_clk_pxa3xx_smemc(); - clk_register_gate(NULL, "CLK_POUT", "osc_13mhz", 0, - (void __iomem *)&OSCC, 11, 0, NULL); + clk_register_gate(NULL, "CLK_POUT", "osc_13mhz", 0, OSCC, 11, 0, NULL); clkdev_pxa_register(CLK_OSTIMER, "OSTIMER0", NULL, clk_register_fixed_factor(NULL, "os-timer0", "osc_13mhz", 0, 1, 4)); diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c index 096377232747..46fee1539cc8 100644 --- a/drivers/cpufreq/pxa2xx-cpufreq.c +++ b/drivers/cpufreq/pxa2xx-cpufreq.c @@ -319,7 +319,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, unsigned int idx) local_irq_save(flags); /* Set new the CCCR and prepare CCLKCFG */ - CCCR = pxa_freq_settings[idx].cccr; + writel(pxa_freq_settings[idx].cccr, CCCR); cclkcfg = pxa_freq_settings[idx].cclkcfg; asm volatile(" \n\ From patchwork Fri Jan 29 14:06:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101035 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139061lbb; Fri, 29 Jan 2016 06:07:46 -0800 (PST) X-Received: by 10.66.235.36 with SMTP id uj4mr13739003pac.85.1454076466832; Fri, 29 Jan 2016 06:07:46 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 84si24502248pfh.48.2016.01.29.06.07.46; Fri, 29 Jan 2016 06:07:46 -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 S1756313AbcA2OHo (ORCPT + 30 others); Fri, 29 Jan 2016 09:07:44 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:62051 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752447AbcA2OHn (ORCPT ); Fri, 29 Jan 2016 09:07:43 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MZDuG-1afbC12H8e-00L00N; Fri, 29 Jan 2016 15:07:21 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 2/9] ARM: pxa: mark spitz_card_pwr_ctrl as __maybe_unused Date: Fri, 29 Jan 2016 15:06:26 +0100 Message-Id: <1454076396-3563101-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:f1f5zY3/dsAPipCpp9LVj8ZZsaciaOvsHji9JdGW/wbkZYjeSpq Dk868bB8UEp88Fd+f07jrhX8HC3pPeNDOWsYjZqKXbQGAzprVKbLHR+r7yx1Sx6RY0Ke4vT rnT7S0K0VmcHU5rEV8ls+9Lz5CQOeiZ3VorK6TTi8Vkh2/eg4+5I6UniRSUFG8zNIDMDfj1 ZNb1yJvvMiBq91UqotwdA== X-UI-Out-Filterresults: notjunk:1; V01:K0:3fykkw1REWk=:+K/3ucuxJ5cQL57fKd3x1q RfuSg8wiTUPla2b9U9UHT0YexS3uldwsNTPkoXse60FfsMuoFeg+NVe424BEk24/HFQGgbzFc Hu0KuFEI9UG9NL19Bcp1hheLeEe/SilF3aPhRfSOMRWtu2sS8hZxlyE9GRRh+Q9Cu57he0CKq sEq6pJHJSBjurAW3//QXBDPKegl6wSZitjSfvvibucvJ9tyW2LUDw/YYomrfxCErJ9pIR5N52 3ZcnSeUctKhQfKVELetGqSg4ERiMcQn4mAqBVhQRgfsDtvZKn5BPD5XhC+grP3HvJ2pQNeTt/ mgtoVAQdF+IXuRZSsFGwRatiDOC7hi3b2ck1rA0eE7FXLEJcJFc9CwGx/UuKOXTrFEf3k0bFU Zk1nuutbZ7cORnkoMM8asx94YfhOiLdHgbvY1SJlDnIj9yfYQt3i0fabKbHyrl7urZV225tw9 3d3InBVBfRpZXHyZgueq18XEk4AjIyPqAePlVt/WCWa4ACw7q9Q1DF4MQVUH5PSvNPFIZ4u11 pEcWOy/knQzK+R5aYU3IKGbAZ4f5o+BGtZMswwI//LMzCVOekL8enWU4jkrhSyZIeddG0ek/y atVv8+TzcF9zoaLGlSPicdNXOwfTtZNAf5zq5zkeF7kKPcQICctv0puPt+rttRp6/yF9nhtEA eGdn8o1wbfbCUDTos9dk10yslLPDakcI0eVbB+tNx3nkbDoQbI/LZMaF2TNY6UUoBE7A= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is only used when CONFIG_PCMCIA is enabled, otherwise we get a harmless warning: arch/arm/mach-pxa/spitz.c:204:13: warning: 'spitz_card_pwr_ctrl' defined but not used [-Wunused-function] Marking it as __maybe_unused keeps the logic simple and avoids the warning on randconfig builds. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/spitz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 825f903ab77e..d9578bc49fdc 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -201,7 +201,7 @@ static void __init spitz_scoop_init(void) } /* Power control is shared with between one of the CF slots and SD */ -static void spitz_card_pwr_ctrl(uint8_t enable, uint8_t new_cpr) +static void __maybe_unused spitz_card_pwr_ctrl(uint8_t enable, uint8_t new_cpr) { unsigned short cpr; unsigned long flags; From patchwork Fri Jan 29 14:06:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101033 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139276lbb; Fri, 29 Jan 2016 06:08:05 -0800 (PST) X-Received: by 10.98.17.92 with SMTP id z89mr13695311pfi.16.1454076485637; Fri, 29 Jan 2016 06:08:05 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xc4si3818669pab.244.2016.01.29.06.08.05; Fri, 29 Jan 2016 06:08:05 -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 S1756357AbcA2OH6 (ORCPT + 30 others); Fri, 29 Jan 2016 09:07:58 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:57844 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756216AbcA2OH4 (ORCPT ); Fri, 29 Jan 2016 09:07:56 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LgXxN-1ZmTVb0ds5-00nx0o; Fri, 29 Jan 2016 15:07:26 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 3/9] ARM: pxa: mark unused eseries code as __maybe_unused Date: Fri, 29 Jan 2016 15:06:27 +0100 Message-Id: <1454076396-3563101-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Qy3ypUbEaZJxlsXPB+hqKAoeT0VnUUYhOUabxr74UjRNyomPuhB qbB6BJsWBmEht9n9SFx3iGN/KKqe0Pd+pgVU+8140H9qMicxvb422WiJJLS+WIkbMjRrHzy 6stFpWHV++18INCadkj41kyzN/EDPWkGodsPZKBrxJCc7r8eH/wkLjYOh2N2vW2SB9ByiR/ Nggo8pNOkplwTgSY5l/yA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+QozWYwUqCk=:9dRsyKYHdb9GpI0LJFt6D8 Mku8/0slEa7vYPqMdqXsBompFEO4ebsPiZfsLhPgK31tFykFqTMUJo8i4McMtHn+2XIz534xm KwAWHomFosLhn0ys0hUqbFHfaxNWhEeDw7lUOVvhiVsAsI0I0ErAx7ZqLOBGFwhMGdsQqp4Is LXIXFqVQjzsbfRTilQQSMv4Jowqmvq28icdiqYeVrMkAkhoXYhX5+UZ2QUHAkNECo/HNUB0iK p78vThpw94rLBG5iaVdEXbsxjAwXMH6Sx6tQSInvjbF9y/cnVyvXSdzU37zisxLqJj1B089sH TrcNcFUkmFIC4vnP+Dv30GRg/b2b4eGyMjKq2b+gdGkk6YI+JO7lEFQctDIN63/dp6ZirUTSZ 3VlnD2A4IKiIlJN6g/X6jaz7Z88GcCqIedzNOEBUUDxn4HV3Kn7WFjwroVBMrEDaPlECx2FRX 5Uqrw0i1Yd1UY/1FxKrT/yu+sPJSWN7wccZXiSyWJta5sVwfuK3FPQbH3/bjQzTpeU4Arjq0o KQ0gmBqW+KOoPsJJMJPXa0bs4SJ1ZehcKvBJPUJcFTrhze3e+irzt4dVI6S+maQ11JO72i2He 0GAuf2JCZwJi5VyrWdq0lMDECsQeTg/Jnp6qjzFr5typGJsmjvhCG4HDpaxW/CTv317V25h5n VogLEDkf/3EdxzRC8dK7jtdMKLJ/hM+8O2JwiZVQmjWrlErnlF9+aq5sF1xEGtyPyd2Q= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Two variables in eseries.c are used on multiple platforms, but are not referenced when those are all disabled: eseries.c:60:31: warning: 'e7xx_gpio_vbus' defined but not used [-Wunused-variable] eseries.c:129:20: warning: 'eseries_register_clks' defined but not used [-Wunused-function] Marking them __maybe_unused is the nicest way to ensure that we never get the warning or end up with missing symbols if we get it wrong. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/eseries.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index 0b00b226f54b..e838b11fb8c7 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c @@ -57,7 +57,7 @@ struct gpio_vbus_mach_info e7xx_udc_info = { .gpio_pullup_inverted = 1 }; -static struct platform_device e7xx_gpio_vbus = { +static struct platform_device e7xx_gpio_vbus __maybe_unused = { .name = "gpio-vbus", .id = -1, .dev = { @@ -126,7 +126,7 @@ struct resource eseries_tmio_resources[] = { }; /* Some e-series hardware cannot control the 32K clock */ -static void __init eseries_register_clks(void) +static void __init __maybe_unused eseries_register_clks(void) { clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, CLK_IS_ROOT, 32768); } From patchwork Fri Jan 29 14:06:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101032 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139426lbb; Fri, 29 Jan 2016 06:08:19 -0800 (PST) X-Received: by 10.66.54.78 with SMTP id h14mr13577055pap.59.1454076499689; Fri, 29 Jan 2016 06:08:19 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sj10si2471006pab.65.2016.01.29.06.08.19; Fri, 29 Jan 2016 06:08:19 -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 S1756376AbcA2OIR (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:17 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:54732 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756241AbcA2OIO (ORCPT ); Fri, 29 Jan 2016 09:08:14 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MHpe9-1aNnKU0f9x-003biA; Fri, 29 Jan 2016 15:07:43 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 4/9] ARM: pxa: don't select GPIO_SYSFS for MIOA701 Date: Fri, 29 Jan 2016 15:06:28 +0100 Message-Id: <1454076396-3563101-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:yiy5KLu9UmDMBzxWRMVpgOg4Zz5R8Og8mXhFPLdSlWzO2+8uZ8C +tv48cV70rn/BHVYvNHAWrFyMG2T9PvfKpb6TH590XuUBvtosOTln5lDlc6IkmrW4inaZUC JcmFfZdOy6KH5OZPnDy5Gh82KMM059iHZzceULgNQN2lwkWAhnk5gNyaZkLniXJxMBtWDwK 1gXXJEkW88vnk6yIrNJFg== X-UI-Out-Filterresults: notjunk:1; V01:K0:zsOrWp3AgJ4=:4C2fc0Q/74hZXxEGaKWdCN yts9083oUkUz4wwcV6tpcy5D37gixn6ugVyFZD0trkylidS+8kgPxgJvv1+HZ3Ne/HXDIj4Vg ol+d+hDUhdvHyBMpJ57qcZKgI21Ug1DheZgPgdjtJFMYZ0zuncEBPxGavINPgII2ZfDnrGHgM eB22jwP6FlgazsAz5FrRwJUpl9PAJKS4Tia+buqF4FrFrsk0QoIOsJ/fv6uc8X4yrH2AFS6l5 pzpfqXuMwHUoYEx8RspuHBbbN8h/vzkFQr1Vt9dJvG6dsYU8y1LMz6AhsY7p0fd6qUgN+ViKa xQYoZUQ7kD7J2C/nBJlHNyEZjbI2RWVe36JPL2igV17BS44ymV9/R35zl/cHez4cWeSbwGjWU RJVWEtkKZG8/f4MIkR8VwmERAlbt2imncx3LrEw7m2kUGZzirp0CALUHtHjZ00Ppbm4IcBaHk jHcBLBa8KwV49TRG1suib5kzsKc/Ibepv6xgdwMNs8mtnAX3u59g6MPAQxQ2fHrBUV3ABUPwu /rG9mQPdW6f1fU0WiYDCIYpVCcNbgTJZh1Jujp5G0n5cFugZKi0oaMPyZPHy3HoYOwwtiGBS8 D7sh0fdBCfcz0SNc+ozT2ofH2L49ggYIKndh+MPOw05ejs8XZTbpq4Va/MMbuH0LPeQmQoCy8 x8b8TPiMMFLEYf48ui/8WRbOboGZeNiokiB29/hcLtcOEaVfcjfUmBJASQ2jee6oAZr4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org GPIO_SYSFS is a common kernel functionality, not something that a board specific Kconfig should have to worry about. In MIOA701, we get a warning about the select when CONFIG_SYSFS is disabled: warning: (MACH_MIOA701) selects GPIO_SYSFS which has unmet direct dependencies (GPIOLIB && SYSFS) This just removes the select and instead enables the symbol in the defconfig file. Signed-off-by: Arnd Bergmann --- arch/arm/configs/pxa_defconfig | 1 + arch/arm/mach-pxa/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 0cb724b5c639..dc5517eaf09f 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -378,6 +378,7 @@ CONFIG_GPIO_PALMAS=y CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY_DEBUG=y CONFIG_PDA_POWER=m CONFIG_BATTERY_SBS=m diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index f09683687963..01066cff16e4 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -297,7 +297,6 @@ config MACH_MAGICIAN config MACH_MIOA701 bool "Mitac Mio A701 Support" - select GPIO_SYSFS select IWMMXT select PXA27x help From patchwork Fri Jan 29 14:06:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101031 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139519lbb; Fri, 29 Jan 2016 06:08:27 -0800 (PST) X-Received: by 10.98.11.134 with SMTP id 6mr2157986pfl.109.1454076507681; Fri, 29 Jan 2016 06:08:27 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hg4si2447245pac.180.2016.01.29.06.08.27; Fri, 29 Jan 2016 06:08:27 -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 S932233AbcA2OIY (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:24 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:59340 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756377AbcA2OIT (ORCPT ); Fri, 29 Jan 2016 09:08:19 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MINbz-1aNF6Y46Gt-0049fw; Fri, 29 Jan 2016 15:07:50 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 5/9] ARM: pxa: always select one of the two CPU types Date: Fri, 29 Jan 2016 15:06:29 +0100 Message-Id: <1454076396-3563101-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:pahzufB/PnYCgFVCJcJPOh+PfYLAVeTA8nDh/svA/RshXD1YVri ADiLYAi6SeMmqn5f+VZ2CB6Q2aYqKwFDip4+Rbt98OJoq4W2wHhP5rOw2y6V2Akosi5aIdo UBMa6taneS+xBKS3q4AbAE9fHo/L7E3W1eSQPuZJFayo67x7cgosd7xgzMXIyuGGpzt+SGy j8h+EYnB6WMUUvQiBGToA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ssvcRrTZCaM=:xWFX5JvqeMJCWGDFFXMs85 qu7kiQLwsX/96NDMZXi4sQMRLU7fr6O1QvPLU4z+bzT8mtR3fMDqqkpVIdoI56fv6bfTQZvRy /mBDXKXyHnQCpdfD5m5iUqLM3Bp8RVZsDidszcMytGZe/h0UpGkxMZbNvaUv6iu43eAiro+Gu FK75+v6tGkAYv7FGQeZFPHM4eof0i/G30eg5ozMXkf9gCQeWjhMmjHLwJ9iQr46YXHnbB2WJx Zs3DDYSo7XBtk0C2B0ZixFX6UQPyua0/RG9qareCOATUCeT/gq2KvwHxR+hmc9ZnYK12oojWv VAg4KibZPHEhKyDyn3KC791GC5VDMAiJd6FNLavnaCLuCl3v/CyO3enW6clJ7vwEJ4eghQ3/z NgX6ZlIxlVvN2kbdNQAG9+5gg94cfYRSITq52CpbEUPZHfmP8cUJ1jcQuOrAAS21HN848coFf lYlg2WTo81oMk+uV0T4qKY2pNDgXp+7dU26/wXyVEsp+hCLRL3oopEs1T+UCjLUv3D3i9481k Hw9YrS3SzcLFdu7I8rbB711AhvPuuubjGUCg7PsWLkQvE5TFYeBLAtH4DXXxd6EvjrF2+Fdxj LU3JxwJoFUjl9hl+AIEN9UIFSMy7zo01pt11G1027Cug2QRsCdbL+ilLJgdt1mG/DsBrcrCQ8 mV75S5B3R404l1HwjzmYkub2dU0LZ3AWtsJUmrOIeMRmIjU4JUah2UNOqaWcC937Tek4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When all boards are disabled on PXA, we cannot build a kernel because no CPU gets selected: arch/arm/include/uapi/asm/swab.h:26:29: error: "__LINUX_ARM_ARCH__" is not defined [-Werror=undef] This is a bit annoying for compile-testing, so I'm adding a line that ensures that at all times, at least one of CPU_XSCALE or CPU_XSC3 is set and we can at least continue building. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.7.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7e1aac8bdf84..1d2b5e6cab14 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -564,6 +564,7 @@ config ARCH_PXA select CLKSRC_PXA select CLKSRC_MMIO select CLKSRC_OF + select CPU_XSCALE if !CPU_XSC3 select GENERIC_CLOCKEVENTS select GPIO_PXA select HAVE_IDE From patchwork Fri Jan 29 14:06:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101030 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139630lbb; Fri, 29 Jan 2016 06:08:38 -0800 (PST) X-Received: by 10.98.12.29 with SMTP id u29mr13421715pfi.116.1454076518208; Fri, 29 Jan 2016 06:08:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z5si24515647pfi.34.2016.01.29.06.08.37; Fri, 29 Jan 2016 06:08:38 -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 S932362AbcA2OIb (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:31 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51343 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932240AbcA2OI1 (ORCPT ); Fri, 29 Jan 2016 09:08:27 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lx7w9-1a0i3u2igj-016iss; Fri, 29 Jan 2016 15:07:55 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 6/9] ARM: pxa: move extern declarations to pm.h Date: Fri, 29 Jan 2016 15:06:30 +0100 Message-Id: <1454076396-3563101-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:kFn9IG9Nbr6k4ezrgvazynO16zomLfJUGGYxFySHUR6ygYNVPrl Gi16+OrarUd8OGNcSfCTPDaAKzTO+ZEBUgQVrrva0eK2mUqVUbTqBPu9Sp/36r/QYSY72Ci O8t0wLWRuMX3iX4QkUvqtHiW2q2qX/qtiS218VWMFxGVyIzctTzN/kxjbbZc7ErchX2YgKD yGizpae447NJ3tFtwPYzA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ISgZp+Ngz4A=:mbdlSVJaHszmqDnN8deOdk caPLwkOQu8VHGiqmVOwCL4c+jsB90KS+HSXSnqhc9SbBGaksi5I5z5tgNd3BYNfFlAvCYQbJo 6IACeJGUBR+Kk6BthrTS+otSIFK1Rr453nLUk6aBDT28ZjA/XMnrr4FyvFAo+DhHa4jDH86eb lKWQqXiF5/trRR16tV6Pxyp+eG3ELNkUsX65evBslxc3+B95xsN1cXdye231Qi+Pk60PGboyz YOJ+MAupVgr9T2JfqA2rwp7RLNPxC1eisrYhCxBDOiy4QBS2migNP8NA+FI6e8anv4z1HF1r8 jy0DFbkNWfaCwHnA6y2ngM2TDnZplzploMln9aC+NvKaHD00OAjl3w11WZpekacQmtat9pGg5 MEzOEtOcd4p6Xqgi4U2Q/Y9Z/I+fTYLkgdGLQvGhkX0GcVaIi3eL6Nkw+tLEF4RhxjxTF25kY ZdMmYpYpJ97L+nzZBdmZwPZfh/RwDej5ua+CxfpEqZ9xemYGU0z872TPoGgZ7JkMUR0p4P6YC sxw49uFSL8rXdcnejWxnzoMXA3mTJjXjyS4otteYbk02MnYtD9/DdOUN5xFUXaFYdjM4D69pw snc8HI7ky7K+ynMFwVQUboDNZFtcbDKRwSTIpspIOMklIzxVM1S17aQdf4yimy8UtjQgV3epS j9pfzOYyWOepDc1nmfYggppx6d5ptS9d+Z1EG4+9qTIpI1VKdOjX/e/ibaDzn7kFAu2Q= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_IWMMXT is disabled, we get a warning in pxa3xx.c: arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_cpu_pm_suspend': arch/arm/mach-pxa/pxa3xx.c:109:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] It turns out that there is an 'extern' declaration in the middle of a function. For consistency, this moves the declaration and two others from the same file into pm.h. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/pm.h | 3 +++ arch/arm/mach-pxa/pxa3xx.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/pm.h b/arch/arm/mach-pxa/pm.h index 51558bcee999..3aab90d8d2b7 100644 --- a/arch/arm/mach-pxa/pm.h +++ b/arch/arm/mach-pxa/pm.h @@ -29,6 +29,9 @@ extern int pxa_pm_enter(suspend_state_t state); extern int pxa_pm_prepare(void); extern void pxa_pm_finish(void); +extern const char pm_enter_standby_start[], pm_enter_standby_end[]; +extern int pxa3xx_finish_suspend(unsigned long); + /* NOTE: this is for PM debugging on Lubbock, it's really a big * ugly, but let's keep the crap minimum here, instead of direct * accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index a1c4c888f246..1ba62be65f7c 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -68,7 +68,6 @@ static unsigned long wakeup_src; */ static void pxa3xx_cpu_standby(unsigned int pwrmode) { - extern const char pm_enter_standby_start[], pm_enter_standby_end[]; void (*fn)(unsigned int) = (void __force *)(sram + 0x8000); memcpy_toio(sram + 0x8000, pm_enter_standby_start, @@ -106,8 +105,6 @@ static void pxa3xx_cpu_pm_suspend(void) asm volatile("mra %Q0, %R0, acc0" : "=r" (acc0)); #endif - extern int pxa3xx_finish_suspend(unsigned long); - /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */ CKENA |= (1 << CKEN_BOOT) | (1 << CKEN_TPM); CKENB |= 1 << (CKEN_HSIO2 & 0x1f); From patchwork Fri Jan 29 14:06:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101027 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139956lbb; Fri, 29 Jan 2016 06:09:09 -0800 (PST) X-Received: by 10.98.1.21 with SMTP id 21mr13748264pfb.8.1454076548881; Fri, 29 Jan 2016 06:09:08 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f88si22267891pfj.136.2016.01.29.06.09.08; Fri, 29 Jan 2016 06:09:08 -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 S932531AbcA2OI7 (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:59 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:59623 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756270AbcA2OIX (ORCPT ); Fri, 29 Jan 2016 09:08:23 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MLOoU-1aObU53kDy-000ZAf; Fri, 29 Jan 2016 15:07:59 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 7/9] ARM: pxa: fix building without IWMMXT Date: Fri, 29 Jan 2016 15:06:31 +0100 Message-Id: <1454076396-3563101-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:WJfunlTmaCzmrGs67RBQozHWZTLO+OkHZgftuENK8LxfVCucsH7 l3/oei8T5crN2ku3rhOI5MUFQ2zV1JqFK8j0F/b7O+ixGQpm1jbm1KzpejQzjjXnxXd1vW2 LK8OkuOM+RffjR7eXwmtPNq/pGNAo6O1goqFkgH+klJE2i6V5PGeM+m+u4fkNm8SEKWxBd6 qDjdFNseAU8/jt8x35xPQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:MEBmdr3auMM=:qcnhDEJhDXbBYgbLivJ4Bi uThdQkjqEpm/Kn7qrKLDy25CdpHdB9HUIne2g/pDWx8kME2gO8WhfQ6A49eSyR/YihN6wgKTq Aup5CJFJ6uz616XXC1TkUmuKcuW2GncoDLvxGg4OYliikBzxdxBX2AIuxQ5gHymgZHMP8Zqb9 79zyDgpP67mM+62Qy5Yt1BY+4ClWuYGqpbG3pd9VahujhlY9+rNuIV/dvbi8Pf51UThKcn8+f HqZ85ypQsff4BG0PPC37PfWZFbrZgXbzualTqWM7AIWsEKJGmn/kMLMB/CvBT29IDDLq7lNES 73pc+gCzGtK313C1yB7PSW4qiXZ5Rt/EDo0ejJfWBtAj/aQlNuVfQ9YV8Vkpgo3D3SZUjQlHN 7PeA7kOuXTIvubpqlZynHc1dCH2m5x9T+Us8QjNGcuJQFbCw8fMr1pzq7kXb4rhAZoPPOsmv3 6ylaoqSU5tXB+6KgJadIHqAbr0gAVsjvzO0eVZ4fhkW2ZFdO1hn6+K+EqfyXl0B0Z8/ts75rz T7n5Oup+j2q1hL198vNMEgO/6paaPKzyD5RQoSUFKZKFP503cSgqyfy0rBqrMb62Fvs3N+AUi UFJ6aXjOqE3OgBbMUGt8mffKWkQuSSF09DVGEeAOBjWFumjNS9/ry/70mWQGvp1Lja0gaCDTi 2Qbuo5gHI0YED0bOkhaMXJLTx8gnsziuB34pTlWSahGRJ46VXAXwAeQmYOiAqRxHln2I= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_IWMMXT, the pxa3xx and pxa27x suspend/resume code emits some xscale specific instructions, which are rejected by the assembler, because gcc is built with -march=armv5 -mtune=xscale and passes that option to the assembler: /tmp/cciHumzr.s:553: Error: selected processor does not support ARM mode `mra r2,r3,acc0' /tmp/cciHumzr.s:605: Error: selected processor does not support ARM mode `mar acc0,r2,r3' make[3]: *** [arch/arm/mach-pxa/pxa3xx.o] Error 1 /tmp/cci5MUNu.s:326: Error: selected processor does not support ARM mode `mra r2,r3,acc0' /tmp/cci5MUNu.s:367: Error: selected processor does not support ARM mode `mar acc0,r2,r3' make[3]: *** [arch/arm/mach-pxa/pxa27x.o] Error 1 Overriding with -Wa,-march=xscale no longer works, so instead I'm adding an explict ".arch_extension" directive in all four inline assembly statements, which should work even if they end up in a different order in the assembly output. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/pxa27x.c | 6 ++++-- arch/arm/mach-pxa/pxa3xx.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 8dfd1755c659..49c735962148 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -132,7 +132,8 @@ void pxa27x_cpu_pm_enter(suspend_state_t state) #ifndef CONFIG_IWMMXT u64 acc0; - asm volatile("mra %Q0, %R0, acc0" : "=r" (acc0)); + asm volatile(".arch_extension xscale\n\t" + "mra %Q0, %R0, acc0" : "=r" (acc0)); #endif /* ensure voltage-change sequencer not initiated, which hangs */ @@ -151,7 +152,8 @@ void pxa27x_cpu_pm_enter(suspend_state_t state) case PM_SUSPEND_MEM: cpu_suspend(pwrmode, pxa27x_finish_suspend); #ifndef CONFIG_IWMMXT - asm volatile("mar acc0, %Q0, %R0" : "=r" (acc0)); + asm volatile(".arch_extension xscale\n\t" + "mar acc0, %Q0, %R0" : "=r" (acc0)); #endif break; } diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 1ba62be65f7c..126c265691f5 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -102,7 +102,8 @@ static void pxa3xx_cpu_pm_suspend(void) #ifndef CONFIG_IWMMXT u64 acc0; - asm volatile("mra %Q0, %R0, acc0" : "=r" (acc0)); + asm volatile(".arch_extension xscale\n\t" + "mra %Q0, %R0, acc0" : "=r" (acc0)); #endif /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */ @@ -130,7 +131,8 @@ static void pxa3xx_cpu_pm_suspend(void) AD3ER = 0; #ifndef CONFIG_IWMMXT - asm volatile("mar acc0, %Q0, %R0" : "=r" (acc0)); + asm volatile(".arch_extension xscale\n\t" + "mar acc0, %Q0, %R0" : "=r" (acc0)); #endif } From patchwork Fri Jan 29 14:06:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101028 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139880lbb; Fri, 29 Jan 2016 06:09:00 -0800 (PST) X-Received: by 10.98.33.131 with SMTP id o3mr2352584pfj.97.1454076540748; Fri, 29 Jan 2016 06:09:00 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pw5si2432349pab.18.2016.01.29.06.09.00; Fri, 29 Jan 2016 06:09:00 -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 S932471AbcA2OI6 (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:58 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:53136 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932242AbcA2OIa (ORCPT ); Fri, 29 Jan 2016 09:08:30 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MV5B7-1aasE21nFV-00YUWs; Fri, 29 Jan 2016 15:08:03 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: [PATCH 8/9] ARM: pxa: don't select RFKILL if CONFIG_NET is disabled Date: Fri, 29 Jan 2016 15:06:32 +0100 Message-Id: <1454076396-3563101-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:cCnJsLFtkDVWQSw7A4dhb1rqDVuUuFdinVgKcYdSuEAWiOSoK/A ntlSuZNgfwoL5SZFN+cWv9yEnCEsmhG71WQmM/evdA26oNIdXFbhT2v3JYtitUfDXMY9w2m YE/ydBXpn2SarGxutYeiJdrcpnMo1r3ONHwgYHdruHUqJ9Rlfp0voWbz2/QxbSNYkqpD/GJ iNjMJhLK1ps62RZwNbxHA== X-UI-Out-Filterresults: notjunk:1; V01:K0:3XGZFnMPhNM=:k8j3jgnhEcpPjqb1h7t6jy +cWYfnpfcmZ27K5E3zE8lu2rcb2j5QkmWikoZ1DQ32qHKVkAacoyjyBXYoofZeWmVJ/29UWw4 2wCsfs5ZZwc7e0AqrG8/XgHtLGUN0fbRZbBU8urDqK2Te+G9BNTQLtKLKCKDlDKlb4/7sW+hz BH2zNDvnWOo/K4AoT17Uloouxw5R1T+q70iyPMo6r4gMFUqfbnW8KYYCzqDRwpW7YzpvDOlkT 2OaGsGcbDlHyWVJzvoaFJkb6VbRh+IV4uw36iznQT8dMGgWBJPId0H46xBKMZppanYN6HRDi8 4xMaHtOEYe8sGZlbkjhxWVilbeEJThzkI/OKDt6gXponhMELSIdknrrvuzfcRgPvOgtWKPL5H CIyFegW9brInau0iwuEmlt0E2JO8hCbxtLEqwY98JKtP13jgH4F8OMecViKYUFFhuCn7DKCSk 7frF3JjoA0azFpXOhse6RBHnFOYFcrQIr8TNe7AXy8QioK3TBBcSyqkhYTyC4827v06/lzo/Q KchcKtYubQly1ukBXP0k8KuMORU74Nd0obMV2tO+nTgiwzboHt3eXwALeUR/aZC/FkwVJMcZK Z2iBmHSilia6dMV6BMdV1eeJ7at444iIYJdH9Cd3LmiDgGrcTKZx6AcPXKlyPpc8eobqODZOk HlI7OMaBI/yXRPRXQu4DdYaCljv6kpwm1Gx4ClwN+1+ot5px5A1KoUk43fU9zHK1M840= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bluetooth is only supported when network support is part of the kernel, so it is a bit pointless to build the tosa-bt support without networking. If we try anyway, we get a Kconfig warning: warning: (TOSA_BT && H1940BT) selects RFKILL which has unmet direct dependencies (NET) This adds a dependency on CONFIG_NET to avoid that case. Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 01066cff16e4..7ee4652b4c61 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -528,7 +528,7 @@ config MACH_TOSA config TOSA_BT tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" - depends on MACH_TOSA + depends on MACH_TOSA && NET select RFKILL help This is a simple driver that is able to control From patchwork Fri Jan 29 14:06:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101029 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1139693lbb; Fri, 29 Jan 2016 06:08:44 -0800 (PST) X-Received: by 10.98.68.220 with SMTP id m89mr13556599pfi.65.1454076524537; Fri, 29 Jan 2016 06:08:44 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z26si24532268pfa.30.2016.01.29.06.08.44; Fri, 29 Jan 2016 06:08:44 -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 S932432AbcA2OIi (ORCPT + 30 others); Fri, 29 Jan 2016 09:08:38 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:56422 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932363AbcA2OIe (ORCPT ); Fri, 29 Jan 2016 09:08:34 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MLyNI-1aSS2e0tkS-007iJj; Fri, 29 Jan 2016 15:08:08 +0100 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Haojian Zhuang , Daniel Mack , Eric Miao , linux-kernel@vger.kernel.org Subject: [PATCH 9/9] ARM: mmp: mark usb_dma_mask as __maybe_unused Date: Fri, 29 Jan 2016 15:06:33 +0100 Message-Id: <1454076396-3563101-10-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454076396-3563101-1-git-send-email-arnd@arndb.de> References: <1454076396-3563101-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:W30bAQfQ2D/dyVyj4WEWMcOGlNSEO1qwFbfvQ7Ogf6K2vRsbOxv 6rZCDpkYtAl/KYwwC/k/x9k75UvDsCsv6+qR+Rc3mdjuJuYnFpSh7yfzbQs2GlEtqVj4O83 JrU2pnCtOeXrwsy3LAcjYnyG09APpVZL4gCvi6nSmbE4VTsT3qbXT5tclR0XJ614u0xR+ZC qG++kwOmCytM5H80bJaLA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Psh/xgCGpsY=:2XRuR67UKCR7CVkXxc0T+a nlR6SSuzAxfbqMfhmIez4sXMNnLNJyqpfY1hByLK1hZo3ard6ubG4KBeJRRVA3nVeXwr5aRHX UR6Z20t6hu7iH+mMBU70G1Tbj501Y3VkBXt72uuWPNSBJ/cGOCR8+OoeDeIEsJJkyQnM1t6QE gm2qtPB4GJ5CDrYZCI+wbtGJ0C8ApOXJ/FXySOE9cFA/dlkG4XXj6UueHYGXqwn5B5T3aWlng 8XhM8KU2+TzV6rkptN9MSNlyqOVFm3+/eDW7fl/aU8N0YKj3bhOkbgmCAOiezp2YZ3VHJ1bJQ lJQMRNp5PzxjUKTGuaqMWpgrqdkRK2jW+MkoxevGg1nVJsdfTACzlx1viMhHM49hODq3E6sgD jg49Qriat12r9dEykCi9zis+l2QrFB4mVdMkcO7YJ0A1VX8LB3+9deSq7MJje0XoS/8vftpCs o7MVf+7mu6P5HcKtZnJxvUuemkkjadlT2vbtFeuEfgjUf7DluthjbYn01XMKtrsQGsW3cEdCM BRIn/HByMx3ZY6nmUCECf1/jEnulITl4Iy18ViDDsra/dBz9LfytlRdl6MDdStGYkHG2doshs tNvz7WAzhi909rEaf5cM5J+KhfSLU6HDnV8w+icbzQqewLPjgKHpRUmxnwS2C76WQ75oYnsVB UWE7LdUWVCPL/BwTiwKdKL5Y9EAL9No+Zi4umFEV6tH9qv/JUET/VzMhDNdRNV0xF8wI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This variable may be used by some devices that each have their on Kconfig symbol, or by none of them, and that causes a build warning: arch/arm/mach-mmp/devices.c:241:12: error: 'usb_dma_mask' defined but not used [-Werror=unused-variable] Marking it __maybe_unused avoids the warning. Signed-off-by: Arnd Bergmann --- arch/arm/mach-mmp/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c index 3330ac7cfbef..671c7a09ab3d 100644 --- a/arch/arm/mach-mmp/devices.c +++ b/arch/arm/mach-mmp/devices.c @@ -238,7 +238,7 @@ void pxa_usb_phy_deinit(void __iomem *phy_reg) #endif #if IS_ENABLED(CONFIG_USB_SUPPORT) -static u64 usb_dma_mask = ~(u32)0; +static u64 __maybe_unused usb_dma_mask = ~(u32)0; #if IS_ENABLED(CONFIG_USB_MV_UDC) struct resource pxa168_u2o_resources[] = {