[PATCH 0/9] linux-next ARM defconfig fixes

[PATCH 0/9] linux-next ARM defconfig fixes

[Arnd Bergmann]

I have tried building all ARM default configurations in
linux-next today, and found a number of obvious problems
that came in from somewhere other than the arm-soc tree
(I have a separate series for those).

Here are the fixes I came up with. Please apply or merge
into the original patch that broke them, or find a different
fix that solves the problem.

Arnd Bergmann (9):
  ARM: sa1100/assabet: include platform_device.h directly
  fb/exynos: include platform_device.h
  clk: sunxi: remove stale Makefile entry
  mfd: max8925: fix trivial build warning for non-dt
  ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused
  drm/pci: move drm_pcie_get_speed_cap_mask inside #ifdef CONFIG_PCI
  ARM defconfigs: add missing inclusions of linux/platform_device.h
  [media] s5p-fimc: fix s5pv210 build
  thermal: rcar: remove __devinitconst

Cc: Dave Airlie <airlied@redhat.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Zhang Rui <rui.zhang@intel.com>


 arch/arm/mach-s5pv210/mach-goni.c               |  2 +-
 arch/arm/mach-sa1100/assabet.c                  |  1 +
 arch/arm/mach-shmobile/board-mackerel.c         |  2 +-
 arch/arm/plat-samsung/include/plat/adc.h        |  1 +
 drivers/clk/Makefile                            |  1 -
 drivers/gpu/drm/drm_pci.c                       | 75 ++++++++++++-------------
 drivers/thermal/rcar_thermal.c                  |  2 +-
 drivers/video/backlight/max8925_bl.c            |  6 +-
 drivers/video/clps711xfb.c                      |  1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c   |  1 +
 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c |  1 +
 drivers/video/mmp/fb/mmpfb.c                    |  1 +
 include/linux/platform_data/s3c-hsotg.h         |  2 +
 13 files changed, 49 insertions(+), 47 deletions(-)

-- 
1.8.1.2

[PATCH 1/9] ARM: sa1100/assabet: include platform_device.h directly

[Arnd Bergmann]

Patch "16559ae kgdb: remove #include <linux/serial_8250.h> from kgdb.h
caused assabet_defconfig to fail, since assabet.c did not
itself include linux/platform_device.h, although it needs it:

In file included from include/linux/mfd/ucb1x00.h:13:0,
                 from arch/arm/mach-sa1100/assabet.c:19:
include/linux/mfd/mcp.h:22:16: error: field 'attached_device' has incomplete type
include/linux/mfd/mcp.h:48:23: error: field 'drv' has incomplete type
In file included from arch/arm/mach-sa1100/assabet.c:19:0:
include/linux/mfd/ucb1x00.h:137:16: error: field 'dev' has incomplete type
arch/arm/mach-sa1100/assabet.c: In function 'assabet_init':
arch/arm/mach-sa1100/assabet.c:343:3: error: implicit declaration of function 'platform_device_register_simple' [-Wimplicit-function-declaration]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/arm/mach-sa1100/assabet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index b38d252..e838ba2 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -16,6 +16,7 @@
 #include <linux/ioport.h>
 #include <linux/platform_data/sa11x0-serial.h>
 #include <linux/serial_core.h>
+#include <linux/platform_device.h>
 #include <linux/mfd/ucb1x00.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-- 
1.8.1.2

[PATCH 2/9] fb/exynos: include platform_device.h

[Arnd Bergmann]

Patch 16559ae "kgdb: remove #include <linux/serial_8250.h> from kgdb.h"
removed an implicit inclusion of linux/platform_device.h
from the exynos framebuffer driver. This adds back the required
explicit header file inclusions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ajay Kumar <ajaykumar.rs@samsung.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---
 drivers/video/exynos/exynos_mipi_dsi_common.c   | 1 +
 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 3cd29a4..c70cb89 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <linux/memory.h>
 #include <linux/delay.h>
+#include <linux/irqreturn.h>
 #include <linux/kthread.h>
 
 #include <video/mipi_display.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
