From c46afcb6dea85d23af7d1974bae328dfd8dd2075 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 17 Dec 2020 17:56:05 +0900 Subject: [PATCH] ODROID: Fix compile error. We are rebuilding kernel commits. --- drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 5 ----- drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c | 2 ++ drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index 3fa05c09ca83..fed19eac87a3 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -5728,11 +5728,6 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev) ret = of_property_read_u32(pdev->dev.of_node, "ic_type", &(hdmitx_device.chip_type)); - /* Get dongle_mode information */ - ret = of_property_read_u32(pdev->dev.of_node, "dongle_mode", - &dongle_mode); - hdmitx_device.dongle_mode = !!dongle_mode; - ret = of_property_read_u32(pdev->dev.of_node, "repeater_tx", &val); if (!ret) diff --git a/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c b/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c index b165a026da0e..0cbe665c284e 100644 --- a/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c +++ b/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c @@ -275,6 +275,8 @@ static int amlogic_new_usb2_probe(struct platform_device *pdev) struct resource *phy_cfg_mem[4]; void __iomem *phy_base; void __iomem *reset_base = NULL; + const char *gpio_name = NULL; + struct gpio_desc *usb_gd = NULL; void __iomem *phy_cfg_base[4] = {NULL, NULL, NULL, NULL}; int portnum = 0; int phy_version = 0; diff --git a/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c b/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c index a976245da236..7aaaf8bf68b0 100644 --- a/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c +++ b/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c @@ -508,10 +508,6 @@ static int amlogic_new_usb3_v2_probe(struct platform_device *pdev) int ret; struct device_node *tsi_pci; u32 pwr_ctl = 0; - u32 u3_ctrl_sleep_shift = 0; - u32 u3_hhi_mem_pd_shift = 0; - u32 u3_hhi_mem_pd_mask = 0; - u32 u3_ctrl_iso_shift = 0; #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) struct gpio_desc *huben_gd = NULL; struct gpio_desc *hubrst_gd = NULL;