ARM: dts: add wl12xx/wl18xx bindings
Replace all the pdata-quirks for setting wl12xx/wl18xx platform data with proper DT definitions. Signed-off-by: Eliad Peller <eliad@wizery.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Acked-by: Enric Balletbo i Serra <eballetbo@gmail.com> Tested-by: Nikita Kiryanov <nikita@compulab.co.il> Tested-by: Tony Lindgren <tony@atomide.com> Acked-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:

committed by
Tony Lindgren

parent
5ea5c518cc
commit
99f84cae43
@@ -14,7 +14,6 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/ti_wilink_st.h>
|
||||
#include <linux/wl12xx.h>
|
||||
|
||||
#include <linux/platform_data/pinctrl-single.h>
|
||||
#include <linux/platform_data/iommu-omap.h>
|
||||
@@ -35,35 +34,6 @@ struct pdata_init {
|
||||
struct of_dev_auxdata omap_auxdata_lookup[];
|
||||
static struct twl4030_gpio_platform_data twl_gpio_auxdata;
|
||||
|
||||
#if IS_ENABLED(CONFIG_WL12XX)
|
||||
|
||||
static struct wl12xx_platform_data wl12xx __initdata;
|
||||
|
||||
static void __init __used legacy_init_wl12xx(u32 ref_clock_freq,
|
||||
u32 tcxo_clock_freq,
|
||||
int gpio)
|
||||
{
|
||||
int res;
|
||||
|
||||
wl12xx.ref_clock_freq = ref_clock_freq;
|
||||
wl12xx.tcxo_clock_freq = tcxo_clock_freq;
|
||||
wl12xx.irq = gpio_to_irq(gpio);
|
||||
wl12xx.irq_trigger = IRQ_TYPE_LEVEL_HIGH;
|
||||
|
||||
res = wl12xx_set_platform_data(&wl12xx);
|
||||
if (res) {
|
||||
pr_err("error setting wl12xx data: %d\n", res);
|
||||
return;
|
||||
}
|
||||
}
|
||||
#else
|
||||
static inline void legacy_init_wl12xx(u32 ref_clock_freq,
|
||||
u32 tcxo_clock_freq,
|
||||
int gpio)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MACH_NOKIA_N8X0
|
||||
static void __init omap2420_n8x0_legacy_init(void)
|
||||
{
|
||||
@@ -130,7 +100,6 @@ static void __init omap3_sbc_t3730_twl_init(void)
|
||||
static void __init omap3_sbc_t3730_legacy_init(void)
|
||||
{
|
||||
omap3_sbc_t3x_usb_hub_init(167, "sb-t35 usb hub");
|
||||
legacy_init_wl12xx(38400000, 0, 136);
|
||||
}
|
||||
|
||||
static void __init omap3_sbc_t3530_legacy_init(void)
|
||||
@@ -160,14 +129,12 @@ static struct platform_device btwilink_device = {
|
||||
|
||||
static void __init omap3_igep0020_rev_f_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(0, 0, 177);
|
||||
platform_device_register(&wl18xx_device);
|
||||
platform_device_register(&btwilink_device);
|
||||
}
|
||||
|
||||
static void __init omap3_igep0030_rev_g_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(0, 0, 136);
|
||||
platform_device_register(&wl18xx_device);
|
||||
platform_device_register(&btwilink_device);
|
||||
}
|
||||
@@ -175,12 +142,6 @@ static void __init omap3_igep0030_rev_g_legacy_init(void)
|
||||
static void __init omap3_evm_legacy_init(void)
|
||||
{
|
||||
hsmmc2_internal_input_clk();
|
||||
legacy_init_wl12xx(38400000, 0, 149);
|
||||
}
|
||||
|
||||
static void __init omap3_zoom_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(26000000, 0, 162);
|
||||
}
|
||||
|
||||
static void am35xx_enable_emac_int(void)
|
||||
@@ -247,7 +208,6 @@ static void __init omap3_sbc_t3517_legacy_init(void)
|
||||
am35xx_emac_reset();
|
||||
hsmmc2_internal_input_clk();
|
||||
omap3_sbc_t3517_wifi_init();
|
||||
legacy_init_wl12xx(38400000, 0, 145);
|
||||
}
|
||||
|
||||
static void __init am3517_evm_legacy_init(void)
|
||||
@@ -289,23 +249,6 @@ static void __init omap3_tao3530_legacy_init(void)
|
||||
}
|
||||
#endif /* CONFIG_ARCH_OMAP3 */
|
||||
|
||||
#ifdef CONFIG_ARCH_OMAP4
|
||||
static void __init omap4_sdp_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(26000000, 26000000, 53);
|
||||
}
|
||||
|
||||
static void __init omap4_panda_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(38400000, 0, 53);
|
||||
}
|
||||
|
||||
static void __init var_som_om44_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(38400000, 0, 41);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
|
||||
static struct iommu_platform_data omap4_iommu_pdata = {
|
||||
.reset_name = "mmu_cache",
|
||||
@@ -314,13 +257,6 @@ static struct iommu_platform_data omap4_iommu_pdata = {
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SOC_AM33XX
|
||||
static void __init am335x_evmsk_legacy_init(void)
|
||||
{
|
||||
legacy_init_wl12xx(38400000, 0, 31);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SOC_OMAP5
|
||||
static void __init omap5_uevm_legacy_init(void)
|
||||
{
|
||||
@@ -421,19 +357,9 @@ static struct pdata_init pdata_quirks[] __initdata = {
|
||||
{ "isee,omap3-igep0020-rev-f", omap3_igep0020_rev_f_legacy_init, },
|
||||
{ "isee,omap3-igep0030-rev-g", omap3_igep0030_rev_g_legacy_init, },
|
||||
{ "ti,omap3-evm-37xx", omap3_evm_legacy_init, },
|
||||
{ "ti,omap3-zoom3", omap3_zoom_legacy_init, },
|
||||
{ "ti,am3517-evm", am3517_evm_legacy_init, },
|
||||
{ "technexion,omap3-tao3530", omap3_tao3530_legacy_init, },
|
||||
#endif
|
||||
#ifdef CONFIG_ARCH_OMAP4
|
||||
{ "ti,omap4-sdp", omap4_sdp_legacy_init, },
|
||||
{ "ti,omap4-panda", omap4_panda_legacy_init, },
|
||||
{ "variscite,var-dvk-om44", var_som_om44_legacy_init, },
|
||||
{ "variscite,var-stk-om44", var_som_om44_legacy_init, },
|
||||
#endif
|
||||
#ifdef CONFIG_SOC_AM33XX
|
||||
{ "ti,am335x-evmsk", am335x_evmsk_legacy_init, },
|
||||
#endif
|
||||
#ifdef CONFIG_SOC_OMAP5
|
||||
{ "ti,omap5-uevm", omap5_uevm_legacy_init, },
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user