index 0ef38ce..95cb99a 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/ctype.h>
+#include <linux/platform_device.h>
 #include <linux/io.h>
 
 #include <video/exynos_mipi_dsim.h>
-- 
1.8.1.2

[PATCH 3/9] clk: sunxi: remove stale Makefile entry

[Arnd Bergmann]

Patch 85a18198 "clk: sunxi: Use common of_clk_init() function"
removed the clk-sunxi.c file but left the Makefile entry, which
causes a build error in multi_v7_defconfig:

make[4]: *** No rule to make target `drivers/clk/clk-sunxi.o', needed by `drivers/clk/built-in.o'.

The obvious fix is to remove the extraneous line from the
Makefile.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Prashant Gaikwad <pgaikwad@nvidia.com>
Cc: Maxime Ripard <maxime.ripard@anandra.org>
Cc: Mike Turquette <mturquette@linaro.org>
---
 drivers/clk/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index ce77077..be9392e 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -25,7 +25,6 @@ endif
 obj-$(CONFIG_MACH_LOONGSON1)	+= clk-ls1x.o
 obj-$(CONFIG_ARCH_U8500)	+= ux500/
 obj-$(CONFIG_ARCH_VT8500)	+= clk-vt8500.o
-obj-$(CONFIG_ARCH_SUNXI)	+= clk-sunxi.o
 obj-$(CONFIG_ARCH_ZYNQ)		+= clk-zynq.o
 obj-$(CONFIG_X86)		+= x86/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
-- 
1.8.1.2

[PATCH 4/9] mfd: max8925: fix trivial build warning for non-dt

[Arnd Bergmann]

Patch fe527ea5a "mfd: max8925: Support dt for backlight"
added a new function for DT probing but introduced a
build warning for the case where CONFIG_OF is disabled:

drivers/video/backlight/max8925_bl.c: In function 'max8925_backlight_probe':
drivers/video/backlight/max8925_bl.c:177:3: warning: statement with no effect [-Wunused-value]

A much nicer fix is to use the IS_ENABLED keyword to
have the same effect of dropping the device tree specific
function when it's not needed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Qing Xu <qingx@marvell.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
 drivers/video/backlight/max8925_bl.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 5ca11b0..9958fb1 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -101,14 +101,13 @@ static const struct backlight_ops max8925_backlight_ops = {
 	.get_brightness	= max8925_backlight_get_brightness,
 };
 
