Merge mainline/master into arm/fixes

[tomoyo/tomoyo-test1.git] / arch / arm / mach-pxa / icontrol.c

diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index 4517eb4..151e26e 100644 (file)
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -12,6 +12,7 @@
 
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
@@ -22,7 +23,6 @@
 
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
-#include <linux/can/platform/mcp251x.h>
 #include <linux/regulator/machine.h>
 
 #include "generic.h"
@@ -69,8 +69,9 @@ static struct pxa2xx_spi_chip mcp251x_chip_info4 = {
        .gpio_cs        = ICONTROL_MCP251x_nCS4
 };
 
-static struct mcp251x_platform_data mcp251x_info = {
-       .oscillator_frequency = 16E6,
+static const struct property_entry mcp251x_properties[] = {
+       PROPERTY_ENTRY_U32("clock-frequency", 16000000),
+       {}
 };
 
 static struct spi_board_info mcp251x_board_info[] = {
@@ -79,7 +80,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                .max_speed_hz    = 6500000,
                .bus_num         = 3,
                .chip_select     = 0,
-               .platform_data   = &mcp251x_info,
+               .properties      = mcp251x_properties,
                .controller_data = &mcp251x_chip_info1,
                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ1)
        },