diff options
Diffstat (limited to 'arch/arm/boards/phytec-som-imx6/board.c')
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/board.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index 1e515a093a..2db3fa1db8 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -16,15 +16,15 @@ #include <of.h> #include <deep-probe.h> #include <i2c/i2c.h> -#include <mach/bbu.h> +#include <mach/imx/bbu.h> #include <platform_data/eth-fec.h> #include <mfd/imx6q-iomuxc-gpr.h> #include <linux/micrel_phy.h> #include <globalvar.h> -#include <mach/iomux-mx6.h> -#include <mach/imx6.h> +#include <mach/imx/iomux-mx6.h> +#include <mach/imx/imx6.h> #define PHYFLEX_MODULE_REV_1 0x1 #define PHYFLEX_MODULE_REV_2 0x2 @@ -107,7 +107,7 @@ static int phycore_da9062_setup_buck_mode(void) unsigned char value; int ret; - pmic_np = of_find_node_by_name(NULL, "pmic@58"); + pmic_np = of_find_node_by_name_address(NULL, "pmic@58"); if (!pmic_np) return -ENODEV; @@ -157,7 +157,7 @@ struct board_data { unsigned flags; }; -static int physom_imx6_probe(struct device_d *dev) +static int physom_imx6_probe(struct device *dev) { int ret; char *environment_path, *default_environment_path; @@ -231,7 +231,7 @@ static int physom_imx6_probe(struct device_d *dev) envdev = "SPI NOR flash"; break; default: - environment_path = basprintf(default_environment_path); + environment_path = strdup(default_environment_path); envdev = default_envdev; break; } @@ -360,7 +360,7 @@ static const struct of_device_id physom_imx6_match[] = { { /* Sentinel */ }, }; -static struct driver_d physom_imx6_driver = { +static struct driver physom_imx6_driver = { .name = "physom-imx6", .probe = physom_imx6_probe, .of_compatible = physom_imx6_match, |