-#ifdef CONFIG_OF
 static int max8925_backlight_dt_init(struct platform_device *pdev,
 			      struct max8925_backlight_pdata *pdata)
 {
 	struct device_node *nproot = pdev->dev.parent->of_node, *np;
 	int dual_string;
 
-	if (!nproot)
+	if (!nproot || !IS_ENABLED(CONFIG_OF))
 		return -ENODEV;
 	np = of_find_node_by_name(nproot, "backlight");
 	if (!np) {
@@ -120,9 +119,6 @@ static int max8925_backlight_dt_init(struct platform_device *pdev,
 	pdata->dual_string = dual_string;
 	return 0;
 }
-#else
-#define max8925_backlight_dt_init(x, y)	(-1)
-#endif
 
 static int max8925_backlight_probe(struct platform_device *pdev)
 {
-- 
1.8.1.2

[PATCH 5/9] ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused

[Arnd Bergmann]

Patch eac036ef9e "ARM: shmobile: streamline mackerel SD and MMC devices"
made the use of the sh_mmcif_device variable for mackarel optional,
but the definition is always provided, causing a build warning.

arch/arm/mach-shmobile/board-mackerel.c:1120:31: warning: 'sh_mmcif_device'
	defined but not used [-Wunused-variable]

Marking the variable as __maybe_unused will do the right thing here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-mackerel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0c78207..1de898f 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1117,7 +1117,7 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
 	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,
 };
 
-static struct platform_device sh_mmcif_device = {
+static struct platform_device sh_mmcif_device __maybe_unused = {
 	.name		= "sh_mmcif",
 	.id		= 0,
 	.dev		= {
-- 
1.8.1.2

[PATCH 6/9] drm/pci: move drm_pcie_get_speed_cap_mask inside #ifdef CONFIG_PCI

[Arnd Bergmann]

commit dd66cc2e1  "drm/pci: Use PCI Express Capability accessors"
introduced the use of the pcie_capability_read_dword function
in the drm_pci code, which is only defined when PCI is enabled.
While most of the file is already hidden away behind an #ifdef
CONFIG_PCI, this function is not, and that now causes a link
error in the ARM imx_v6_v7_defconfig configuration.

Moving the function into the #ifdef section makes this work
again on IMX, which does not have PCI support, and should
have no impact on platforms that do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/drm_pci.c | 75 +++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 86102a0..9c408e0 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -388,6 +388,43 @@ err_g1:
 }
 EXPORT_SYMBOL(drm_get_pci_dev);
 
+int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
+{
+	struct pci_dev *root;
+	u32 lnkcap, lnkcap2;
+
+	*mask = 0;
+	if (!dev->pdev)
+		return -EINVAL;
+
+	root = dev->pdev->bus->self;
+
+	/* we've been informed via and serverworks don't make the cut */
+	if (root->vendor == PCI_VENDOR_ID_VIA ||
+	    root->vendor == PCI_VENDOR_ID_SERVERWORKS)
+		return -EINVAL;
+
+	pcie_capability_read_dword(root, PCI_EXP_LNKCAP, &lnkcap);
+	pcie_capability_read_dword(root, PCI_EXP_LNKCAP2, &lnkcap2);
+
+	if (lnkcap2) {	/* PCIe r3.0-compliant */
+		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_2_5GB)
+			*mask |= DRM_PCIE_SPEED_25;
+		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_5_0GB)
+			*mask |= DRM_PCIE_SPEED_50;
+		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
+			*mask |= DRM_PCIE_SPEED_80;
+	} else {	/* pre-r3.0 */
+		if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
+			*mask |= DRM_PCIE_SPEED_25;
+		if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
+			*mask |= (DRM_PCIE_SPEED_25 | DRM_PCIE_SPEED_50);
+	}
+
+	DRM_INFO("probing gen 2 caps for device %x:%x = %x/%x\n", root->vendor, root->device, lnkcap, lnkcap2);
+	return 0;
+}
+EXPORT_SYMBOL(drm_pcie_get_speed_cap_mask);
 /**
  * PCI device initialization. Called direct from modules at load time.
  *
@@ -465,41 +502,3 @@ void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
 	DRM_INFO("Module unloaded\n");
 }
 EXPORT_SYMBOL(drm_pci_exit);
-
-int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
-{
-	struct pci_dev *root;
-	u32 lnkcap, lnkcap2;
-
-	*mask = 0;
-	if (!dev->pdev)
-		return -EINVAL;
-
-	root = dev->pdev->bus->self;
-
-	/* we've been informed via and serverworks don't make the cut */
-	if (root->vendor == PCI_VENDOR_ID_VIA ||
-	    root->vendor == PCI_VENDOR_ID_SERVERWORKS)
-		return -EINVAL;
-
-	pcie_capability_read_dword(root, PCI_EXP_LNKCAP, &lnkcap);
-	pcie_capability_read_dword(root, PCI_EXP_LNKCAP2, &lnkcap2);
-
-	if (lnkcap2) {	/* PCIe r3.0-compliant */
-		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_2_5GB)
-			*mask |= DRM_PCIE_SPEED_25;
-		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_5_0GB)
-			*mask |= DRM_PCIE_SPEED_50;
-		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
-			*mask |= DRM_PCIE_SPEED_80;
-	} else {	/* pre-r3.0 */
-		if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
-			*mask |= DRM_PCIE_SPEED_25;
-		if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
-			*mask |= (DRM_PCIE_SPEED_25 | DRM_PCIE_SPEED_50);
-	}
-
-	DRM_INFO("probing gen 2 caps for device %x:%x = %x/%x\n", root->vendor, root->device, lnkcap, lnkcap2);
-	return 0;
-}
-EXPORT_SYMBOL(drm_pcie_get_speed_cap_mask);
-- 
1.8.1.2

