* [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC
@ 2019-04-05 11:44 Stefan Roese
2019-04-05 11:44 ` [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support Stefan Roese
2019-04-07 18:03 ` [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC Daniel Schwierzeck
0 siblings, 2 replies; 7+ messages in thread
From: Stefan Roese @ 2019-04-05 11:44 UTC (permalink / raw)
To: u-boot
This driver is derived from this Linux driver:
linux/drivers/phy/ralink/phy-ralink-usb.c
The driver sets up power and host mode, but also needs to configure PHY
registers for the MT7628 and MT7688.
I removed the reset controller handling for the USB host and device, as
it does not seem to be necessary right now. The soft reset bits for both
devices are enabled by default and testing has shown (with hackish
reset handling added), that USB related commands work identical with
or without the reset handling.
Please note that the resulting USB support is tested only very minimal.
I was able to detect one of my 3 currently available USB sticks.
Perhaps some further work is needed to fully support the EHCI controller
integrated in the MT76x8 SoC.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
drivers/phy/Kconfig | 8 ++
drivers/phy/Makefile | 1 +
drivers/phy/mt76x8-usb-phy.c | 161 +++++++++++++++++++++++++++++++++++
3 files changed, 170 insertions(+)
create mode 100644 drivers/phy/mt76x8-usb-phy.c
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 32bbf41dd1..102fb91fff 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -174,4 +174,12 @@ config KEYSTONE_USB_PHY
This PHY is found on some Keystone (K2) devices supporting USB.
+config MT76X8_USB_PHY
+ bool "MediaTek MT76x8 (7628/88) USB PHY support"
+ depends on PHY
+ help
+ Support the USB PHY in MT76x8 SoCs
+
+ This PHY is found on MT76x8 devices supporting USB.
+
endmenu
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 099551d693..b55917bce1 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
obj-$(CONFIG_OMAP_USB2_PHY) += omap-usb2-phy.o
obj-$(CONFIG_KEYSTONE_USB_PHY) += keystone-usb-phy.o
+obj-$(CONFIG_MT76X8_USB_PHY) += mt76x8-usb-phy.o
diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
new file mode 100644
index 0000000000..268da8ef6c
--- /dev/null
+++ b/drivers/phy/mt76x8-usb-phy.c
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Stefan Roese <sr@denx.de>
+ *
+ * Derived from linux/drivers/phy/ralink/phy-ralink-usb.c
+ * Copyright (C) 2017 John Crispin <john@phrozen.org>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <generic-phy.h>
+#include <regmap.h>
+#include <reset-uclass.h>
+#include <syscon.h>
+#include <asm/io.h>
+
+#define RT_SYSC_REG_SYSCFG1 0x014
+#define RT_SYSC_REG_CLKCFG1 0x030
+#define RT_SYSC_REG_USB_PHY_CFG 0x05c
+
+#define OFS_U2_PHY_AC0 0x800
+#define OFS_U2_PHY_AC1 0x804
+#define OFS_U2_PHY_AC2 0x808
+#define OFS_U2_PHY_ACR0 0x810
+#define OFS_U2_PHY_ACR1 0x814
+#define OFS_U2_PHY_ACR2 0x818
+#define OFS_U2_PHY_ACR3 0x81C
+#define OFS_U2_PHY_ACR4 0x820
+#define OFS_U2_PHY_AMON0 0x824
+#define OFS_U2_PHY_DCR0 0x860
+#define OFS_U2_PHY_DCR1 0x864
+#define OFS_U2_PHY_DTM0 0x868
+#define OFS_U2_PHY_DTM1 0x86C
+
+#define RT_RSTCTRL_UDEV BIT(25)
+#define RT_RSTCTRL_UHST BIT(22)
+#define RT_SYSCFG1_USB0_HOST_MODE BIT(10)
+
+#define MT7620_CLKCFG1_UPHY0_CLK_EN BIT(25)
+#define MT7620_CLKCFG1_UPHY1_CLK_EN BIT(22)
+#define RT_CLKCFG1_UPHY1_CLK_EN BIT(20)
+#define RT_CLKCFG1_UPHY0_CLK_EN BIT(18)
+
+#define USB_PHY_UTMI_8B60M BIT(1)
+#define UDEV_WAKEUP BIT(0)
+
+struct mt76x8_usb_phy {
+ u32 clk;
+ void __iomem *base;
+ struct regmap *sysctl;
+};
+
+static void u2_phy_w32(struct mt76x8_usb_phy *phy, u32 val, u32 reg)
+{
+ writel(val, phy->base + reg);
+}
+
+static u32 u2_phy_r32(struct mt76x8_usb_phy *phy, u32 reg)
+{
+ return readl(phy->base + reg);
+}
+
+static void mt76x8_usb_phy_init(struct mt76x8_usb_phy *phy)
+{
+ u2_phy_r32(phy, OFS_U2_PHY_AC2);
+ u2_phy_r32(phy, OFS_U2_PHY_ACR0);
+ u2_phy_r32(phy, OFS_U2_PHY_DCR0);
+
+ u2_phy_w32(phy, 0x00ffff02, OFS_U2_PHY_DCR0);
+ u2_phy_r32(phy, OFS_U2_PHY_DCR0);
+ u2_phy_w32(phy, 0x00555502, OFS_U2_PHY_DCR0);
+ u2_phy_r32(phy, OFS_U2_PHY_DCR0);
+ u2_phy_w32(phy, 0x00aaaa02, OFS_U2_PHY_DCR0);
+ u2_phy_r32(phy, OFS_U2_PHY_DCR0);
+ u2_phy_w32(phy, 0x00000402, OFS_U2_PHY_DCR0);
+ u2_phy_r32(phy, OFS_U2_PHY_DCR0);
+ u2_phy_w32(phy, 0x0048086a, OFS_U2_PHY_AC0);
+ u2_phy_w32(phy, 0x4400001c, OFS_U2_PHY_AC1);
+ u2_phy_w32(phy, 0xc0200000, OFS_U2_PHY_ACR3);
+ u2_phy_w32(phy, 0x02000000, OFS_U2_PHY_DTM0);
+}
+
+static int mt76x8_usb_phy_power_on(struct phy *_phy)
+{
+ struct mt76x8_usb_phy *phy = dev_get_priv(_phy->dev);
+ u32 t;
+
+ /* enable the phy */
+ regmap_update_bits(phy->sysctl, RT_SYSC_REG_CLKCFG1,
+ phy->clk, phy->clk);
+
+ /* setup host mode */
+ regmap_update_bits(phy->sysctl, RT_SYSC_REG_SYSCFG1,
+ RT_SYSCFG1_USB0_HOST_MODE,
+ RT_SYSCFG1_USB0_HOST_MODE);
+
+ /*
+ * The SDK kernel had a delay of 100ms. however on device
+ * testing showed that 10ms is enough
+ */
+ mdelay(10);
+
+ if (phy->base)
+ mt76x8_usb_phy_init(phy);
+
+ /* print some status info */
+ regmap_read(phy->sysctl, RT_SYSC_REG_USB_PHY_CFG, &t);
+ printf("remote usb device wakeup %s\n",
+ (t & UDEV_WAKEUP) ? "enabled" : "disabled");
+ if (t & USB_PHY_UTMI_8B60M)
+ printf("UTMI 8bit 60MHz\n");
+ else
+ printf("UTMI 16bit 30MHz\n");
+
+ return 0;
+}
+
+static int mt76x8_usb_phy_power_off(struct phy *_phy)
+{
+ struct mt76x8_usb_phy *phy = dev_get_priv(_phy->dev);
+
+ /* disable the phy */
+ regmap_update_bits(phy->sysctl, RT_SYSC_REG_CLKCFG1,
+ phy->clk, 0);
+
+ return 0;
+}
+
+static int mt76x8_usb_phy_probe(struct udevice *dev)
+{
+ struct mt76x8_usb_phy *phy = dev_get_priv(dev);
+
+ phy->sysctl = syscon_regmap_lookup_by_phandle(dev, "ralink,sysctl");
+ if (IS_ERR(phy->sysctl))
+ return PTR_ERR(phy->sysctl);
+
+ phy->base = dev_read_addr_ptr(dev);
+ if (!phy->base)
+ return -EINVAL;
+
+ return 0;
+}
+
+static struct phy_ops mt76x8_usb_phy_ops = {
+ .power_on = mt76x8_usb_phy_power_on,
+ .power_off = mt76x8_usb_phy_power_off,
+};
+
+static const struct udevice_id mt76x8_usb_phy_ids[] = {
+ { .compatible = "mediatek,mt7628-usbphy" },
+ { }
+};
+
+U_BOOT_DRIVER(mt76x8_usb_phy) = {
+ .name = "mt76x8_usb_phy",
+ .id = UCLASS_PHY,
+ .of_match = mt76x8_usb_phy_ids,
+ .ops = &mt76x8_usb_phy_ops,
+ .probe = mt76x8_usb_phy_probe,
+ .priv_auto_alloc_size = sizeof(struct mt76x8_usb_phy),
+};
--
2.21.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support
2019-04-05 11:44 [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC Stefan Roese
@ 2019-04-05 11:44 ` Stefan Roese
2019-04-10 19:36 ` Daniel Schwierzeck
2019-04-07 18:03 ` [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC Daniel Schwierzeck
1 sibling, 1 reply; 7+ messages in thread
From: Stefan Roese @ 2019-04-05 11:44 UTC (permalink / raw)
To: u-boot
This patch enables USB and file-system support on the LinkIt smart
MT7688 module for both, the normal and the RAM default config.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++-
configs/linkit-smart-7688_defconfig | 14 +++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/configs/linkit-smart-7688-ram_defconfig b/configs/linkit-smart-7688-ram_defconfig
index 2d3ab7e35c..4cb1d7a603 100644
--- a/configs/linkit-smart-7688-ram_defconfig
+++ b/configs/linkit-smart-7688-ram_defconfig
@@ -20,17 +20,21 @@ CONFIG_CMD_MEMINFO=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_PART=y
CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_TIME=y
+CONFIG_CMD_FS_GENERIC=y
+# CONFIG_DOS_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y
# CONFIG_DM_DEVICE_REMOVE is not set
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_BLK=y
CONFIG_CLK=y
CONFIG_LED=y
CONFIG_LED_BLINK=y
@@ -46,6 +50,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_FIXED=y
CONFIG_MT7628_ETH=y
CONFIG_PHY=y
+CONFIG_MT76X8_USB_PHY=y
CONFIG_POWER_DOMAIN=y
CONFIG_RAM=y
CONFIG_DM_RESET=y
@@ -54,5 +59,12 @@ CONFIG_SYS_NS16550=y
CONFIG_SPI=y
CONFIG_MT7621_SPI=y
CONFIG_SYSRESET_SYSCON=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_STORAGE=y
+CONFIG_FS_EXT4=y
+CONFIG_FS_FAT=y
CONFIG_LZMA=y
CONFIG_LZO=y
diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig
index ad34aaf640..dd157795bd 100644
--- a/configs/linkit-smart-7688_defconfig
+++ b/configs/linkit-smart-7688_defconfig
@@ -24,17 +24,21 @@ CONFIG_CMD_MEMINFO=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_PART=y
CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_TIME=y
+CONFIG_CMD_FS_GENERIC=y
+# CONFIG_DOS_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y
# CONFIG_DM_DEVICE_REMOVE is not set
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_BLK=y
CONFIG_CLK=y
CONFIG_LED=y
CONFIG_LED_BLINK=y
@@ -50,6 +54,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_FIXED=y
CONFIG_MT7628_ETH=y
CONFIG_PHY=y
+CONFIG_MT76X8_USB_PHY=y
CONFIG_POWER_DOMAIN=y
CONFIG_RAM=y
CONFIG_DM_RESET=y
@@ -58,5 +63,12 @@ CONFIG_SYS_NS16550=y
CONFIG_SPI=y
CONFIG_MT7621_SPI=y
CONFIG_SYSRESET_SYSCON=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_STORAGE=y
+CONFIG_FS_EXT4=y
+CONFIG_FS_FAT=y
CONFIG_LZMA=y
CONFIG_LZO=y
--
2.21.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC
2019-04-05 11:44 [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC Stefan Roese
2019-04-05 11:44 ` [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support Stefan Roese
@ 2019-04-07 18:03 ` Daniel Schwierzeck
1 sibling, 0 replies; 7+ messages in thread
From: Daniel Schwierzeck @ 2019-04-07 18:03 UTC (permalink / raw)
To: u-boot
Am 05.04.19 um 13:44 schrieb Stefan Roese:
> This driver is derived from this Linux driver:
> linux/drivers/phy/ralink/phy-ralink-usb.c
>
> The driver sets up power and host mode, but also needs to configure PHY
> registers for the MT7628 and MT7688.
>
> I removed the reset controller handling for the USB host and device, as
> it does not seem to be necessary right now. The soft reset bits for both
> devices are enabled by default and testing has shown (with hackish
> reset handling added), that USB related commands work identical with
> or without the reset handling.
>
> Please note that the resulting USB support is tested only very minimal.
> I was able to detect one of my 3 currently available USB sticks.
> Perhaps some further work is needed to fully support the EHCI controller
> integrated in the MT76x8 SoC.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
> drivers/phy/Kconfig | 8 ++
> drivers/phy/Makefile | 1 +
> drivers/phy/mt76x8-usb-phy.c | 161 +++++++++++++++++++++++++++++++++++
> 3 files changed, 170 insertions(+)
> create mode 100644 drivers/phy/mt76x8-usb-phy.c
>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
--
- Daniel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support
2019-04-05 11:44 ` [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support Stefan Roese
@ 2019-04-10 19:36 ` Daniel Schwierzeck
2019-04-11 5:03 ` Stefan Roese
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Schwierzeck @ 2019-04-10 19:36 UTC (permalink / raw)
To: u-boot
Am 05.04.19 um 13:44 schrieb Stefan Roese:
> This patch enables USB and file-system support on the LinkIt smart
> MT7688 module for both, the normal and the RAM default config.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++-
> configs/linkit-smart-7688_defconfig | 14 +++++++++++++-
> 2 files changed, 26 insertions(+), 2 deletions(-)
there are now conflicts with current master branch. Could you check and
resend?
>
> diff --git a/configs/linkit-smart-7688-ram_defconfig b/configs/linkit-smart-7688-ram_defconfig
> index 2d3ab7e35c..4cb1d7a603 100644
> --- a/configs/linkit-smart-7688-ram_defconfig
> +++ b/configs/linkit-smart-7688-ram_defconfig
> @@ -20,17 +20,21 @@ CONFIG_CMD_MEMINFO=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> # CONFIG_CMD_LOADS is not set
> +CONFIG_CMD_PART=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> +CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_TIME=y
> +CONFIG_CMD_FS_GENERIC=y
> +# CONFIG_DOS_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_NET_RANDOM_ETHADDR=y
> # CONFIG_DM_DEVICE_REMOVE is not set
> -CONFIG_HAVE_BLOCK_DEVICE=y
> +CONFIG_BLK=y
> CONFIG_CLK=y
> CONFIG_LED=y
> CONFIG_LED_BLINK=y
> @@ -46,6 +50,7 @@ CONFIG_PHYLIB=y
> CONFIG_PHY_FIXED=y
> CONFIG_MT7628_ETH=y
> CONFIG_PHY=y
> +CONFIG_MT76X8_USB_PHY=y
> CONFIG_POWER_DOMAIN=y
> CONFIG_RAM=y
> CONFIG_DM_RESET=y
> @@ -54,5 +59,12 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_MT7621_SPI=y
> CONFIG_SYSRESET_SYSCON=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> +CONFIG_USB_STORAGE=y
> +CONFIG_FS_EXT4=y
> +CONFIG_FS_FAT=y
> CONFIG_LZMA=y
> CONFIG_LZO=y
> diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig
> index ad34aaf640..dd157795bd 100644
> --- a/configs/linkit-smart-7688_defconfig
> +++ b/configs/linkit-smart-7688_defconfig
> @@ -24,17 +24,21 @@ CONFIG_CMD_MEMINFO=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> # CONFIG_CMD_LOADS is not set
> +CONFIG_CMD_PART=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_SPI=y
> +CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_TIME=y
> +CONFIG_CMD_FS_GENERIC=y
> +# CONFIG_DOS_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_NET_RANDOM_ETHADDR=y
> # CONFIG_DM_DEVICE_REMOVE is not set
> -CONFIG_HAVE_BLOCK_DEVICE=y
> +CONFIG_BLK=y
> CONFIG_CLK=y
> CONFIG_LED=y
> CONFIG_LED_BLINK=y
> @@ -50,6 +54,7 @@ CONFIG_PHYLIB=y
> CONFIG_PHY_FIXED=y
> CONFIG_MT7628_ETH=y
> CONFIG_PHY=y
> +CONFIG_MT76X8_USB_PHY=y
> CONFIG_POWER_DOMAIN=y
> CONFIG_RAM=y
> CONFIG_DM_RESET=y
> @@ -58,5 +63,12 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_MT7621_SPI=y
> CONFIG_SYSRESET_SYSCON=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> +CONFIG_USB_STORAGE=y
> +CONFIG_FS_EXT4=y
> +CONFIG_FS_FAT=y
> CONFIG_LZMA=y
> CONFIG_LZO=y
>
--
- Daniel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support
2019-04-10 19:36 ` Daniel Schwierzeck
@ 2019-04-11 5:03 ` Stefan Roese
2019-04-11 7:48 ` Daniel Schwierzeck
0 siblings, 1 reply; 7+ messages in thread
From: Stefan Roese @ 2019-04-11 5:03 UTC (permalink / raw)
To: u-boot
Hi Daniel,
On 10.04.19 21:36, Daniel Schwierzeck wrote:
>
>
> Am 05.04.19 um 13:44 schrieb Stefan Roese:
>> This patch enables USB and file-system support on the LinkIt smart
>> MT7688 module for both, the normal and the RAM default config.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>> ---
>> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++-
>> configs/linkit-smart-7688_defconfig | 14 +++++++++++++-
>> 2 files changed, 26 insertions(+), 2 deletions(-)
>
> there are now conflicts with current master branch. Could you check and
> resend?
Are you sure? I just rebased on the current master branch and it
applies clean and the resulting patch is identical with the old
one.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support
2019-04-11 5:03 ` Stefan Roese
@ 2019-04-11 7:48 ` Daniel Schwierzeck
2019-04-11 8:38 ` Stefan Roese
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Schwierzeck @ 2019-04-11 7:48 UTC (permalink / raw)
To: u-boot
Am 11.04.19 um 07:03 schrieb Stefan Roese:
> Hi Daniel,
>
> On 10.04.19 21:36, Daniel Schwierzeck wrote:
>>
>>
>> Am 05.04.19 um 13:44 schrieb Stefan Roese:
>>> This patch enables USB and file-system support on the LinkIt smart
>>> MT7688 module for both, the normal and the RAM default config.
>>>
>>> Signed-off-by: Stefan Roese <sr@denx.de>
>>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>>> ---
>>> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++-
>>> configs/linkit-smart-7688_defconfig | 14 +++++++++++++-
>>> 2 files changed, 26 insertions(+), 2 deletions(-)
>>
>> there are now conflicts with current master branch. Could you check and
>> resend?
>
> Are you sure? I just rebased on the current master branch and it
> applies clean and the resulting patch is identical with the old
> one.
>
ok sorry, the conflict is only with u-boot-mips/next because of your
previous patch "mips: mt76xx: linkit: Add mtd command support".
I've applied the patch on u-boot-mips/next. Could you check if the
conflict resolution is correct? Thanks.
--
- Daniel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support
2019-04-11 7:48 ` Daniel Schwierzeck
@ 2019-04-11 8:38 ` Stefan Roese
0 siblings, 0 replies; 7+ messages in thread
From: Stefan Roese @ 2019-04-11 8:38 UTC (permalink / raw)
To: u-boot
On 11.04.19 09:48, Daniel Schwierzeck wrote:
>
>
> Am 11.04.19 um 07:03 schrieb Stefan Roese:
>> Hi Daniel,
>>
>> On 10.04.19 21:36, Daniel Schwierzeck wrote:
>>>
>>>
>>> Am 05.04.19 um 13:44 schrieb Stefan Roese:
>>>> This patch enables USB and file-system support on the LinkIt smart
>>>> MT7688 module for both, the normal and the RAM default config.
>>>>
>>>> Signed-off-by: Stefan Roese <sr@denx.de>
>>>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>>>> ---
>>>> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++-
>>>> configs/linkit-smart-7688_defconfig | 14 +++++++++++++-
>>>> 2 files changed, 26 insertions(+), 2 deletions(-)
>>>
>>> there are now conflicts with current master branch. Could you check and
>>> resend?
>>
>> Are you sure? I just rebased on the current master branch and it
>> applies clean and the resulting patch is identical with the old
>> one.
>>
>
> ok sorry, the conflict is only with u-boot-mips/next because of your
> previous patch "mips: mt76xx: linkit: Add mtd command support".
I see.
> I've applied the patch on u-boot-mips/next. Could you check if the
> conflict resolution is correct? Thanks.
Patch looks good in your tree. So please continue with it.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-04-11 8:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-05 11:44 [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC Stefan Roese
2019-04-05 11:44 ` [U-Boot] [PATCH 2/2] mips: mt76xx: linkit-smart-7688: Enable USB and FS support Stefan Roese
2019-04-10 19:36 ` Daniel Schwierzeck
2019-04-11 5:03 ` Stefan Roese
2019-04-11 7:48 ` Daniel Schwierzeck
2019-04-11 8:38 ` Stefan Roese
2019-04-07 18:03 ` [U-Boot] [PATCH 1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC Daniel Schwierzeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.