diff options
Diffstat (limited to 'arch/arm/boards/protonic-imx6')
12 files changed, 32 insertions, 35 deletions
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c index a0dec5b1e2..9e62dc1544 100644 --- a/arch/arm/boards/protonic-imx6/board.c +++ b/arch/arm/boards/protonic-imx6/board.c @@ -13,18 +13,18 @@ #include <globalvar.h> #include <gpio.h> #include <i2c/i2c.h> -#include <mach/bbu.h> -#include <mach/imx6.h> -#include <mach/ocotp-fusemap.h> +#include <mach/imx/bbu.h> +#include <mach/imx/imx6.h> +#include <mach/imx/ocotp-fusemap.h> #include <mfd/imx6q-iomuxc-gpr.h> #include <mfd/syscon.h> #include <net.h> #include <of_device.h> -#include <regmap.h> +#include <linux/regmap.h> #include <sys/mount.h> #include <sys/stat.h> #include <unistd.h> -#include <usb/usb.h> +#include <linux/usb/usb.h> #define GPIO_HW_REV_ID {\ {IMX_GPIO_NR(2, 8), GPIOF_DIR_IN | GPIOF_ACTIVE_LOW, "rev_id0"}, \ @@ -84,7 +84,7 @@ struct prt_machine_data { }; struct prt_imx6_priv { - struct device_d *dev; + struct device *dev; const struct prt_machine_data *dcfg; unsigned int hw_id; unsigned int hw_rev; @@ -147,7 +147,7 @@ static int prt_imx6_read_rfid(struct prt_imx6_priv *priv, void *buf, size_t size) { const struct prt_machine_data *dcfg = priv->dcfg; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct i2c_client cl; int ret; @@ -187,7 +187,7 @@ static u8 prt_imx6_calc_rfid_cs(void *buf, size_t size) static int prt_imx6_set_mac(struct prt_imx6_priv *priv, struct prti6q_rfid_contents *rfid) { - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct device_node *node; node = of_find_node_by_alias(of_get_root_node(), "ethernet0"); @@ -200,10 +200,7 @@ static int prt_imx6_set_mac(struct prt_imx6_priv *priv, return 0; if (!is_valid_ether_addr(&rfid->mac[0])) { - unsigned char ethaddr_str[sizeof("xx:xx:xx:xx:xx:xx")]; - - ethaddr_to_string(&rfid->mac[0], ethaddr_str); - dev_err(dev, "bad MAC addr: %s\n", ethaddr_str); + dev_err(dev, "bad MAC addr: %pM\n", &rfid->mac[0]); return -EILSEQ; } @@ -224,7 +221,7 @@ static int prt_imx6_set_serial(struct prt_imx6_priv *priv, char *serial) static int prt_imx6_read_i2c_mac_serial(struct prt_imx6_priv *priv) { - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct prti6q_rfid_contents rfid; int ret; @@ -294,7 +291,7 @@ static int prt_imx6_set_ocotp_serial(struct param_d *param, void *driver_priv) static int prt_imx6_usb_mount(struct prt_imx6_priv *priv) { - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; const char *path; struct stat s; int ret; @@ -333,7 +330,7 @@ exit_usb_mount: static int prt_imx6_usb_boot(struct bootentry *entry, int verbose, int dryrun) { struct prt_imx6_priv *priv = prt_priv; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; char *second_word; char buf[sizeof("vicut1q recovery")] = {}; struct bootm_data bootm_data = {}; @@ -465,7 +462,7 @@ static int prt_imx6_bootentry_provider(struct bootentries *bootentries, static int prt_imx6_env_init(struct prt_imx6_priv *priv) { const struct prt_machine_data *dcfg = priv->dcfg; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; char *delay, *bootsrc, *boot_targets; unsigned int autoboot_timeout; int ret; @@ -530,7 +527,7 @@ static int prt_imx6_bbu(struct prt_imx6_priv *priv) emmc_flags = BBU_HANDLER_FLAG_DEFAULT; } - devicefile = basprintf("mmc%d", dcfg->emmc_usdhc); + devicefile = basprintf("/dev/mmc%d", dcfg->emmc_usdhc); if (!devicefile) { ret = -ENOMEM; goto exit_bbu; @@ -540,7 +537,7 @@ static int prt_imx6_bbu(struct prt_imx6_priv *priv) if (ret) goto exit_bbu; - devicefile = basprintf("mmc%d", dcfg->sd_usdhc); + devicefile = basprintf("/dev/mmc%d", dcfg->sd_usdhc); if (!devicefile) { ret = -ENOMEM; goto exit_bbu; @@ -559,7 +556,7 @@ exit_bbu: static int prt_imx6_devices_init(void) { struct prt_imx6_priv *priv = prt_priv; - struct device_d *ocotp_dev; + struct device *ocotp_dev; struct param_d *p; if (!priv) @@ -615,7 +612,7 @@ static int prt_imx6_yaco_set_kvg_power_mode(struct prt_imx6_priv *priv, const char *serial) { static const char command[] = "{\"command\":\"mode\",\"value\":\"kvg\",\"on2\":true}"; - struct device_d *dev = priv->dev; + struct device *dev = priv->dev; struct console_device *yccon; int ret; @@ -914,7 +911,7 @@ exit_get_dcfg: return ret; } -static int prt_imx6_probe(struct device_d *dev) +static int prt_imx6_probe(struct device *dev) { struct prt_imx6_priv *priv; struct param_d *p; @@ -1262,7 +1259,7 @@ static const struct of_device_id prt_imx6_of_match[] = { { .compatible = "kvg,vicut1", .data = &prt_imx6_cfg_vicut1 }, { .compatible = "kvg,vicut1q", .data = &prt_imx6_cfg_vicut1q }, { .compatible = "kvg,vicutp", .data = &prt_imx6_cfg_vicutp }, - { .compatible = "lan,lanmcu", .data = &prt_imx6_cfg_lanmcu }, + { .compatible = "vdl,lanmcu", .data = &prt_imx6_cfg_lanmcu }, { .compatible = "ply,plybas", .data = &prt_imx6_cfg_plybas }, { .compatible = "ply,plym2m", .data = &prt_imx6_cfg_plym2m }, { .compatible = "prt,prti6g", .data = &prt_imx6_cfg_prti6g }, @@ -1277,7 +1274,7 @@ static const struct of_device_id prt_imx6_of_match[] = { }; BAREBOX_DEEP_PROBE_ENABLE(prt_imx6_of_match); -static struct driver_d prt_imx6_board_driver = { +static struct driver prt_imx6_board_driver = { .name = "board-protonic-imx6", .probe = prt_imx6_probe, .of_compatible = DRV_OF_COMPAT(prt_imx6_of_match), diff --git a/arch/arm/boards/protonic-imx6/flash-header-lanmcu.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-lanmcu.imxcfg index e6e37672aa..7deaaa9b7b 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-lanmcu.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-lanmcu.imxcfg @@ -61,7 +61,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-plybas.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-plybas.imxcfg index 16f2f596c7..c9c9d076f5 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-plybas.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-plybas.imxcfg @@ -63,7 +63,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-plym2m.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-plym2m.imxcfg index 1692c1e087..71df95b968 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-plym2m.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-plym2m.imxcfg @@ -63,7 +63,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-prti6q.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-prti6q.imxcfg index 2d0064e8c1..deced6901b 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-prti6q.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-prti6q.imxcfg @@ -65,7 +65,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-prtmvt.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-prtmvt.imxcfg index 887811fa42..58530910fc 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-prtmvt.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-prtmvt.imxcfg @@ -63,7 +63,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-prtrvt.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-prtrvt.imxcfg index 16f2f596c7..c9c9d076f5 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-prtrvt.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-prtrvt.imxcfg @@ -63,7 +63,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-prtvt7.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-prtvt7.imxcfg index 7f2662567e..5073458a03 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-prtvt7.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-prtvt7.imxcfg @@ -61,7 +61,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-vicut1.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-vicut1.imxcfg index b86a32be0c..a879229923 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-vicut1.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-vicut1.imxcfg @@ -63,7 +63,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-vicut1q.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-vicut1q.imxcfg index 3abb21b70e..8e41a410df 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-vicut1q.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-vicut1q.imxcfg @@ -66,7 +66,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/flash-header-vicutp.imxcfg b/arch/arm/boards/protonic-imx6/flash-header-vicutp.imxcfg index a8178fe258..54a86a0008 100644 --- a/arch/arm/boards/protonic-imx6/flash-header-vicutp.imxcfg +++ b/arch/arm/boards/protonic-imx6/flash-header-vicutp.imxcfg @@ -126,7 +126,7 @@ wm 32 0x021b001c 0x04008040 /* MPZQHWCTRL */ wm 32 0x021b0800 0xa1390003 /* ZQ mode = 3 force calibration */ -wm 32 0x021b4800 0xa1390003 +wm 32 0x021b4800 0xa1390003 wm 32 0x021b0020 MDREF_64KHZ diff --git a/arch/arm/boards/protonic-imx6/lowlevel.c b/arch/arm/boards/protonic-imx6/lowlevel.c index ef8e7016d1..38e65037e6 100644 --- a/arch/arm/boards/protonic-imx6/lowlevel.c +++ b/arch/arm/boards/protonic-imx6/lowlevel.c @@ -6,8 +6,8 @@ #include <asm/barebox-arm.h> #include <common.h> -#include <mach/esdctl.h> -#include <mach/generic.h> +#include <mach/imx/esdctl.h> +#include <mach/imx/generic.h> extern char __dtb_z_imx6q_prti6q_start[]; extern char __dtb_z_imx6q_prtwd2_start[]; |