[PATCH 7/9] ARM defconfigs: add missing inclusions of linux/platform_device.h

[Arnd Bergmann]

Patch 16559ae "kgdb: remove #include <linux/serial_8250.h> from kgdb.h"
removed an implicit inclusion of linux/platform_device.h
In a number of places. This adds back explicit inclusions in a few
more places I found.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---
 arch/arm/plat-samsung/include/plat/adc.h | 1 +
 drivers/video/clps711xfb.c               | 1 +
 drivers/video/mmp/fb/mmpfb.c             | 1 +
 include/linux/platform_data/s3c-hsotg.h  | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/arch/arm/plat-samsung/include/plat/adc.h b/arch/arm/plat-samsung/include/plat/adc.h
index b258a08..2fc8931 100644
--- a/arch/arm/plat-samsung/include/plat/adc.h
+++ b/arch/arm/plat-samsung/include/plat/adc.h
@@ -15,6 +15,7 @@
 #define __ASM_PLAT_ADC_H __FILE__
 
 struct s3c_adc_client;
+struct platform_device;
 
 extern int s3c_adc_start(struct s3c_adc_client *client,
 			 unsigned int channel, unsigned int nr_samples);
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 5a7af0d..f009806 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -26,6 +26,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
diff --git a/drivers/video/mmp/fb/mmpfb.c b/drivers/video/mmp/fb/mmpfb.c
index f34a3a9..6d1fa96 100644
--- a/drivers/video/mmp/fb/mmpfb.c
+++ b/drivers/video/mmp/fb/mmpfb.c
@@ -21,6 +21,7 @@
  */
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 #include "mmpfb.h"
 
 static int var_to_pixfmt(struct fb_var_screeninfo *var)
diff --git a/include/linux/platform_data/s3c-hsotg.h b/include/linux/platform_data/s3c-hsotg.h
index 8b79e09..3f1cbf9 100644
--- a/include/linux/platform_data/s3c-hsotg.h
+++ b/include/linux/platform_data/s3c-hsotg.h
@@ -15,6 +15,8 @@
 #ifndef __LINUX_USB_S3C_HSOTG_H
 #define __LINUX_USB_S3C_HSOTG_H
 
