diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-24 14:40:23 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-24 14:40:23 +0000 |
commit | de950268134cc6c5ac25a650c1809859a9d99637 (patch) | |
tree | d5839c75cf629598433927343a2e09462cdd0da0 /target/linux/ar71xx/files/arch/mips | |
parent | 32dec7075aae5cc6ef1e4394dc94fed1767b848e (diff) |
rtl8366: unify rtl8366s and rtl8366rb platform data
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27754 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips')
5 files changed, 13 insertions, 19 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c index 84fb184c0..25eb26a6f 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c @@ -14,7 +14,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/delay.h> -#include <linux/rtl8366s.h> +#include <linux/rtl8366.h> #include <asm/mach-ar71xx/ar71xx.h> @@ -131,11 +131,11 @@ static struct gpio_keys_button dir825b1_gpio_keys[] __initdata = { } }; -static struct rtl8366s_initval dir825b1_rtl8366s_initvals[] = { +static struct rtl8366_initval dir825b1_rtl8366s_initvals[] = { { .reg = 0x06, .val = 0x0108 }, }; -static struct rtl8366s_platform_data dir825b1_rtl8366s_data = { +static struct rtl8366_platform_data dir825b1_rtl8366s_data = { .gpio_sda = DIR825B1_GPIO_RTL8366_SDA, .gpio_sck = DIR825B1_GPIO_RTL8366_SCK, .num_initvals = ARRAY_SIZE(dir825b1_rtl8366s_initvals), diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c index 7d8161811..e1d959243 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c @@ -14,7 +14,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/delay.h> -#include <linux/rtl8366s.h> +#include <linux/rtl8366.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> @@ -166,7 +166,7 @@ static void __devinit nbg460n_i2c_init(void) } -static struct rtl8366s_platform_data nbg460n_rtl8366s_data = { +static struct rtl8366_platform_data nbg460n_rtl8366s_data = { .gpio_sda = NBG460N_GPIO_RTL8366_SDA, .gpio_sck = NBG460N_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c index 1cf016848..77262d739 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c @@ -11,7 +11,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/platform_device.h> -#include <linux/rtl8366rb.h> +#include <linux/rtl8366.h> #include <asm/mach-ar71xx/ar71xx.h> #include "machtype.h" @@ -109,7 +109,7 @@ static struct gpio_keys_button tl_wr1043nd_gpio_keys[] __initdata = { } }; -static struct rtl8366rb_platform_data tl_wr1043nd_rtl8366rb_data = { +static struct rtl8366_platform_data tl_wr1043nd_rtl8366rb_data = { .gpio_sda = TL_WR1043ND_GPIO_RTL8366_SDA, .gpio_sck = TL_WR1043ND_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c index 15bc05535..0df9c7f02 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c @@ -13,7 +13,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/delay.h> -#include <linux/rtl8366s.h> +#include <linux/rtl8366.h> #include <asm/mach-ar71xx/ar71xx.h> @@ -205,7 +205,7 @@ static struct gpio_keys_button wndr3700_gpio_keys[] __initdata = { } }; -static struct rtl8366s_platform_data wndr3700_rtl8366s_data = { +static struct rtl8366_platform_data wndr3700_rtl8366s_data = { .gpio_sda = WNDR3700_GPIO_RTL8366_SDA, .gpio_sck = WNDR3700_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c index 13a17db47..35f216582 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c @@ -12,8 +12,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/nxp_74hc153.h> -#include <linux/rtl8366s.h> -#include <linux/rtl8366rb.h> +#include <linux/rtl8366.h> #include <asm/mips_machine.h> #include <asm/mach-ar71xx/ar71xx.h> @@ -214,7 +213,7 @@ static struct platform_device wzrhpg300nh_74hc153_device = { } }; -static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = { +static struct rtl8366_platform_data wzrhpg300nh_rtl8366_data = { .gpio_sda = WZRHPG300NH_GPIO_RTL8366_SDA, .gpio_sck = WZRHPG300NH_GPIO_RTL8366_SCK, }; @@ -223,20 +222,15 @@ static struct platform_device wzrhpg300nh_rtl8366s_device = { .name = RTL8366S_DRIVER_NAME, .id = -1, .dev = { - .platform_data = &wzrhpg300nh_rtl8366s_data, + .platform_data = &wzrhpg300nh_rtl8366_data, } }; -static struct rtl8366rb_platform_data wzrhpg301nh_rtl8366rb_data = { - .gpio_sda = WZRHPG300NH_GPIO_RTL8366_SDA, - .gpio_sck = WZRHPG300NH_GPIO_RTL8366_SCK, -}; - static struct platform_device wzrhpg301nh_rtl8366rb_device = { .name = RTL8366RB_DRIVER_NAME, .id = -1, .dev = { - .platform_data = &wzrhpg301nh_rtl8366rb_data, + .platform_data = &wzrhpg300nh_rtl8366_data, } }; |