Blackfin: convert adv7393 resources to new i2c framework (50c4c086) · Commits · e / devices / android_kernel_fairphone_FP3

arch/blackfin/mach-bf527/boards/cm_bf527.c

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -595,12 +595,6 @@ static struct platform_device bfin_spi0_device = {
	};		};
	#endif /* spi master and devices */		#endif /* spi master and devices */

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	static struct platform_device bfin_fb_adv7393_device = {
	.name = "bfin-adv7393",
	};
	#endif

	#if defined(CONFIG_MTD_GPIO_ADDR) \|\| defined(CONFIG_MTD_GPIO_ADDR_MODULE)		#if defined(CONFIG_MTD_GPIO_ADDR) \|\| defined(CONFIG_MTD_GPIO_ADDR_MODULE)
	static struct mtd_partition cm_partitions[] = {		static struct mtd_partition cm_partitions[] = {
	{		{
	@@ -765,6 +759,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	.irq = IRQ_PF8,		.irq = IRQ_PF8,
	},		},
	#endif		#endif
			#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
			{
			I2C_BOARD_INFO("bfin-adv7393", 0x2B),
			},
			#endif
	};		};

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
	@@ -888,10 +887,6 @@ static struct platform_device *cmbf527_devices[] __initdata = {
	&bfin_spi0_device,		&bfin_spi0_device,
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	&bfin_fb_adv7393_device,
	#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)
	&bfin_uart_device,		&bfin_uart_device,
	#endif		#endif

arch/blackfin/mach-bf527/boards/ezkit.c

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -694,12 +694,6 @@ static struct platform_device bfin_fb_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	static struct platform_device bfin_fb_adv7393_device = {
	.name = "bfin-adv7393",
	};
	#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)
	static struct resource bfin_uart_resources[] = {		static struct resource bfin_uart_resources[] = {
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	@@ -815,6 +809,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	.irq = IRQ_PF8,		.irq = IRQ_PF8,
	},		},
	#endif		#endif
			#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
			{
			I2C_BOARD_INFO("bfin-adv7393", 0x2B),
			},
			#endif
	};		};

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
	@@ -979,10 +978,6 @@ static struct platform_device *stamp_devices[] __initdata = {
	&bf52x_t350mcqb_device,		&bf52x_t350mcqb_device,
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	&bfin_fb_adv7393_device,
	#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)
	&bfin_uart_device,		&bfin_uart_device,
	#endif		#endif

arch/blackfin/mach-bf533/boards/ezkit.c

+11 −10

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#include <linux/usb/isp1362.h>		#include <linux/usb/isp1362.h>
	#endif		#endif
	#include <linux/irq.h>		#include <linux/irq.h>
			#include <linux/i2c.h>
	#include <asm/dma.h>		#include <asm/dma.h>
	#include <asm/bfin5xx_spi.h>		#include <asm/bfin5xx_spi.h>
	#include <asm/portmux.h>		#include <asm/portmux.h>
	@@ -34,12 +35,6 @@ static struct platform_device rtc_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	static struct platform_device bfin_fb_adv7393_device = {
	.name = "bfin-adv7393",
	};
	#endif

	/*		/*
	* USB-LAN EzExtender board		* USB-LAN EzExtender board
	* Driver needs to know address, irq and flag pin.		* Driver needs to know address, irq and flag pin.
	@@ -438,6 +433,14 @@ static struct platform_device bfin_dpmc = {
	},		},
	};		};

			static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
			#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
			{
			I2C_BOARD_INFO("bfin-adv7393", 0x2B),
			},
			#endif
			};

	static struct platform_device *ezkit_devices[] __initdata = {		static struct platform_device *ezkit_devices[] __initdata = {

	&bfin_dpmc,		&bfin_dpmc,
	@@ -460,10 +463,6 @@ static struct platform_device *ezkit_devices[] __initdata = {
	&bfin_spi0_device,		&bfin_spi0_device,
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	&bfin_fb_adv7393_device,
	#endif

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)
	&rtc_device,		&rtc_device,
	#endif		#endif
	@@ -494,6 +493,8 @@ static int __init ezkit_init(void)
	printk(KERN_INFO "%s(): registering device resources\n", __func__);		printk(KERN_INFO "%s(): registering device resources\n", __func__);
	platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));		platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));
	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));		spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
			i2c_register_board_info(0, bfin_i2c_board_info,
			ARRAY_SIZE(bfin_i2c_board_info));
	return 0;		return 0;
	}		}

arch/blackfin/mach-bf533/boards/stamp.c

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -73,12 +73,6 @@ static struct platform_device smc91x_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	static struct platform_device bfin_fb_adv7393_device = {
	.name = "bfin-adv7393",
	};
	#endif

	#if defined(CONFIG_USB_NET2272) \|\| defined(CONFIG_USB_NET2272_MODULE)		#if defined(CONFIG_USB_NET2272) \|\| defined(CONFIG_USB_NET2272_MODULE)
	static struct resource net2272_bfin_resources[] = {		static struct resource net2272_bfin_resources[] = {
	{		{
	@@ -465,6 +459,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	.irq = 39,		.irq = 39,
	},		},
	#endif		#endif
			#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
			{
			I2C_BOARD_INFO("bfin-adv7393", 0x2B),
			},
			#endif
	};		};

	static const unsigned int cclk_vlev_datasheet[] =		static const unsigned int cclk_vlev_datasheet[] =
	@@ -506,10 +505,6 @@ static struct platform_device *stamp_devices[] __initdata = {
	&smc91x_device,		&smc91x_device,
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	&bfin_fb_adv7393_device,
	#endif

	#if defined(CONFIG_USB_NET2272) \|\| defined(CONFIG_USB_NET2272_MODULE)		#if defined(CONFIG_USB_NET2272) \|\| defined(CONFIG_USB_NET2272_MODULE)
	&net2272_bfin_device,		&net2272_bfin_device,
	#endif		#endif

arch/blackfin/mach-bf537/boards/stamp.c

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1056,12 +1056,6 @@ static struct platform_device bfin_fb_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	static struct platform_device bfin_fb_adv7393_device = {
	.name = "bfin-adv7393",
	};
	#endif

	#if defined(CONFIG_FB_BFIN_LQ035Q1) \|\| defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)		#if defined(CONFIG_FB_BFIN_LQ035Q1) \|\| defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
	#include <asm/bfin-lq035q1.h>		#include <asm/bfin-lq035q1.h>

	@@ -1476,6 +1470,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	.platform_data = (void *)&adp5588_gpio_data,		.platform_data = (void *)&adp5588_gpio_data,
	},		},
	#endif		#endif
			#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
			{
			I2C_BOARD_INFO("bfin-adv7393", 0x2B),
			},
			#endif
	};		};

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
	@@ -1646,10 +1645,6 @@ static struct platform_device *stamp_devices[] __initdata = {
	&bfin_lq035q1_device,		&bfin_lq035q1_device,
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_7393) \|\| defined(CONFIG_FB_BFIN_7393_MODULE)
	&bfin_fb_adv7393_device,
	#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)
	&bfin_uart_device,		&bfin_uart_device,
	#endif		#endif