+struct platform_device;
+
 enum s3c_hsotg_dmamode {
 	S3C_HSOTG_DMA_NONE,	/* do not use DMA at-all */
 	S3C_HSOTG_DMA_ONLY,	/* always use DMA */
-- 
1.8.1.2

[PATCH 8/9] [media] s5p-fimc: fix s5pv210 build

[Arnd Bergmann]

56bc911 "[media] s5p-fimc: Redefine platform data structure for fimc-is"
changed the bus_type member of struct fimc_source_info treewide, but
got one instance wrong in mach-s5pv210, which was evidently not
even build tested.

This adds the missing change to get s5pv210_defconfig to build again.
Applies on the Mauro's media tree.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 arch/arm/mach-s5pv210/mach-goni.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 3a38f7b..e373de4 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -845,7 +845,7 @@ static struct fimc_source_info goni_camera_sensors[] = {
 		.mux_id		= 0,
 		.flags		= V4L2_MBUS_PCLK_SAMPLE_FALLING |
 				  V4L2_MBUS_VSYNC_ACTIVE_LOW,
-		.bus_type	= FIMC_BUS_TYPE_ITU_601,
+		.fimc_bus_type	= FIMC_BUS_TYPE_ITU_601,
 		.board_info	= &noon010pc30_board_info,
 		.i2c_bus_num	= 0,
 		.clk_frequency	= 16000000UL,
-- 
1.8.1.2

[PATCH 9/9] thermal: rcar: remove __devinitconst

[Arnd Bergmann]

commit 76cc18874 "thermal: rcar: add Device Tree support"
added device tree support for this driver, but also added
an instance of __devinitconst, which is no longer defined

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Zhang Rui <rui.zhang@intel.com>
---
 drivers/thermal/rcar_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 909bb4b..28f0919 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -476,7 +476,7 @@ static int rcar_thermal_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id rcar_thermal_dt_ids[] __devinitconst = {
+static const struct of_device_id rcar_thermal_dt_ids[] = {
 	{ .compatible = "renesas,rcar-thermal", },
 	{},
 };
-- 
1.8.1.2

[PATCH 6/9] drm/pci: move drm_pcie_get_speed_cap_mask inside #ifdef CONFIG_PCI

[Fabio Estevam]

On Thu, Feb 14, 2013 at 8:26 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> commit dd66cc2e1  "drm/pci: Use PCI Express Capability accessors"
> introduced the use of the pcie_capability_read_dword function
> in the drm_pci code, which is only defined when PCI is enabled.
> While most of the file is already hidden away behind an #ifdef
> CONFIG_PCI, this function is not, and that now causes a link
> error in the ARM imx_v6_v7_defconfig configuration.
>
> Moving the function into the #ifdef section makes this work
> again on IMX, which does not have PCI support, and should
> have no impact on platforms that do.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Dave Airlie <airlied@redhat.com>

Bjorn has already sent a fix for this problem:
http://www.spinics.net/lists/arm-kernel/msg224425.html

[PATCH 6/9] drm/pci: move drm_pcie_get_speed_cap_mask inside #ifdef CONFIG_PCI

[Arnd Bergmann]

On Thursday 14 February 2013, Fabio Estevam wrote:
> Bjorn has already sent a fix for this problem:
> http://www.spinics.net/lists/arm-kernel/msg224425.html

Ok, excellent.

The result seems to be identical, although patch is formatted
differently.

Acked-by: Arnd Bergmann <arnd@arndb.de>

for Bjorn's patch.

[PATCH 7/9] ARM defconfigs: add missing inclusions of linux/platform_device.h

[Greg Kroah-Hartman]

On Thu, Feb 14, 2013 at 11:26:56PM +0100, Arnd Bergmann wrote:
> Patch 16559ae "kgdb: remove #include <linux/serial_8250.h> from kgdb.h"
> removed an implicit inclusion of linux/platform_device.h
> In a number of places. This adds back explicit inclusions in a few
> more places I found.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> ---
>  arch/arm/plat-samsung/include/plat/adc.h | 1 +
>  drivers/video/clps711xfb.c               | 1 +
>  drivers/video/mmp/fb/mmpfb.c             | 1 +

This file isn't my tty tree, so I can't apply that part of the patch,
but I've applied the rest of the patch, and the 2 others you sent me to
fix this issue.

thanks,

greg k-h

[PATCH 5/9] ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused

[Simon Horman]

On Thu, Feb 14, 2013 at 11:26:54PM +0100, Arnd Bergmann wrote:
> Patch eac036ef9e "ARM: shmobile: streamline mackerel SD and MMC devices"
> made the use of the sh_mmcif_device variable for mackarel optional,
> but the definition is always provided, causing a build warning.
> 
> arch/arm/mach-shmobile/board-mackerel.c:1120:31: warning: 'sh_mmcif_device'
> 	defined but not used [-Wunused-variable]
> 
> Marking the variable as __maybe_unused will do the right thing here.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Simon Horman <horms+renesas@verge.net.au>

No objections here.

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  arch/arm/mach-shmobile/board-mackerel.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
> index 0c78207..1de898f 100644
> --- a/arch/arm/mach-shmobile/board-mackerel.c
> +++ b/arch/arm/mach-shmobile/board-mackerel.c
> @@ -1117,7 +1117,7 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
>  	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,
>  };
>  
> -static struct platform_device sh_mmcif_device = {
> +static struct platform_device sh_mmcif_device __maybe_unused = {
>  	.name		= "sh_mmcif",
>  	.id		= 0,
>  	.dev		= {
> -- 
> 1.8.1.2
> 

[PATCH 4/9] mfd: max8925: fix trivial build warning for non-dt

[Haojian Zhuang]

On Fri, Feb 15, 2013 at 6:26 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> Patch fe527ea5a "mfd: max8925: Support dt for backlight"
> added a new function for DT probing but introduced a
> build warning for the case where CONFIG_OF is disabled:
>
> drivers/video/backlight/max8925_bl.c: In function 'max8925_backlight_probe':
> drivers/video/backlight/max8925_bl.c:177:3: warning: statement with no effect [-Wunused-value]
>
> A much nicer fix is to use the IS_ENABLED keyword to
> have the same effect of dropping the device tree specific
> function when it's not needed.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Qing Xu <qingx@marvell.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> ---
>  drivers/video/backlight/max8925_bl.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
> index 5ca11b0..9958fb1 100644
> --- a/drivers/video/backlight/max8925_bl.c
> +++ b/drivers/video/backlight/max8925_bl.c
> @@ -101,14 +101,13 @@ static const struct backlight_ops max8925_backlight_ops = {
>         .get_brightness = max8925_backlight_get_brightness,
>  };
>
> -#ifdef CONFIG_OF
>  static int max8925_backlight_dt_init(struct platform_device *pdev,
>                               struct max8925_backlight_pdata *pdata)
>  {
>         struct device_node *nproot = pdev->dev.parent->of_node, *np;
>         int dual_string;
>
> -       if (!nproot)
> +       if (!nproot || !IS_ENABLED(CONFIG_OF))
>                 return -ENODEV;
>         np = of_find_node_by_name(nproot, "backlight");
>         if (!np) {
> @@ -120,9 +119,6 @@ static int max8925_backlight_dt_init(struct platform_device *pdev,
>         pdata->dual_string = dual_string;
>         return 0;
>  }
> -#else
> -#define max8925_backlight_dt_init(x, y)        (-1)
> -#endif
>
>  static int max8925_backlight_probe(struct platform_device *pdev)
>  {
> --
> 1.8.1.2
>

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

[PATCH 4/9] mfd: max8925: fix trivial build warning for non-dt

[Qing Xu]

On 02/15/2013 06:26 AM, Arnd Bergmann wrote:
> Patch fe527ea5a "mfd: max8925: Support dt for backlight"
> added a new function for DT probing but introduced a
> build warning for the case where CONFIG_OF is disabled:
>
> drivers/video/backlight/max8925_bl.c: In function 'max8925_backlight_probe':
> drivers/video/backlight/max8925_bl.c:177:3: warning: statement with no effect [-Wunused-value]
>
> A much nicer fix is to use the IS_ENABLED keyword to
> have the same effect of dropping the device tree specific
> function when it's not needed.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Qing Xu <qingx@marvell.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> ---
>   drivers/video/backlight/max8925_bl.c | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
> index 5ca11b0..9958fb1 100644
> --- a/drivers/video/backlight/max8925_bl.c
> +++ b/drivers/video/backlight/max8925_bl.c
> @@ -101,14 +101,13 @@ static const struct backlight_ops max8925_backlight_ops = {
>   	.get_brightness	= max8925_backlight_get_brightness,
>   };
>   
> -#ifdef CONFIG_OF
>   static int max8925_backlight_dt_init(struct platform_device *pdev,
>   			      struct max8925_backlight_pdata *pdata)
>   {
>   	struct device_node *nproot = pdev->dev.parent->of_node, *np;
>   	int dual_string;
>   
> -	if (!nproot)
> +	if (!nproot || !IS_ENABLED(CONFIG_OF))
>   		return -ENODEV;
>   	np = of_find_node_by_name(nproot, "backlight");
>   	if (!np) {
> @@ -120,9 +119,6 @@ static int max8925_backlight_dt_init(struct platform_device *pdev,
>   	pdata->dual_string = dual_string;
>   	return 0;
>   }
> -#else
> -#define max8925_backlight_dt_init(x, y)	(-1)
> -#endif
>   
>   static int max8925_backlight_probe(struct platform_device *pdev)
>   {

thanks, I am ok with the change.

[PATCH 3/9] clk: sunxi: remove stale Makefile entry

[Mike Turquette]

Quoting Arnd Bergmann (2013-02-14 14:26:52)
> Patch 85a18198 "clk: sunxi: Use common of_clk_init() function"
> removed the clk-sunxi.c file but left the Makefile entry, which
> causes a build error in multi_v7_defconfig:
> 
> make[4]: *** No rule to make target `drivers/clk/clk-sunxi.o', needed by `drivers/clk/built-in.o'.
> 
> The obvious fix is to remove the extraneous line from the
> Makefile.
> 

The fix is correct.  I can't rebase my branch since there is an existing
dependency with the tegra tree, so I have taken this patch as-is with
the addition of my SoB.

Thanks,
Mike

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Prashant Gaikwad <pgaikwad@nvidia.com>
> Cc: Maxime Ripard <maxime.ripard@anandra.org>
> Cc: Mike Turquette <mturquette@linaro.org>
> ---
>  drivers/clk/Makefile | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index ce77077..be9392e 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -25,7 +25,6 @@ endif
>  obj-$(CONFIG_MACH_LOONGSON1)   += clk-ls1x.o
>  obj-$(CONFIG_ARCH_U8500)       += ux500/
>  obj-$(CONFIG_ARCH_VT8500)      += clk-vt8500.o
> -obj-$(CONFIG_ARCH_SUNXI)       += clk-sunxi.o
>  obj-$(CONFIG_ARCH_ZYNQ)                += clk-zynq.o
>  obj-$(CONFIG_X86)              += x86/
>  obj-$(CONFIG_ARCH_TEGRA)       += tegra/
> -- 
> 1.8.1.2

[PATCH 3/9] clk: sunxi: remove stale Makefile entry

[Arnd Bergmann]

On Friday 15 February 2013, Mike Turquette wrote:
> Quoting Arnd Bergmann (2013-02-14 14:26:52)
> > Patch 85a18198 "clk: sunxi: Use common of_clk_init() function"
> > removed the clk-sunxi.c file but left the Makefile entry, which
> > causes a build error in multi_v7_defconfig:
> > 
> > make[4]: *** No rule to make target `drivers/clk/clk-sunxi.o', needed by `drivers/clk/built-in.o'.
> > 
> > The obvious fix is to remove the extraneous line from the
> > Makefile.
> > 
> 
> The fix is correct.  I can't rebase my branch since there is an existing
> dependency with the tegra tree, so I have taken this patch as-is with
> the addition of my SoB.
> 

Ok, thanks!

	Arnd

[PATCH 5/9] ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused

[Arnd Bergmann]

On Thursday 14 February 2013, Simon Horman wrote:
> On Thu, Feb 14, 2013 at 11:26:54PM +0100, Arnd Bergmann wrote:
> > Patch eac036ef9e "ARM: shmobile: streamline mackerel SD and MMC devices"
> > made the use of the sh_mmcif_device variable for mackarel optional,
> > but the definition is always provided, causing a build warning.
> > 
> > arch/arm/mach-shmobile/board-mackerel.c:1120:31: warning: 'sh_mmcif_device'
> > 	defined but not used [-Wunused-variable]
> > 
> > Marking the variable as __maybe_unused will do the right thing here.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > Cc: Simon Horman <horms+renesas@verge.net.au>
> 
> No objections here.
> 
> Acked-by: Simon Horman <horms+renesas@verge.net.au>

AFAICT, the change that caused this is in linux-next only through your
heads/boards3 branch but not through arm-soc, so please apply my patch
on your branch.

	Arnd

[PATCH 5/9] ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused

[Simon Horman]

On Fri, Feb 15, 2013 at 12:55:06PM +0000, Arnd Bergmann wrote:
> On Thursday 14 February 2013, Simon Horman wrote:
> > On Thu, Feb 14, 2013 at 11:26:54PM +0100, Arnd Bergmann wrote:
> > > Patch eac036ef9e "ARM: shmobile: streamline mackerel SD and MMC devices"
> > > made the use of the sh_mmcif_device variable for mackarel optional,
> > > but the definition is always provided, causing a build warning.
> > > 
> > > arch/arm/mach-shmobile/board-mackerel.c:1120:31: warning: 'sh_mmcif_device'
> > > 	defined but not used [-Wunused-variable]
> > > 
> > > Marking the variable as __maybe_unused will do the right thing here.
> > > 
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > Cc: Simon Horman <horms+renesas@verge.net.au>
> > 
> > No objections here.
> > 
> > Acked-by: Simon Horman <horms+renesas@verge.net.au>
> 
> AFAICT, the change that caused this is in linux-next only through your
> heads/boards3 branch but not through arm-soc, so please apply my patch
> on your branch.

Sure, will do.

fb: mmp: include linux/platform_device.h

[Haojian Zhuang]

On Fri, Feb 15, 2013 at 10:16 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> Patch 16559ae "kgdb: remove #include <linux/serial_8250.h> from kgdb.h"
> changes the kgdb.h file so that drivers including it do not implicitly
> include linux/platform_device.h. The mmp framebuffer driver is new,
> so Greg did not have a chance to fix it up when introducing his change.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> On Thursday 14 February 2013, Greg Kroah-Hartman wrote:
>> On Thu, Feb 14, 2013 at 11:26:56PM +0100, Arnd Bergmann wrote:
>> > Patch 16559ae "kgdb: remove #include <linux/serial_8250.h> from kgdb.h"
>> > removed an implicit inclusion of linux/platform_device.h
>> > In a number of places. This adds back explicit inclusions in a few
>> > more places I found.
>>
>> >  drivers/video/mmp/fb/mmpfb.c             | 1 +
>>
>> This file isn't my tty tree, so I can't apply that part of the patch,
>> but I've applied the rest of the patch, and the 2 others you sent me to
>> fix this issue.
>
> Right. It seems the driver is only in Andrew's tree. Andrew, can you
> add this hunk on top?
>
> diff --git a/drivers/video/mmp/fb/mmpfb.c b/drivers/video/mmp/fb/mmpfb.c
> index f34a3a9..6d1fa96 100644
> --- a/drivers/video/mmp/fb/mmpfb.c
> +++ b/drivers/video/mmp/fb/mmpfb.c
> @@ -21,6 +21,7 @@
>   */
>  #include <linux/module.h>
>  #include <linux/dma-mapping.h>
> +#include <linux/platform_device.h>
>  #include "mmpfb.h"
>
>  static int var_to_pixfmt(struct fb_var_screeninfo *var)

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

[PATCH 9/9] thermal: rcar: remove __devinitconst

[Zhang Rui]

On Thu, 2013-02-14 at 23:26 +0100, Arnd Bergmann wrote:
> commit 76cc18874 "thermal: rcar: add Device Tree support"
> added device tree support for this driver, but also added
> an instance of __devinitconst, which is no longer defined
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Cc: Zhang Rui <rui.zhang@intel.com>

applied to thermal -next tree.

thanks,
rui
> ---
>  drivers/thermal/rcar_thermal.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
> index 909bb4b..28f0919 100644
> --- a/drivers/thermal/rcar_thermal.c
> +++ b/drivers/thermal/rcar_thermal.c
> @@ -476,7 +476,7 @@ static int rcar_thermal_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static const struct of_device_id rcar_thermal_dt_ids[] __devinitconst = {
> +static const struct of_device_id rcar_thermal_dt_ids[] = {
>  	{ .compatible = "renesas,rcar-thermal", },
>  	{},
>  };

[PATCH 4/9] mfd: max8925: fix trivial build warning for non-dt

[Arnd Bergmann]

On Thursday 14 February 2013, Arnd Bergmann wrote:
> Patch fe527ea5a "mfd: max8925: Support dt for backlight"
> added a new function for DT probing but introduced a
> build warning for the case where CONFIG_OF is disabled:
> 
> drivers/video/backlight/max8925_bl.c: In function 'max8925_backlight_probe':
> drivers/video/backlight/max8925_bl.c:177:3: warning: statement with no effect [-Wunused-value]
> 
> A much nicer fix is to use the IS_ENABLED keyword to
> have the same effect of dropping the device tree specific
> function when it's not needed.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Qing Xu <qingx@marvell.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Samuel Ortiz <sameo@linux.intel.com>

Hmm, it seems I already had this patch for the issue, but for some reason it
didn't apply for some time and when I looked at the problem again now, I found
more issues, and I'd suggest reverting commit fe527ea5a completely. There are
similar problems in the max8925_power patch.

	Arnd