select SOC_BRCMSTB if ARCH_BRCMSTB
--- a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
+++ b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
-@@ -335,6 +335,36 @@ static void usb_init_common_7216(struct
+@@ -341,6 +341,36 @@ static void usb_init_common_7216(struct
usb_init_common(params);
}
static void usb_init_xhci(struct brcm_usb_init_params *params)
{
pr_debug("%s\n", __func__);
-@@ -380,6 +410,18 @@ static void usb_uninit_common_7211b0(str
+@@ -386,6 +416,18 @@ static void usb_uninit_common_7211b0(str
}
static void usb_uninit_xhci(struct brcm_usb_init_params *params)
{
-@@ -434,6 +476,16 @@ static const struct brcm_usb_init_ops bc
+@@ -440,6 +482,16 @@ static const struct brcm_usb_init_ops bc
.set_dual_select = usb_set_dual_select,
};
void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params)
{
-@@ -451,3 +503,10 @@ void brcm_usb_dvr_init_7211b0(struct brc
+@@ -457,3 +509,10 @@ void brcm_usb_dvr_init_7211b0(struct brc
params->family_name = "7211";
params->ops = &bcm7211b0_ops;
}
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
-@@ -58,9 +58,13 @@
+@@ -59,9 +59,13 @@
#define WDT_SWSYSRST 0x18U
#define WDT_SWSYS_RST_KEY 0x88000000
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int timeout;
-@@ -71,10 +75,12 @@ struct mtk_wdt_dev {
+@@ -72,10 +76,12 @@ struct mtk_wdt_dev {
struct reset_controller_dev rcdev;
bool disable_wdt_extrst;
bool reset_by_toprgu;
};
static const struct mtk_wdt_data mt2712_data = {
-@@ -89,6 +95,11 @@ static const struct mtk_wdt_data mt7986_
+@@ -94,6 +100,11 @@ static const struct mtk_wdt_data mt7986_
.toprgu_sw_rst_num = MT7986_TOPRGU_SW_RST_NUM,
};
static const struct mtk_wdt_data mt8183_data = {
.toprgu_sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
};
-@@ -109,6 +120,28 @@ static const struct mtk_wdt_data mt8195_
+@@ -114,6 +125,28 @@ static const struct mtk_wdt_data mt8195_
.toprgu_sw_rst_num = MT8195_TOPRGU_SW_RST_NUM,
};
static int toprgu_reset_update(struct reset_controller_dev *rcdev,
unsigned long id, bool assert)
{
-@@ -119,6 +152,9 @@ static int toprgu_reset_update(struct re
+@@ -124,6 +157,9 @@ static int toprgu_reset_update(struct re
spin_lock_irqsave(&data->lock, flags);
tmp = readl(data->wdt_base + WDT_SWSYSRST);
if (assert)
tmp |= BIT(id);
-@@ -127,6 +163,9 @@ static int toprgu_reset_update(struct re
+@@ -132,6 +168,9 @@ static int toprgu_reset_update(struct re
tmp |= WDT_SWSYS_RST_KEY;
writel(tmp, data->wdt_base + WDT_SWSYSRST);
spin_unlock_irqrestore(&data->lock, flags);
return 0;
-@@ -412,6 +451,8 @@ static int mtk_wdt_probe(struct platform
+@@ -417,6 +456,8 @@ static int mtk_wdt_probe(struct platform
wdt_data->toprgu_sw_rst_num);
if (err)
return err;
}
mtk_wdt->disable_wdt_extrst =
-@@ -450,6 +491,7 @@ static const struct of_device_id mtk_wdt
- { .compatible = "mediatek,mt6589-wdt" },
+@@ -456,6 +497,7 @@ static const struct of_device_id mtk_wdt
+ { .compatible = "mediatek,mt6735-wdt", .data = &mt6735_data },
{ .compatible = "mediatek,mt6795-wdt", .data = &mt6795_data },
{ .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data },
+ { .compatible = "mediatek,mt7988-wdt", .data = &mt7988_data },