diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-15 14:21:23 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-15 14:21:23 +0100 |
commit | 0f89a1c654e728aa92a14147abe684bede50e4e0 (patch) | |
tree | 456298a0f28bd436fd87559448eb82bf5d368941 | |
parent | 64f85586d1dcb30eddd3d5d9ed39117bafb7da89 (diff) | |
parent | d92e7bb4d43d1b366655a9ec97c91c031f92ab64 (diff) | |
download | barebox-0f89a1c654e728aa92a14147abe684bede50e4e0.tar.gz barebox-0f89a1c654e728aa92a14147abe684bede50e4e0.tar.xz |
Merge branch 'for-next/skov-imx6'
-rw-r--r-- | arch/arm/boards/skov-imx6/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/boards/skov-imx6/board.c | 228 | ||||
-rw-r--r-- | arch/arm/boards/skov-imx6/defaultenv-skov-imx6/network/eth1-discover | 8 | ||||
-rw-r--r-- | arch/arm/boards/skov-imx6/lowlevel.c | 6 | ||||
-rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6qdl-skov-imx6.dtsi | 20 | ||||
-rw-r--r-- | arch/arm/dts/imx6s-skov-imx6.dts | 22 |
7 files changed, 253 insertions, 34 deletions
diff --git a/arch/arm/boards/skov-imx6/Makefile b/arch/arm/boards/skov-imx6/Makefile index a5e85bc1e1..07b87ff11d 100644 --- a/arch/arm/boards/skov-imx6/Makefile +++ b/arch/arm/boards/skov-imx6/Makefile @@ -1,3 +1,4 @@ obj-y += board.o lwl-y += lowlevel.o obj-pbl-y += version.o +bbenv-y += defaultenv-skov-imx6 diff --git a/arch/arm/boards/skov-imx6/board.c b/arch/arm/boards/skov-imx6/board.c index a58172b2b1..cd7b8e208d 100644 --- a/arch/arm/boards/skov-imx6/board.c +++ b/arch/arm/boards/skov-imx6/board.c @@ -2,15 +2,18 @@ #define pr_fmt(fmt) "skov-imx6: " fmt +#include <bootsource.h> #include <common.h> -#include <init.h> -#include <mach/bbu.h> +#include <deep-probe.h> +#include <envfs.h> #include <environment.h> -#include <bootsource.h> #include <globalvar.h> +#include <gpio.h> +#include <init.h> +#include <linux/micrel_phy.h> +#include <mach/bbu.h> #include <net.h> #include <of_gpio.h> -#include <gpio.h> #include "version.h" @@ -130,6 +133,9 @@ copy_mac_from_eth0: return eth_of_fixup_node_from_eth_device(root, node_path, ethname); } +#define SKOV_GPIO_MDIO_BUS 0 +#define SKOV_LAN1_PHY_ADDR 1 + #define MAX_V_GPIO 8 struct board_description { @@ -303,20 +309,148 @@ static const struct board_description imx6_variants[] = { }; static int skov_board_no = -1; +static bool skov_have_switch = true; +static const char *no_switch_suffix = "-noswitch"; -static int skov_imx6_fixup(struct device_node *root, void *unused) +static void fixup_machine_compatible(const char *compat, + struct device_node *root) { - int ret; - const char *val; - uint32_t brightness; + int cclen = 0, clen = strlen(compat) + 1; + const char *curcompat; + void *buf; + + if (!root) { + root = of_get_root_node(); + if (!root) + return; + } + + curcompat = of_get_property(root, "compatible", &cclen); + + buf = xzalloc(cclen + clen); + + memcpy(buf, compat, clen); + memcpy(buf + clen, curcompat, cclen); + + /* + * Prepend the compatible from board entry to the machine compatible. + * Used to match bootspec entries against it. + */ + of_set_property(root, "compatible", buf, cclen + clen, true); + + free(buf); +} + +static void fixup_noswitch_machine_compatible(struct device_node *root) +{ + const char *compat = imx6_variants[skov_board_no].dts_compatible; + const char *generic = "skov,imx6"; + size_t size, size_generic; + char *buf; + + size = strlen(compat) + strlen(no_switch_suffix) + 1; + size_generic = strlen(generic) + strlen(no_switch_suffix) + 1; + size = max(size, size_generic); + + /* add generic compatible, so systemd&co can make right decisions */ + buf = xasprintf("%s%s", generic, no_switch_suffix); + fixup_machine_compatible(buf, root); + + /* add specific compatible as fallback, in case this board has new + * challenges. + */ + buf = xasprintf("%s%s", compat, no_switch_suffix); + fixup_machine_compatible(buf, root); + + free(buf); +} + +static void skov_imx6_no_switch(struct device_node *root) +{ + const char *fec_alias = "ethernet0"; struct device_node *node; + int ret; + + fixup_noswitch_machine_compatible(root); + + node = of_find_node_by_alias(root, fec_alias); + if (node) { + ret = of_device_disable(node); + if (ret) + pr_warn("Can't disable %s\n", fec_alias); + } else { + pr_warn("Can't find node by alias: %s\n", fec_alias); + } + + node = of_find_node_by_alias(root, "mdio-gpio0"); + if (node) { + ret = of_device_disable(node); + if (ret) + pr_warn("Can't disable mdio-gpio0 node\n"); + } else { + pr_warn("Can't find mdio-gpio0 node\n"); + } +} + +static int skov_imx6_switch_port(struct device_node *root, const char *path) +{ + size_t size; + char *buf; + int ret; + + /* size is, string + '\0' + port number */ + size = strlen(path) + 2; + buf = xzalloc(size); + if (!buf) + return -ENOMEM; + + ret = snprintf(buf, size, "%s0", path); + if (ret < 0) + return ret; + + ret = eth_of_fixup_node_from_eth_device(root, buf, "eth0"); + if (ret) + return ret; + + ret = snprintf(buf, size, "%s1", path); + if (ret < 0) + return ret; + + ret = eth2_of_fixup_node_individually(root, buf, "eth0", + "state.ethaddr.eth2", + "/state/ethaddr/eth2"); + return ret; +} + +static void skov_imx6_switch(struct device_node *root) +{ + const char *old = "/mdio-gpio/ksz8873@3/ports/ports@"; + const char *new = "/mdio/switch@0/ports/ports@"; + int ret; + + /* Old DTS variants (pre kernel mainline) use different path. Try first + * the new variant, then fall back to the old one. + */ + ret = skov_imx6_switch_port(root, new); + if (ret) { + ret = skov_imx6_switch_port(root, old); + if (ret) + pr_err("Filed to set mac address\n"); + } +} + +static int skov_imx6_fixup(struct device_node *root, void *unused) +{ struct device_node *chosen = of_create_node(root, "/chosen"); + struct device_node *node; + uint32_t brightness; + const char *val; + int ret; - eth_of_fixup_node_from_eth_device(root, - "/mdio-gpio/ksz8873@3/ports/ports@0", "eth0"); - eth2_of_fixup_node_individually(root, - "/mdio-gpio/ksz8873@3/ports/ports@1", "eth0", - "state.ethaddr.eth2", "/state/ethaddr/eth2"); + if (skov_have_switch) + skov_imx6_switch(root); + else + skov_imx6_no_switch(root); switch (bootsource_get()) { case BOOTSOURCE_MMC: @@ -357,10 +491,20 @@ static int skov_imx6_fixup(struct device_node *root, void *unused) */ static void skov_init_board(const struct board_description *variant) { + struct device_node *gpio_np = NULL; struct device_node *np; char *environment_path, *envdev; int ret; + gpio_np = of_find_node_by_name(NULL, "gpio@20b4000"); + if (gpio_np) { + ret = of_device_ensure_probed(gpio_np); + if (ret) + pr_warn("Can't probe GPIO node\n"); + } else { + pr_warn("Can't get GPIO node\n"); + } + imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox", BBU_HANDLER_FLAG_DEFAULT); @@ -432,32 +576,49 @@ static void skov_init_board(const struct board_description *variant) } } -static void fixup_machine_compatible(const char *compat) +static int skov_switch_test(void) { - const char *curcompat; - struct device_node *root; - int cclen = 0, clen = strlen(compat) + 1; - void *buf; + struct phy_device *phydev; + struct device_d *eth0; + struct mii_bus *mii; + int ret; - root = of_get_root_node(); - if (!root) - return; + if (skov_board_no < 0) + return 0; - curcompat = of_get_property(root, "compatible", &cclen); + /* On this boards, we have only one MDIO bus. So, it is enough to take + * the first one. + */ + mii = mdiobus_get_bus(SKOV_GPIO_MDIO_BUS); + /* We can't read the switch ID, but we get get ID of the first PHY, + * which is enough to test if the switch is attached. + */ + phydev = get_phy_device(mii, SKOV_LAN1_PHY_ADDR); + if (IS_ERR(phydev)) + goto no_switch; - buf = xzalloc(cclen + clen); + if (phydev->phy_id != PHY_ID_KSZ886X) + goto no_switch; - memcpy(buf, compat, clen); - memcpy(buf + clen, curcompat, cclen); + return 0; - /* - * Prepend the compatible from board entry to the machine compatible. - * Used to match bootspec entries against it. - */ - of_set_property(root, "compatible", buf, cclen + clen, true); +no_switch: + skov_have_switch = false; - free(buf); + pr_notice("No-switch variant is detected\n"); + + eth0 = get_device_by_name("eth0"); + if (eth0) { + ret = dev_set_param(eth0, "mode", "disabled"); + if (ret) + pr_warn("Can't set eth0 mode\n"); + } else { + pr_warn("Can't disable eth0\n"); + } + + return 0; } +late_initcall(skov_switch_test); static int skov_imx6_probe(struct device_d *dev) { @@ -487,10 +648,12 @@ static int skov_imx6_probe(struct device_d *dev) globalvar_add_simple("board.dts", variant->dts_compatible); globalvar_add_simple("board.display", variant->display ?: NULL); - fixup_machine_compatible(variant->dts_compatible); + fixup_machine_compatible(variant->dts_compatible, NULL); skov_init_board(variant); + defaultenv_append_directory(defaultenv_skov_imx6); + return 0; } @@ -501,6 +664,7 @@ static __maybe_unused struct of_device_id skov_version_ids[] = { /* sentinel */ } }; +BAREBOX_DEEP_PROBE_ENABLE(skov_version_ids); static struct driver_d skov_version_driver = { .name = "skov-imx6", diff --git a/arch/arm/boards/skov-imx6/defaultenv-skov-imx6/network/eth1-discover b/arch/arm/boards/skov-imx6/defaultenv-skov-imx6/network/eth1-discover new file mode 100644 index 0000000000..e11a3f9006 --- /dev/null +++ b/arch/arm/boards/skov-imx6/defaultenv-skov-imx6/network/eth1-discover @@ -0,0 +1,8 @@ +#!/bin/sh + +# Some boards doesn't have a ETH port, but may have USB network attached +if [ "$eth0.mode" != "disabled" ]; then + exit 0; +fi + +usb diff --git a/arch/arm/boards/skov-imx6/lowlevel.c b/arch/arm/boards/skov-imx6/lowlevel.c index eab797faa1..ea6de36a36 100644 --- a/arch/arm/boards/skov-imx6/lowlevel.c +++ b/arch/arm/boards/skov-imx6/lowlevel.c @@ -618,6 +618,7 @@ static void skov_imx6_init(int cpu_type, unsigned board_variant) extern char __dtb_z_imx6q_skov_imx6_start[]; extern char __dtb_z_imx6dl_skov_imx6_start[]; +extern char __dtb_z_imx6s_skov_imx6_start[]; /* called twice: once for SDRAM setup only, second for devicetree setup */ static noinline void skov_imx6_start(void) @@ -640,8 +641,11 @@ static noinline void skov_imx6_start(void) /* boot this platform (second call) */ switch (cpu_type) { case IMX6_CPUTYPE_IMX6S: + pr_debug("Startup i.MX6S based system...\n"); + imx6q_barebox_entry(__dtb_z_imx6s_skov_imx6_start); + break; case IMX6_CPUTYPE_IMX6DL: - pr_debug("Startup i.MX6S/DL based system...\n"); + pr_debug("Startup i.MX6DL based system...\n"); imx6q_barebox_entry(__dtb_z_imx6dl_skov_imx6_start); break; case IMX6_CPUTYPE_IMX6D: diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 80caa738a9..88a079497a 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -115,7 +115,7 @@ lwl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox-bb.dtb.o lwl-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += imx6dl-hummingboard.dtb.o imx6q-hummingboard.dtb.o \ imx6dl-hummingboard2.dtb.o imx6q-hummingboard2.dtb.o \ imx6q-h100.dtb.o -lwl-$(CONFIG_MACH_SKOV_IMX6) += imx6dl-skov-imx6.dtb.o imx6q-skov-imx6.dtb.o +lwl-$(CONFIG_MACH_SKOV_IMX6) += imx6s-skov-imx6.dtb.o imx6dl-skov-imx6.dtb.o imx6q-skov-imx6.dtb.o lwl-$(CONFIG_MACH_SKOV_ARM9CPU) += at91-skov-arm9cpu.dtb.o lwl-$(CONFIG_MACH_SEEED_ODYSSEY) += stm32mp157c-odyssey.dtb.o lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb.o diff --git a/arch/arm/dts/imx6qdl-skov-imx6.dtsi b/arch/arm/dts/imx6qdl-skov-imx6.dtsi index 03f3cb02fc..371a931e53 100644 --- a/arch/arm/dts/imx6qdl-skov-imx6.dtsi +++ b/arch/arm/dts/imx6qdl-skov-imx6.dtsi @@ -273,6 +273,26 @@ remote-endpoint = <&display0_in>; }; +&usbh1 { + disable-over-current; + status = "okay"; +}; + +/* no usbh2 */ +&usbphynop1 { + status = "disabled"; +}; + +/* no usbh3 */ +&usbphynop2 { + status = "disabled"; +}; + +&usbotg { + disable-over-current; + status = "okay"; +}; + &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; diff --git a/arch/arm/dts/imx6s-skov-imx6.dts b/arch/arm/dts/imx6s-skov-imx6.dts new file mode 100644 index 0000000000..9061563e45 --- /dev/null +++ b/arch/arm/dts/imx6s-skov-imx6.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2015 Juergen Borleis, Pengutronix <kernel@pengutronix.de> + */ + +/dts-v1/; +#include <arm/imx6dl.dtsi> +#include "imx6dl.dtsi" +#include "imx6qdl-skov-imx6.dtsi" + +/ { + model = "Skov IMX6"; + compatible = "skov,imx6", "fsl,imx6dl"; + + chosen { + stdout-path = &uart2; + }; +}; + +&hdmi { + status = "disabled"; +}; |