Re: [PATCH 3/3] usb: gadget: atmel: Add DM_USB_GADGET support
On 7/22/24 10:47 AM, Zixun LI wrote: Add driver model support by using the uclass UCLASS_USB_GADGET_GENERIC. Disable local usb_gadget_register_driver()/usb_gadget_unregister_driver() implementation which is implemented in udc-core.c when DM_USB_GADGET is enabled. Compared to Linux driver only supported devices' DT bindings are included (sorted as Linux driver) Signed-off-by: Zixun LI --- drivers/usb/gadget/atmel_usba_udc.c | 128 1 file changed, 128 insertions(+) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 48d66d9774..664d33f525 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -8,10 +8,13 @@ */ #include +#include #include #include #include #include +#include +#include #include #include #include @@ -19,6 +22,10 @@ #include #include +#if CONFIG_IS_ENABLED(DM_USB_GADGET) +#include +#endif /* CONFIG_IS_ENABLED(DM_USB_GADGET) */ + #include "atmel_usba_udc.h" static struct usba_udc *controller; @@ -1200,6 +1207,7 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev) return usba_udc_irq(udc); } +#if !CONFIG_IS_ENABLED(DM_USB_GADGET) int usb_gadget_register_driver(struct usb_gadget_driver *driver) { struct usba_udc *udc = controller; @@ -1245,6 +1253,49 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) return 0; } +#else /* !CONFIG_IS_ENABLED(DM_USB_GADGET) */ + +static int usba_gadget_start(struct usb_gadget *g, +struct usb_gadget_driver *driver) +{ + struct usba_udc *udc = controller; + + if (!driver || !driver->bind || !driver->setup) { + log_err("bad parameter\n"); This check is unnecessary, please remove. + return -EINVAL; + } + + if (udc->driver) { This check is unnecessary, please remove. + log_err("UDC already has a gadget driver\n"); + return -EBUSY; + } + + usba_enable(udc); + + udc->driver = driver; + + return 0; +} The rest looks pretty good, thanks !
Re: [PATCH 2/3] usb: gadget: atmel: Add attach/detach support
On 7/22/24 10:47 AM, Zixun LI wrote: Add controller attach/detach support by using usb_gadget_ops.pullup() method. Signed-off-by: Zixun LI --- drivers/usb/gadget/atmel_usba_udc.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 327e90a786..48d66d9774 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1176,6 +1176,23 @@ static int usba_disable(struct usba_udc *udc) return 0; } +static int usba_gadget_pullup(struct usb_gadget *g, int is_on) +{ + struct usba_udc *udc = controller; + u32 ctrl; + + ctrl = usba_readl(udc, CTRL); + + if (is_on) + ctrl &= ~USBA_DETACH; + else + ctrl |= USBA_DETACH; + + usba_writel(udc, CTRL, ctrl); + + return 0; +} + int dm_usb_gadget_handle_interrupts(struct udevice *dev) { struct usba_udc *udc = controller; @@ -1273,6 +1290,7 @@ static const struct usb_gadget_ops usba_udc_ops = { .get_frame = usba_udc_get_frame, .wakeup = usba_udc_wakeup, .set_selfpowered= usba_udc_set_selfpowered, + .pullup = usba_gadget_pullup, The function should probably be called usba_udc_pullup() to be consistent with the names of the other functions.
Re: [PATCH 1/3] usb: gadget: atmel: Code refactor
On 7/22/24 10:47 AM, Zixun LI wrote: - Sort includes - Forward declare controller structure - Rename _start() / _stop() to _enable() / _disable() inline with other drivers, avoid confusion with DM start() stop() functions. - Replace printf() by log_err() - Spelling paramter -> parameter Signed-off-by: Zixun LI --- drivers/usb/gadget/atmel_usba_udc.c | 77 +++-- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index f99553df8d..327e90a786 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -7,19 +7,22 @@ * Bo Shen */ -#include -#include +#include +#include +#include #include #include +#include +#include #include -#include #include #include #include -#include #include "atmel_usba_udc.h" +static struct usba_udc *controller; + static int vbus_is_present(struct usba_udc *udc) { /* No Vbus detection: Assume always present */ @@ -506,12 +509,6 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered) return 0; } -static const struct usb_gadget_ops usba_udc_ops = { - .get_frame = usba_udc_get_frame, - .wakeup = usba_udc_wakeup, - .set_selfpowered= usba_udc_set_selfpowered, -}; - static struct usb_endpoint_descriptor usba_ep0_desc = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, @@ -1153,7 +1150,7 @@ static int usba_udc_irq(struct usba_udc *udc) return 0; } -static int atmel_usba_start(struct usba_udc *udc) +static int usba_enable(struct usba_udc *udc) Is there any specific reason for the removal of this atmel_ prefix from the functions ?
Re: [PATCH RFC] usb: gadget: atmel: Add DM_USB_GADGET support
On 7/20/24 12:35 AM, Zixun Li wrote: Add driver model support by using the uclass UCLASS_USB_GADGET_GENERIC. Disable local usb_gadget_register_driver()/usb_gadget_unregister_driver() implementation which is implemented in udc-core.c when DM_USB_GADGET is enabled. Compared to Linux driver sam9x60 and sama7g5 DT bindings are not included as they are not supported by the driver yet. Signed-off-by: Zixun LI +CC Mattijs --- drivers/usb/gadget/atmel_usba_udc.c | 196 1 file changed, 169 insertions(+), 27 deletions(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index f99553df8d..40e8b895a0 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -17,9 +17,19 @@ #include #include #include +#include +#include +#include +#include Keep the list sorted +#if CONFIG_IS_ENABLED(DM_USB_GADGET) +#include +#endif /* CONFIG_IS_ENABLED(DM_USB_GADGET) */ #include "atmel_usba_udc.h" +static struct usba_udc *controller; + static int vbus_is_present(struct usba_udc *udc) { /* No Vbus detection: Assume always present */ @@ -506,12 +516,6 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered) return 0; } -static const struct usb_gadget_ops usba_udc_ops = { - .get_frame = usba_udc_get_frame, - .wakeup = usba_udc_wakeup, - .set_selfpowered= usba_udc_set_selfpowered, -}; - static struct usb_endpoint_descriptor usba_ep0_desc = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, @@ -1153,7 +1157,7 @@ static int usba_udc_irq(struct usba_udc *udc) return 0; } -static int atmel_usba_start(struct usba_udc *udc) +static int usba_enable(struct usba_udc *udc) Please factor out such rename (if it is even necessary) into a separate preparatory patch, it makes the review easier. { udc->devstatus = 1 << USB_DEVICE_SELF_POWERED; @@ -1168,7 +1172,7 @@ static int atmel_usba_start(struct usba_udc *udc) return 0; } -static int atmel_usba_stop(struct usba_udc *udc) +static int usba_disable(struct usba_udc *udc) { udc->gadget.speed = USB_SPEED_UNKNOWN; reset_all_endpoints(udc); @@ -1179,28 +1183,29 @@ static int atmel_usba_stop(struct usba_udc *udc) return 0; } -static struct usba_udc controller = { - .regs = (unsigned *)ATMEL_BASE_UDPHS, - .fifo = (unsigned *)ATMEL_BASE_UDPHS_FIFO, - .gadget = { - .ops= _udc_ops, - .ep_list= LIST_HEAD_INIT(controller.gadget.ep_list), - .speed = USB_SPEED_HIGH, - .is_dualspeed = 1, - .name = "atmel_usba_udc", - }, -}; +static int usba_gadget_pullup(struct usb_gadget *g, int is_on) +{ + struct usba_udc *udc = controller; + u32 ctrl; + + ctrl = usba_readl(udc, CTRL); if (is_on) ctrl &= ~USBA_DETACH; else ctrl |= USBA_DETACH; usba_writel(udc, ctrl); Should help readability. If this is moved code, do this in a preparatory patch please. + usba_writel(udc, CTRL, is_on ? ctrl & ~USBA_DETACH : ctrl | USBA_DETACH); + + return 0; +} int dm_usb_gadget_handle_interrupts(struct udevice *dev) { - struct usba_udc *udc = + struct usba_udc *udc = controller; return usba_udc_irq(udc); } +#if !CONFIG_IS_ENABLED(DM_USB_GADGET) int usb_gadget_register_driver(struct usb_gadget_driver *driver) { - struct usba_udc *udc = + struct usba_udc *udc = controller; int ret; if (!driver || !driver->bind || !driver->setup) { @@ -1213,7 +1218,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) return -EBUSY; } - atmel_usba_start(udc); + usba_enable(udc); Should be in preparatory patch. udc->driver = driver; @@ -1228,7 +1233,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) { - struct usba_udc *udc = + struct usba_udc *udc = controller; Should be in one of preparatory patches. if (!driver || !driver->unbind || !driver->disconnect) { pr_err("bad paramter\n"); @@ -1239,11 +1244,54 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) driver->unbind(>gadget); udc->driver = NULL; - atmel_usba_stop(udc); + usba_disable(udc); + + return 0; +} +#else /* !CONFIG_IS_ENABLED(DM_USB_GADGET) */ + +static int usba_gadget_start(struct usb_gadget *g, +struct usb_gadget_driver *driver) +{ + struct usba_udc *udc = controller; + + if (!driver || !driver->bind || !driver->setup) { + printf("bad parameter\n"); Use log_ or dev_err + return -EINVAL; +
Re: usb gadget driver initialization issue
On 7/20/24 1:21 PM, Zixun Li wrote: Hi, Hi, In udc_bind_to_driver(), USB device controller is initialized by usb_gadget_udc_start() and entered connected state by usb_gadget_connect(). From the host's point of view, a device is ready to be enumerated. However, since dm_usb_gadget_handle_interrupts() is only called inside function driver, at this stage USB events are not managed, host's enumeration attempts will fail and resulting error like: usb 1-1: new high-speed USB device number 50 using xhci_hcd usb 1-1: device descriptor read/64, error -110 usb 1-1: device descriptor read/64, error -110 usb usb1-port1: attempt power cycle I think it's better to leave the device in disconnected state while probing and connect it once a gadget function is invoked. Can you please send an RFC patch ? I see recently there are many DM related reworking, please forgive me if it's already on the Todo list. It is not on the ToDo list, no. +CC Mattijs
[PATCH 40/40] drivers: watchdog: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/watchdog/meson_gxbb_wdt.c| 1 - drivers/watchdog/sandbox_alarm-wdt.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c index 01a35b3ab30..fced8f3686b 100644 --- a/drivers/watchdog/meson_gxbb_wdt.c +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -24,7 +24,6 @@ #define GXBB_WDT_CTRL_DIV_MASK GENMASK(17, 0) #define GXBB_WDT_TCNT_SETUP_MASK GENMASK(15, 0) - struct amlogic_wdt_priv { void __iomem *reg_base; }; diff --git a/drivers/watchdog/sandbox_alarm-wdt.c b/drivers/watchdog/sandbox_alarm-wdt.c index 8dbbfc249e7..a7ffca96216 100644 --- a/drivers/watchdog/sandbox_alarm-wdt.c +++ b/drivers/watchdog/sandbox_alarm-wdt.c @@ -56,7 +56,6 @@ static int alarm_wdt_expire_now(struct udevice *dev, ulong flags) return 0; } - static const struct wdt_ops alarm_wdt_ops = { .start = alarm_wdt_start, .reset = alarm_wdt_reset, -- 2.43.0
[PATCH 39/40] drivers: video: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/video/broadwell_igd.c | 1 - drivers/video/console_rotate.c| 1 - drivers/video/dw_hdmi.c | 1 - drivers/video/exynos/exynos_dp.c | 1 - drivers/video/exynos/exynos_dp_lowlevel.c | 1 - drivers/video/imx/ipu.h | 1 - drivers/video/imx/ipu_common.c| 4 drivers/video/imx/ipu_regs.h | 2 -- drivers/video/mvebu_lcd.c | 1 - drivers/video/pwm_backlight.c | 1 - drivers/video/rockchip/rk_edp.c | 2 -- drivers/video/rockchip/rk_mipi.h | 1 - drivers/video/stb_truetype.h | 10 -- drivers/video/sunxi/tve_common.c | 1 - drivers/video/tegra124/dp.c | 1 - drivers/video/videomodes.h| 1 - 16 files changed, 30 deletions(-) diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index a26154ab588..03b37fd8a9e 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -319,7 +319,6 @@ err: return ret; }; - static unsigned long gtt_read(struct broadwell_igd_priv *priv, unsigned long reg) { diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c index dc969836274..a3f8c6352f8 100644 --- a/drivers/video/console_rotate.c +++ b/drivers/video/console_rotate.c @@ -100,7 +100,6 @@ static int console_putc_xy_1(struct udevice *dev, uint x_frac, uint y, int cp) return VID_TO_POS(fontdata->width); } - static int console_set_row_2(struct udevice *dev, uint row, int clr) { struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent); diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c index 35559cef229..1bf65fbd89e 100644 --- a/drivers/video/dw_hdmi.c +++ b/drivers/video/dw_hdmi.c @@ -762,7 +762,6 @@ static void hdmi_audio_set_format(struct dw_hdmi *hdmi) hdmi_write(hdmi, HDMI_AUD_CONF0_I2S_SELECT | HDMI_AUD_CONF0_I2S_IN_EN_0, HDMI_AUD_CONF0); - hdmi_write(hdmi, HDMI_AUD_CONF1_I2S_MODE_STANDARD_MODE | HDMI_AUD_CONF1_I2S_WIDTH_16BIT, HDMI_AUD_CONF1); diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c index b0afb2338fb..d17cea396fe 100644 --- a/drivers/video/exynos/exynos_dp.c +++ b/drivers/video/exynos/exynos_dp.c @@ -1064,7 +1064,6 @@ int exynos_dp_enable(struct udevice *dev, int panel_bpp, return ret; } - static const struct dm_display_ops exynos_dp_ops = { .enable = exynos_dp_enable, }; diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c index f007b319b20..552524d838d 100644 --- a/drivers/video/exynos/exynos_dp_lowlevel.c +++ b/drivers/video/exynos/exynos_dp_lowlevel.c @@ -65,7 +65,6 @@ void exynos_dp_enable_video_mute(struct exynos_dp *dp_regs, unsigned int enable) return; } - static void exynos_dp_init_analog_param(struct exynos_dp *dp_regs) { unsigned int reg; diff --git a/drivers/video/imx/ipu.h b/drivers/video/imx/ipu.h index 1e02c7ab6d5..4c13c9342f7 100644 --- a/drivers/video/imx/ipu.h +++ b/drivers/video/imx/ipu.h @@ -143,7 +143,6 @@ enum ipu_dmfc_type { DMFC_HIGH_RESOLUTION_ONLY_DP, }; - /* * Union of initialization parameters for a logical channel. */ diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c index d582fb8ad9d..bd1ef0a800d 100644 --- a/drivers/video/imx/ipu_common.c +++ b/drivers/video/imx/ipu_common.c @@ -204,7 +204,6 @@ static void clk_ipu_disable(struct clk *clk) #endif } - static struct clk ipu_clk = { .name = "ipu_clk", #if defined(CONFIG_MX51) || defined(CONFIG_MX53) @@ -272,7 +271,6 @@ static inline int ipu_is_dmfc_chan(uint32_t dma_chan) return ((dma_chan >= 23) && (dma_chan <= 29)); } - static inline void ipu_ch_param_set_buffer(uint32_t ch, int bufNum, dma_addr_t phyaddr) { @@ -588,7 +586,6 @@ int32_t ipu_init_channel(ipu_channel_t channel, ipu_channel_params_t *params) clk_enable(g_ipu_clk); } - if (g_channel_init_mask & (1L << IPU_CHAN_ID(channel))) { printf("Warning: channel already initialized %d\n", IPU_CHAN_ID(channel)); @@ -954,7 +951,6 @@ static void ipu_ch_param_init(int ch, break; } - if (uv_stride) ipu_ch_param_set_field(, 1, 128, 14, uv_stride - 1); diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h index deb44002d75..8d6ec4845f4 100644 --- a/drivers/video/imx/ipu_regs.h +++ b/drivers/video/imx/ipu_regs.h @@ -353,13 +353,11 @@ struct ipu_dmfc { #define DMFC_GENERAL1 (_REG->general[0]) #define DMFC_IC_CTRL (_REG->ic_c
[PATCH 38/40] drivers: usb: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/usb/dwc3/dwc3-generic.c| 1 - drivers/usb/dwc3/gadget.c | 1 - drivers/usb/dwc3/samsung_usb_phy.c | 1 - drivers/usb/eth/asix.c | 1 - drivers/usb/eth/asix88179.c| 1 - drivers/usb/gadget/config.c| 2 -- drivers/usb/gadget/core.c | 12 drivers/usb/gadget/dwc2_udc_otg_regs.h | 1 - drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 4 drivers/usb/gadget/ep0.c | 4 drivers/usb/gadget/ep0.h | 2 -- drivers/usb/gadget/epautoconf.c| 1 - drivers/usb/gadget/ether.c | 4 drivers/usb/gadget/f_mass_storage.c| 19 --- drivers/usb/gadget/f_sdp.c | 1 - drivers/usb/gadget/ndis.h | 2 -- drivers/usb/gadget/rndis.c | 3 --- drivers/usb/gadget/rndis.h | 1 - drivers/usb/gadget/storage_common.c| 3 --- drivers/usb/host/ehci-mx5.c| 1 - drivers/usb/host/ohci.h| 6 -- drivers/usb/host/xhci-mem.c| 1 - drivers/usb/musb-new/musb_core.c | 6 -- drivers/usb/musb-new/musb_core.h | 1 - drivers/usb/musb-new/musb_dma.h| 1 - drivers/usb/musb-new/musb_gadget.c | 4 drivers/usb/musb-new/musb_gadget.h | 1 - drivers/usb/musb-new/musb_gadget_ep0.c | 2 -- drivers/usb/musb-new/musb_host.c | 6 -- drivers/usb/musb-new/musb_host.h | 1 - drivers/usb/musb-new/musb_io.h | 2 -- drivers/usb/musb-new/musb_regs.h | 1 - drivers/usb/musb/omap3.c | 1 - drivers/usb/phy/rockchip_usb2_phy.c| 1 - 34 files changed, 99 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 731ede2fead..a9ba315463c 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -131,7 +131,6 @@ static int dwc3_generic_probe(struct udevice *dev, priv->base = map_physmem(plat->base, DWC3_OTG_REGS_END, MAP_NOCACHE); dwc3->regs = priv->base + DWC3_GLOBALS_REGS_START; - rc = dwc3_init(dwc3); if (rc) { unmap_physmem(priv->base, MAP_NOCACHE); diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 8f08fda746d..fe33e307d3e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -754,7 +754,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep, dep->name, req, (unsigned long long)dma, length, last ? " last" : "", chain ? " chain" : ""); - trb = >trb_pool[dep->free_slot & DWC3_TRB_MASK]; if (!req->trb) { diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c index 0a771308163..3563070cb85 100644 --- a/drivers/usb/dwc3/samsung_usb_phy.c +++ b/drivers/usb/dwc3/samsung_usb_phy.c @@ -26,7 +26,6 @@ void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy) PHYPARAM0_REF_LOSLEVEL_MASK); setbits_le32(>phy_param0, PHYPARAM0_REF_LOSLEVEL); - writel(0x0, >phy_resume); /* diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index c5a01ec922b..40a6e9291de 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -96,7 +96,6 @@ #define FLAG_TYPE_AX88772B (1U << 2) #define FLAG_EEPROM_MAC(1U << 3) /* initial mac address in eeprom */ - /* driver private */ struct asix_private { int flags; diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index a0aa5c25e42..4bd3b9d10dc 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -392,7 +392,6 @@ static int asix_init_common(struct ueth_data *dev, u8 buf[2], tmp[5], link_sts; u16 *tmp16, mode; - tmp16 = (u16 *)buf; debug("** %s()\n", __func__); diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index 1363ef9e73d..e41b1d964ea 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -16,7 +16,6 @@ #include #include - /** * usb_descriptor_fillbuf - fill buffer with descriptors * @buf: Buffer to be filled @@ -51,7 +50,6 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen, return dest - (u8 *)buf; } - /** * usb_gadget_config_buf - builts a complete configuration descriptor * @config: Header for the descriptor, including characteristics such diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 888f0cfea66..bcb1ad3082c 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/co
[PATCH 37/40] drivers: tpm: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/tpm/tpm2_tis_spi.c | 1 - drivers/tpm/tpm_tis_lpc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index b0fe97ab1d0..d35a4dd3a36 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -175,7 +175,6 @@ static int tpm_tis_spi_read32(struct udevice *dev, u32 addr, u32 *result) return ret; } - static int tpm_tis_spi_write(struct udevice *dev, u32 addr, u16 len, const u8 *out) { return tpm_tis_spi_xfer(dev, addr, out, NULL, len); diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c index dec7acb0c7b..e53af25a456 100644 --- a/drivers/tpm/tpm_tis_lpc.c +++ b/drivers/tpm/tpm_tis_lpc.c @@ -453,7 +453,6 @@ static int tpm_tis_lpc_get_desc(struct udevice *dev, char *buf, int size) chip_name[chip_type]); } - static const struct tpm_ops tpm_tis_lpc_ops = { .open = tpm_tis_lpc_open, .close = tpm_tis_lpc_close, -- 2.43.0
[PATCH 36/40] drivers: timer: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/timer/arc_timer.c | 1 - drivers/timer/sp804_timer.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c index 413bcc32f01..6ad520c10aa 100644 --- a/drivers/timer/arc_timer.c +++ b/drivers/timer/arc_timer.c @@ -89,7 +89,6 @@ static int arc_timer_probe(struct udevice *dev) return 0; } - static const struct timer_ops arc_timer_ops = { .get_count = arc_timer_get_count, }; diff --git a/drivers/timer/sp804_timer.c b/drivers/timer/sp804_timer.c index a254e295cbf..3e57f4b98ba 100644 --- a/drivers/timer/sp804_timer.c +++ b/drivers/timer/sp804_timer.c @@ -29,7 +29,6 @@ DECLARE_GLOBAL_DATA_PTR; #define SP804_CTRL_TIMER_32BIT (1U << 1) #define SP804_CTRL_ONESHOT (1U << 0) - struct sp804_timer_plat { uintptr_t base; }; -- 2.43.0
[PATCH 35/40] drivers: thermal: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/thermal/thermal-uclass.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/thermal/thermal-uclass.c b/drivers/thermal/thermal-uclass.c index f0fe912e313..c61e6c3ee0e 100644 --- a/drivers/thermal/thermal-uclass.c +++ b/drivers/thermal/thermal-uclass.c @@ -13,7 +13,6 @@ #include #include - int thermal_get_temp(struct udevice *dev, int *temp) { const struct dm_thermal_ops *ops = device_get_ops(dev); -- 2.43.0
[PATCH 34/40] drivers: sysreset: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/sysreset/sysreset-uclass.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c index 0abb4042e0f..d30b008bf9a 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -117,7 +117,6 @@ void reset_cpu(void) sysreset_walk_halt(SYSRESET_WARM); } - #if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { -- 2.43.0
[PATCH 33/40] drivers: spi: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/spi/atcspi200_spi.c | 1 - drivers/spi/ath79_spi.c | 1 - drivers/spi/davinci_spi.c| 1 - drivers/spi/mxc_spi.c| 1 - drivers/spi/spi-aspeed-smc.c | 1 - drivers/spi/zynq_spi.c | 1 - 6 files changed, 6 deletions(-) diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 929bf90458c..2178534baf0 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -186,7 +186,6 @@ static int __nspi_espi_rx(struct nds_spi_slave *ns, void *din, unsigned int byte return bytes; } - static int __atcspi200_spi_xfer(struct nds_spi_slave *ns, unsigned int bitlen, const void *data_out, void *data_in, unsigned long flags) diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index faefac71260..fb2d77d7d4a 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -133,7 +133,6 @@ static int ath79_spi_xfer(struct udevice *dev, unsigned int bitlen, return 0; } - static int ath79_spi_set_speed(struct udevice *bus, uint speed) { struct ath79_spi_priv *priv = dev_get_priv(bus); diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 04c134be9ed..82049872d05 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -207,7 +207,6 @@ static int davinci_spi_read_write(struct davinci_spi_slave *ds, unsigned return 0; } - static int __davinci_spi_claim_bus(struct davinci_spi_slave *ds, int cs) { unsigned int mode = 0, scalar; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index ff61a14f095..e7c393ae188 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -622,7 +622,6 @@ static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct mxc_spi_slave *mxcs = dev_get_plat(dev->parent); - return mxc_spi_xfer_internal(mxcs, bitlen, dout, din, flags); } diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index d91d58da459..12320367e97 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -960,7 +960,6 @@ static int aspeed_spi_ctrl_init(struct udevice *bus) return 0; } - ret = aspeed_spi_read_fixed_decoded_ranges(bus); if (ret != 0) return ret; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index ebcb5b6cc88..d15d91a1d24 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -53,7 +53,6 @@ struct zynq_spi_regs { u32 rxdr; /* 0x20 */ }; - /* zynq spi platform data */ struct zynq_spi_plat { struct zynq_spi_regs *regs; -- 2.43.0
[PATCH 32/40] drivers: sound: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/sound/wm8994.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index 6b3091aa5de..42947357836 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -579,7 +579,6 @@ static int wm8994_init_volume_aif2_dac1(struct wm8994_priv *priv) ret = wm8994_bic_or(priv, WM8994_AIF2_DAC_FILTERS_1, WM8994_AIF2DAC_MUTE_MASK, 0); - ret |= wm8994_bic_or(priv, WM8994_AIF2_DAC_LEFT_VOLUME, WM8994_AIF2DAC_VU_MASK | WM8994_AIF2DACL_VOL_MASK, WM8994_AIF2DAC_VU | 0xff); @@ -588,7 +587,6 @@ static int wm8994_init_volume_aif2_dac1(struct wm8994_priv *priv) WM8994_AIF2DAC_VU_MASK | WM8994_AIF2DACR_VOL_MASK, WM8994_AIF2DAC_VU | 0xff); - ret |= wm8994_bic_or(priv, WM8994_DAC1_LEFT_VOLUME, WM8994_DAC1_VU_MASK | WM8994_DAC1L_VOL_MASK | WM8994_DAC1L_MUTE_MASK, WM8994_DAC1_VU | 0xc0); -- 2.43.0
[PATCH 31/40] drivers: soc: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/soc/ti/k3-navss-ringacc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c index d3f3d4761c2..b2643a30d3d 100644 --- a/drivers/soc/ti/k3-navss-ringacc.c +++ b/drivers/soc/ti/k3-navss-ringacc.c @@ -80,7 +80,6 @@ struct k3_nav_ring_rt_regs { #define K3_DMARING_RING_RT_DB_ENTRY_MASK GENMASK(7, 0) #define K3_DMARING_RING_RT_DB_TDOWN_ACKBIT(31) - /** * struct k3_nav_ring_fifo_regs - The Ring Accelerator Queues Registers region */ -- 2.43.0
[PATCH 30/40] drivers: serial: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/serial/serial_arc.c| 1 - drivers/serial/serial_linflexuart.c| 2 -- drivers/serial/serial_lpuart.c | 1 - drivers/serial/serial_nulldev.c| 1 - drivers/serial/serial_pl01x_internal.h | 1 - drivers/serial/usbtty.c| 8 6 files changed, 14 deletions(-) diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index c0930cf7334..a7e566bd23f 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -24,7 +24,6 @@ struct arc_serial_regs { unsigned int baudh; }; - struct arc_serial_plat { struct arc_serial_regs *reg; unsigned int uartclk; diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index ff66e69b9d7..24ecb236d51 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -69,7 +69,6 @@ static int _linflex_serial_putc(struct linflex_fsl *base, const char c) { __raw_writeb(c, >bdrl); - if (!(__raw_readb(>uartsr) & UARTSR_DTF)) return -EAGAIN; @@ -197,7 +196,6 @@ U_BOOT_DRIVER(serial_linflex) = { #include - static inline void _debug_uart_init(void) { struct linflex_fsl *base = (struct linflex_fsl *)CONFIG_VAL(DEBUG_UART_BASE); diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index a06e6dc2505..93602797b83 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -101,7 +101,6 @@ static void lpuart_write32(u32 flags, u32 *addr, u32 val) } } - u32 __weak get_lpuart_clk(void) { return get_board_sys_clk(); diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c index 78a9e0b195f..e2c6dec5e32 100644 --- a/drivers/serial/serial_nulldev.c +++ b/drivers/serial/serial_nulldev.c @@ -31,7 +31,6 @@ static const struct udevice_id nulldev_serial_ids[] = { { } }; - const struct dm_serial_ops nulldev_serial_ops = { .putc = nulldev_serial_putc, .pending = nulldev_serial_pending, diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h index 71c52bb5312..7ae3ae50908 100644 --- a/drivers/serial/serial_pl01x_internal.h +++ b/drivers/serial/serial_pl01x_internal.h @@ -92,7 +92,6 @@ struct pl01x_priv { #define UART_PL010_LCRH_PEN (1 << 1) #define UART_PL010_LCRH_BRK (1 << 0) - #define UART_PL010_BAUD_4608001 #define UART_PL010_BAUD_2304003 #define UART_PL010_BAUD_1152007 diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index ae3ac8070d3..b7d77fbb6a9 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -54,7 +54,6 @@ static circbuf_t usbtty_input; static circbuf_t usbtty_output; - /* * Instance variables */ @@ -77,7 +76,6 @@ int usbtty_configured_flag = 0; */ static char serial_number[16]; - /* * Descriptors, Strings, Local variables. */ @@ -257,12 +255,10 @@ static struct rs232_emu rs232_desc={ .data_bits = 0x08 }; - /* * Static Generic Serial specific data */ - struct gserial_config_desc { struct usb_configuration_descriptor configuration_desc; @@ -575,28 +571,24 @@ static void usbtty_init_strings (void) str2wide (CONFIG_USBD_MANUFACTURER, string->wData); usbtty_string_table[STR_MANUFACTURER]=string; - string = (struct usb_string_descriptor *) wstrProduct; string->bLength = sizeof(wstrProduct); string->bDescriptorType = USB_DT_STRING; str2wide (CONFIG_USBD_PRODUCT_NAME, string->wData); usbtty_string_table[STR_PRODUCT]=string; - string = (struct usb_string_descriptor *) wstrSerial; string->bLength = sizeof(serial_number); string->bDescriptorType = USB_DT_STRING; str2wide (serial_number, string->wData); usbtty_string_table[STR_SERIAL]=string; - string = (struct usb_string_descriptor *) wstrConfiguration; string->bLength = sizeof(wstrConfiguration); string->bDescriptorType = USB_DT_STRING; str2wide (CFG_USBD_CONFIGURATION_STR, string->wData); usbtty_string_table[STR_CONFIG]=string; - string = (struct usb_string_descriptor *) wstrDataInterface; string->bLength = sizeof(wstrDataInterface); string->bDescriptorType = USB_DT_STRING; -- 2.43.0
[PATCH 29/40] drivers: scsi: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/scsi/scsi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 73cb83548eb..51cacf34792 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -345,7 +345,6 @@ static int scsi_read_capacity(struct udevice *dev, struct scsi_cmd *pccb, return 0; } - /* * Some setup (fill-in) routines */ -- 2.43.0
[PATCH 28/40] drivers: rtc: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/rtc/ds1307.c | 5 - drivers/rtc/ds1337.c | 5 - drivers/rtc/ds3231.c | 6 -- drivers/rtc/mcfrtc.c | 1 - drivers/rtc/rv3029.c | 2 -- 5 files changed, 19 deletions(-) diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c index ba06ff9f0be..04921099101 100644 --- a/drivers/rtc/ds1307.c +++ b/drivers/rtc/ds1307.c @@ -139,7 +139,6 @@ read_rtc: } #endif - tmp->tm_sec = bcd2bin (sec & 0x7F); tmp->tm_min = bcd2bin (min & 0x7F); tmp->tm_hour = bcd2bin (hour & 0x3F); @@ -157,7 +156,6 @@ read_rtc: return rel; } - /* * Set the RTC */ @@ -190,7 +188,6 @@ int rtc_set (struct rtc_time *tmp) return 0; } - /* * Reset the RTC. We setting the date back to 1970-01-01. * We also enable the oscillator output on the SQW/OUT pin and program @@ -204,7 +201,6 @@ void rtc_reset (void) rtc_write (RTC_CTL_REG_ADDR, RTC_CTL_BIT_SQWE | RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS0); } - /* * Helper functions */ @@ -215,7 +211,6 @@ uchar rtc_read (uchar reg) return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg)); } - static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val); diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c index 7eccf1cb8c5..77544298d8a 100644 --- a/drivers/rtc/ds1337.c +++ b/drivers/rtc/ds1337.c @@ -62,7 +62,6 @@ #define RTC_STAT_BIT_A2F 0x2 /* Alarm 2 flag */ #define RTC_STAT_BIT_OSF 0x80/* Oscillator stop flag */ - #if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -119,7 +118,6 @@ int rtc_get (struct rtc_time *tmp) return rel; } - /* * Set the RTC */ @@ -145,7 +143,6 @@ int rtc_set (struct rtc_time *tmp) return 0; } - /* * Reset the RTC. We also enable the oscillator output on the * SQW/INTB* pin and program it for 32,768 Hz output. Note that @@ -176,7 +173,6 @@ void rtc_reset (void) #endif } - /* * Helper functions */ @@ -187,7 +183,6 @@ uchar rtc_read (uchar reg) return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg)); } - static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val); diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index d6267d660d0..6341a1d62b8 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -34,7 +34,6 @@ #define RTC_CTL_REG_ADDR 0x0e #define RTC_STAT_REG_ADDR 0x0f - /* * RTC control register bits */ @@ -54,12 +53,10 @@ #define RTC_STAT_BIT_BB32KHZ 0x40/* Battery backed 32KHz Output */ #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz Output */ - #if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); - /* * Get the current time from the RTC */ @@ -107,7 +104,6 @@ int rtc_get (struct rtc_time *tmp) return rel; } - /* * Set the RTC */ @@ -133,7 +129,6 @@ int rtc_set (struct rtc_time *tmp) return 0; } - /* * Reset the RTC. We also enable the oscillator output on the * SQW/INTB* pin and program it for 32,768 Hz output. Note that @@ -167,7 +162,6 @@ uchar rtc_read (uchar reg) return (i2c_reg_read (CFG_SYS_I2C_RTC_ADDR, reg)); } - static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CFG_SYS_I2C_RTC_ADDR, reg, val); diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c index b5cc6b96881..9708971c5c4 100644 --- a/drivers/rtc/mcfrtc.c +++ b/drivers/rtc/mcfrtc.c @@ -4,7 +4,6 @@ * TsiChung Liew (tsi-chung.l...@freescale.com) */ - #include #include #include diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c index a82acec6f7e..8c80fe9cb79 100644 --- a/drivers/rtc/rv3029.c +++ b/drivers/rtc/rv3029.c @@ -73,7 +73,6 @@ RV3029_TRICKLE_80K) #define RV3029_TRICKLE_SHIFT 4 - static int rv3029_rtc_get(struct udevice *dev, struct rtc_time *tm) { u8 regs[RTC_RV3029_PAGE_LEN]; @@ -127,7 +126,6 @@ static int rv3029_rtc_set(struct udevice *dev, const struct rtc_time *tm) __func__, tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec); - if (tm->tm_year < 2000) { printf("%s: year %d (before 2000) not supported\n", __func__, tm->tm_year); -- 2.43.0
[PATCH 27/40] drivers: reset: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/reset/reset-ast2500.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c index 0ed5396b3e9..f3543fa8cc1 100644 --- a/drivers/reset/reset-ast2500.c +++ b/drivers/reset/reset-ast2500.c @@ -63,8 +63,6 @@ static int ast2500_reset_status(struct reset_ctl *reset_ctl) return !!status; } - - static int ast2500_reset_probe(struct udevice *dev) { int rc; -- 2.43.0
[PATCH 26/40] drivers: remoteproc: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/remoteproc/rproc-uclass.c| 1 - drivers/remoteproc/ti_k3_r5f_rproc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index 3ba2b40dca3..e64354dd52f 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -518,7 +518,6 @@ int rproc_is_running(int id) return _rproc_ops_wrapper(id, RPROC_RUNNING); }; - static int handle_trace(struct udevice *dev, struct fw_rsc_trace *rsc, int offset, int avail) { diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c index ef2c1872249..d78b3fa1bbd 100644 --- a/drivers/remoteproc/ti_k3_r5f_rproc.c +++ b/drivers/remoteproc/ti_k3_r5f_rproc.c @@ -42,7 +42,6 @@ #define PROC_BOOT_CFG_FLAG_R5_MEM_INIT_DIS 0x4000 #define PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE 0x8000 - /* R5 TI-SCI Processor Control Flags */ #define PROC_BOOT_CTRL_FLAG_R5_CORE_HALT 0x0001 -- 2.43.0
[PATCH 25/40] drivers: ram: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/ram/rockchip/dmc-rk3368.c | 3 --- drivers/ram/stm32_sdram.c | 2 -- drivers/ram/stm32mp1/stm32mp1_ddr.c | 1 - 3 files changed, 6 deletions(-) diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 42114a5aa91..ab087275fe2 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -138,7 +138,6 @@ enum { #define DDR3_MR2_TWL(n) \ (((n - 5) & 0x7) << 3) - #ifdef CONFIG_TPL_BUILD static void ddr_set_noc_spr_err_stall(struct rk3368_grf *grf, bool enable) @@ -524,7 +523,6 @@ static int pctl_calc_timings(struct rk3368_sdram_params *params, pctl_timing->tckesr = pctl_timing->tcke + 1; /* JESD-79: tCKE + 1tCK */ pctl_timing->tdpd = 0;/* RK3368 TRM: "allowed values for DDR3: 0" */ - /* * The controller can represent tFAW as 4x, 5x or 6x tRRD only. * We want to use the smallest multiplier that satisfies the tFAW @@ -987,7 +985,6 @@ static struct ram_ops rk3368_dmc_ops = { .get_info = rk3368_dmc_get_info, }; - static const struct udevice_id rk3368_dmc_ids[] = { { .compatible = "rockchip,rk3368-dmc" }, { } diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index 10dc05dd640..954995c499c 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -333,7 +333,6 @@ static int stm32_fmc_of_to_plat(struct udevice *dev) return -EINVAL; } - params->bank_params[bank].sdram_timing = (struct stm32_sdram_timing *) ofnode_read_u8_array_ptr(bank_node, @@ -346,7 +345,6 @@ static int stm32_fmc_of_to_plat(struct udevice *dev) return -EINVAL; } - bank_params->sdram_ref_count = ofnode_read_u32_default(bank_node, "st,sdram-refcount", 8196); bank++; diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c index d7834b32299..0e37ea93fbc 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr.c +++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c @@ -707,7 +707,6 @@ void stm32mp1_ddr_init(struct ddr_info *priv, break; } - if (config->c_reg.mstr & DDRCTRL_MSTR_DDR3) ret = board_ddr_power_init(STM32MP_DDR3); else if (config->c_reg.mstr & DDRCTRL_MSTR_LPDDR2) { -- 2.43.0
[PATCH 24/40] drivers: power: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/power/regulator/lp873x_regulator.c | 1 - drivers/power/regulator/lp87565_regulator.c | 1 - drivers/power/twl6030.c | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c index c59d77118ad..271a7e45139 100644 --- a/drivers/power/regulator/lp873x_regulator.c +++ b/drivers/power/regulator/lp873x_regulator.c @@ -310,7 +310,6 @@ static int buck_get_enable(struct udevice *dev) bool enable = false; int ret; - ret = lp873x_buck_enable(dev, PMIC_OP_GET, ); if (ret) return ret; diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c index d622d956815..2212cb5c651 100644 --- a/drivers/power/regulator/lp87565_regulator.c +++ b/drivers/power/regulator/lp87565_regulator.c @@ -167,7 +167,6 @@ static int buck_get_enable(struct udevice *dev) bool enable = false; int ret; - ret = lp87565_buck_enable(dev, PMIC_OP_GET, ); if (ret) return ret; diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index 39c05f9b7d3..0cf2e50d65c 100644 --- a/drivers/power/twl6030.c +++ b/drivers/power/twl6030.c @@ -29,7 +29,6 @@ static struct twl6030_data twl6032_info = { .vbat_shift = TWL6032_VBAT_SHIFT, }; - static int twl6030_gpadc_read_channel(u8 channel_no) { u8 lsb = 0; -- 2.43.0
[PATCH 23/40] drivers: pinctrl: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/pinctrl/exynos/pinctrl-exynos.h | 1 - drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 1 - drivers/pinctrl/pinctrl-sti.c | 1 - drivers/pinctrl/pinctrl_pic32.c | 1 - drivers/pinctrl/renesas/pfc-r8a77951.c | 1 - drivers/pinctrl/renesas/pfc-r8a7796.c | 1 - drivers/pinctrl/renesas/pfc-r8a77965.c | 1 - drivers/pinctrl/renesas/pfc-r8a77970.c | 1 - drivers/pinctrl/renesas/pfc-r8a77980.c | 1 - drivers/pinctrl/renesas/pfc-r8a77995.c | 2 -- drivers/pinctrl/renesas/pfc-r8a779f0.c | 1 - drivers/pinctrl/renesas/pfc-r8a779h0.c | 1 - drivers/pinctrl/renesas/pfc.c | 1 - drivers/pinctrl/tegra/funcmux-tegra20.c | 1 - 14 files changed, 15 deletions(-) diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.h b/drivers/pinctrl/exynos/pinctrl-exynos.h index 743bb557309..da666777581 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.h +++ b/drivers/pinctrl/exynos/pinctrl-exynos.h @@ -92,7 +92,6 @@ struct exynos_pinctrl_config_data { const unsigned int value; }; - void exynos_pinctrl_setup_peri(struct exynos_pinctrl_config_data *conf, unsigned int num_conf, unsigned long base); int exynos_pinctrl_set_state(struct udevice *dev, diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 64036296e24..884ed258d17 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -729,7 +729,6 @@ static int armada_37xx_pinctrl_probe(struct udevice *dev) if (!info->funcs) return -ENOMEM; - ret = armada_37xx_fill_group(info); if (ret) return ret; diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 4996b69d9af..d87249ad1be 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -208,7 +208,6 @@ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc) generic_clear_bit(bit, sysconfreg); } - static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config) { struct fdtdec_phandle_args args; diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c index 9f38b56e9c0..090351072d8 100644 --- a/drivers/pinctrl/pinctrl_pic32.c +++ b/drivers/pinctrl/pinctrl_pic32.c @@ -114,7 +114,6 @@ struct pic32_reg_in_mux { #define PPS_OUT(__port, __pin) \ (((__port) * PIC32_PINS_PER_PORT + (__pin)) << 2) - struct pic32_pinctrl_priv { struct pic32_reg_in_mux *mux_in; /* mux input function */ struct pic32_reg_port *pinconf; /* pin configuration*/ diff --git a/drivers/pinctrl/renesas/pfc-r8a77951.c b/drivers/pinctrl/renesas/pfc-r8a77951.c index 81568ae4a5e..1cfdc335041 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77951.c +++ b/drivers/pinctrl/renesas/pfc-r8a77951.c @@ -250,7 +250,6 @@ #define GPSR7_1FM(AVS2) #define GPSR7_0FM(AVS1) - /* IPSRx *//* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ /* A */ /* B */ /* C - F */ #define IP0_3_0FM(AVB_MDC) F_(0, 0) FM(MSIOF2_SS2_C)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4FM(AVB_MAGIC) F_(0, 0) FM(MSIOF2_SS1_C)FM(SCK4_A) F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c index 3de43febbd3..a289397fb8f 100644 --- a/drivers/pinctrl/renesas/pfc-r8a7796.c +++ b/drivers/pinctrl/renesas/pfc-r8a7796.c @@ -256,7 +256,6 @@ #define GPSR7_1FM(AVS2) #define GPSR7_0FM(AVS1) - /* IPSRx *//* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ /* A */ /* B */ /* C - F */ #define IP0_3_0FM(AVB_MDC) F_(0, 0) FM(MSIOF2_SS2_C)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0)F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP0_7_4FM(AVB_MAGIC) F_(0, 0)
[PATCH 22/40] drivers: phy: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/phy/marvell/comphy_a3700.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c index bca325d1996..2a1646cb2c0 100644 --- a/drivers/phy/marvell/comphy_a3700.c +++ b/drivers/phy/marvell/comphy_a3700.c @@ -389,7 +389,6 @@ static int comphy_usb3_power_up(u32 lane, u32 type, u32 speed, u32 invert) */ reg_set(USB3_CTRPUL_VAL_REG, 0x8 << 24, rb_usb3_ctr_100ns); - /* 0xd005c300 = 0x1001 */ /* set PRD_TXDEEMPH (3.5db de-emph) */ usb3_reg_set16(LANE_CFG0, 0x1, 0xFF, lane); -- 2.43.0
[PATCH 21/40] drivers: pci: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/pci/pci_auto_common.c | 1 - drivers/pci/pcie_dw_rockchip.c | 1 - drivers/pci/pcie_dw_ti.c| 1 - drivers/pci/pcie_layerscape_fixup.c | 1 - 4 files changed, 4 deletions(-) diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index cfa818ed821..141166e59b7 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -108,7 +108,6 @@ void pciauto_config_init(struct pci_controller *hose) } } - if (hose->pci_mem) pciauto_show_region("Memory", hose->pci_mem); if (hose->pci_prefetch) diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 1bad51fb3eb..ac7faa4cc19 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -506,7 +506,6 @@ static int rockchip_pcie_probe(struct udevice *dev) pcie_dw_get_link_width(>dw), hose->first_busno); - ret = pcie_dw_prog_outbound_atu_unroll(>dw, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index 78a5d035865..dc6e65273b7 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -46,7 +46,6 @@ DECLARE_GLOBAL_DATA_PTR; #define PCIE_CMD_STATUS0x04 #define LTSSM_EN_VAL BIT(0) - #define AM654_PCIE_DEV_TYPE_MASK 0x3 #define EP 0x0 #define LEG_EP 0x1 diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index ec4a7e7b657..97c38c0bfa7 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -503,7 +503,6 @@ static void fdt_fixup_pcie_ls(void *blob) struct extra_iommu_entry *entries; int i, cnt, nodeoffset; - /* Scan all known buses */ for (pci_find_first_device(); dev; -- 2.43.0
[PATCH 20/40] drivers: net: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/net/bcm-sf2-eth-gmac.h | 1 - drivers/net/bnxt/bnxt.c | 1 - drivers/net/designware.h| 1 - drivers/net/e1000.c | 6 -- drivers/net/e1000.h | 4 drivers/net/fsl-mc/dpio/qbman_portal.c | 2 -- drivers/net/fsl-mc/dpio/qbman_portal.h | 2 -- drivers/net/ftmac100.c | 1 - drivers/net/gmac_rockchip.c | 1 - drivers/net/ks8851_mll.h| 1 - drivers/net/ldpaa_eth/ldpaa_eth.h | 1 - drivers/net/ldpaa_eth/ldpaa_wriop.c | 2 -- drivers/net/macb.h | 3 --- drivers/net/mpc8xx_fec.c| 1 - drivers/net/mscc_eswitch/luton_switch.c | 1 - drivers/net/mscc_eswitch/mscc_miim.h| 1 - drivers/net/mvneta.c| 2 -- drivers/net/mvpp2.c | 1 - drivers/net/pfe_eth/pfe_mdio.c | 1 - drivers/net/phy/davicom.c | 1 - drivers/net/phy/lxt.c | 1 - drivers/net/phy/micrel_ksz90x1.c| 1 - drivers/net/phy/miiphybb.c | 1 - drivers/net/phy/mv88e6352.c | 1 - drivers/net/phy/natsemi.c | 3 --- drivers/net/rtl8169.c | 2 -- drivers/net/sh_eth.h| 1 - drivers/net/sun8i_emac.c| 2 -- drivers/net/ti/davinci_emac.c | 3 --- drivers/net/ti/davinci_emac.h | 3 --- drivers/net/ti/keystone_net.c | 2 -- drivers/net/zynq_gem.c | 1 - 32 files changed, 55 deletions(-) diff --git a/drivers/net/bcm-sf2-eth-gmac.h b/drivers/net/bcm-sf2-eth-gmac.h index 477667f4eaa..ac5e45d4f90 100644 --- a/drivers/net/bcm-sf2-eth-gmac.h +++ b/drivers/net/bcm-sf2-eth-gmac.h @@ -18,7 +18,6 @@ #define GMAC0_INTR_RECV_LAZY_ADDR (GMAC0_REG_BASE + 0x100) #define GMAC0_PHY_CTRL_ADDR(GMAC0_REG_BASE + 0x188) - #define GMAC_DMA_PTR_OFFSET0x04 #define GMAC_DMA_ADDR_LOW_OFFSET 0x08 #define GMAC_DMA_ADDR_HIGH_OFFSET 0x0c diff --git a/drivers/net/bnxt/bnxt.c b/drivers/net/bnxt/bnxt.c index 25fbcd7b116..96e804e8cac 100644 --- a/drivers/net/bnxt/bnxt.c +++ b/drivers/net/bnxt/bnxt.c @@ -3,7 +3,6 @@ * Copyright 2019-2021 Broadcom. */ - #include #include #include diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 918a38615ad..e47101ccaf6 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -64,7 +64,6 @@ struct eth_mac_regs { #define MII_REGMSK (0x1F << 6) #define MII_ADDRMSK(0x1F << 11) - struct eth_dma_regs { u32 busmode;/* 0x00 */ u32 txpolldemand; /* 0x04 */ diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index fcb205322c5..8f432b8637b 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -7,10 +7,8 @@ tested on both gig copper and gig fiber boards ***/ /*** - Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved. - Contact Information: Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 @@ -1742,7 +1740,6 @@ e1000_initialize_hardware_bits(struct e1000_hw *hw) reg_txdctl1 |= E1000_TXDCTL_COUNT_DESC; E1000_WRITE_REG(hw, TXDCTL1, reg_txdctl1); - switch (hw->mac_type) { case e1000_igb: /* IGB is cool */ return; @@ -2594,7 +2591,6 @@ e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active) return ret_val; } - } else { if (hw->mac_type == e1000_ich8lan) { @@ -5216,7 +5212,6 @@ e1000_configure_tx(struct e1000_hw *hw) E1000_WRITE_REG(hw, TARC1, tarc); } - e1000_config_collision_dist(hw); /* Setup Transmit Descriptor Settings for eop descriptor */ hw->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS; @@ -5227,7 +5222,6 @@ e1000_configure_tx(struct e1000_hw *hw) else hw->txd_cmd |= E1000_TXD_CMD_RS; - if (hw->mac_type == e1000_igb) { E1000_WRITE_REG(hw, TCTL_EXT, 0x42 << 10); diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index aa649328f5f..5ca720f4609 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /*** - Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved. Copyright 2011 Freescale Semiconductor, Inc. @@ -402,7 +401,6 @@ struct e1000_phy_stats { off */ #define IFE_PSCL_P
[PATCH 19/40] drivers: mtd: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/mtd/jedec_flash.c | 3 --- drivers/mtd/mtdcore.c | 2 -- drivers/mtd/nand/raw/am335x_spl_bch.c | 2 -- drivers/mtd/nand/raw/arasan_nfc.c | 1 - drivers/mtd/nand/raw/fsl_ifc_nand.c| 1 - drivers/mtd/nand/raw/mxs_nand.c| 1 - drivers/mtd/nand/raw/mxs_nand_dt.c | 1 - drivers/mtd/nand/raw/nand_base.c | 3 --- drivers/mtd/nand/raw/nand_ecc.c| 1 - drivers/mtd/nand/raw/nand_spl_simple.c | 2 -- drivers/mtd/nand/raw/nand_util.c | 1 - drivers/mtd/nand/raw/omap_elm.c| 1 - drivers/mtd/nand/raw/omap_elm.h| 1 - drivers/mtd/nand/raw/sunxi_nand_spl.c | 2 -- drivers/mtd/nand/raw/tegra_nand.c | 1 - drivers/mtd/nand/raw/zynq_nand.c | 1 - drivers/mtd/nand/spi/paragon.c | 5 - drivers/mtd/onenand/onenand_base.c | 4 drivers/mtd/renesas_rpc_hf.c | 1 - drivers/mtd/spi/sf_internal.h | 1 - drivers/mtd/ubi/build.c| 1 - drivers/mtd/ubi/fastmap.c | 3 --- 22 files changed, 39 deletions(-) diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index a832f348f22..54ec22d3088 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -85,13 +85,11 @@ enum uaddr { MTD_UADDR_UNNECESSARY, /* Does not require any address */ }; - struct unlock_addr { u32 addr1; u32 addr2; }; - /* * I don't like the fact that the first entry in unlock_addrs[] * exists, but is for MTD_UADDR_NOT_SUPPORTED - and, therefore, @@ -139,7 +137,6 @@ static const struct unlock_addr unlock_addrs[] = { } }; - struct amd_flash_info { const __u16 mfr_id; const __u16 dev_id; diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index aa78d41a55e..5bd64bd6ad4 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -172,7 +172,6 @@ bool mtd_dev_list_updated(void) #ifndef __UBOOT__ static LIST_HEAD(mtd_notifiers); - #define MTD_DEVT(index) MKDEV(MTD_CHAR_MAJOR, (index)*2) /* REVISIT once MTD uses the driver model better, whoever allocates @@ -747,7 +746,6 @@ out: } EXPORT_SYMBOL_GPL(get_mtd_device); - int __get_mtd_device(struct mtd_info *mtd) { int err; diff --git a/drivers/mtd/nand/raw/am335x_spl_bch.c b/drivers/mtd/nand/raw/am335x_spl_bch.c index 64d8ce0965a..4b50f351d35 100644 --- a/drivers/mtd/nand/raw/am335x_spl_bch.c +++ b/drivers/mtd/nand/raw/am335x_spl_bch.c @@ -25,7 +25,6 @@ static struct nand_chip nand_chip; CFG_SYS_NAND_ECCSIZE) #define ECCTOTAL (ECCSTEPS * CFG_SYS_NAND_ECCBYTES) - /* * NAND command for large page NAND devices (2k) */ @@ -87,7 +86,6 @@ static int nand_command(int block, int page, uint32_t offs, hwctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE); - /* * Program and erase have their own busy handlers status, sequential * in and status need no delay. diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c index 4f013efafb3..10596ce8ee0 100644 --- a/drivers/mtd/nand/raw/arasan_nfc.c +++ b/drivers/mtd/nand/raw/arasan_nfc.c @@ -408,7 +408,6 @@ static int arasan_nand_read_page(struct mtd_info *mtd, u8 *buf, u32 size) for (i = 0; i < pktsize/4; i++) bufptr[i] = readl(>reg->buf_dataport); - bufptr += pktsize/4; if (rdcount >= pktnum) diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c index 857d50ef9b0..798036f6028 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c @@ -1012,7 +1012,6 @@ static int fsl_ifc_chip_init(int devnum, u8 *addr) priv->bufnum_mask = 0; break; - default: printf("ifc nand: bad csor %#x: bad page size\n", csor); return -ENODEV; diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index 11b0247b284..80d9307cdd1 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -277,7 +277,6 @@ static inline int mxs_nand_calc_ecc_for_large_oob(struct bch_geometry *geo, max_ecc = min(round_down(max_ecc, 2), nand_info->max_ecc_strength_supported); - /* search a supported ecc strength that makes bbm */ /* located in data chunk */ geo->ecc_strength = chip->ecc_strength_ds; diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index a922a22b273..11dbcbbf442 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -90,7 +90,6 @@ static int mxs_nand_dt_probe(struct udevice *dev) info->gpmi_regs = devm_ioremap(dev, res.start, resource_size()); - ret
[PATCH 18/40] drivers: mmc: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/mmc/aspeed_sdhci.c | 1 - drivers/mmc/davinci_mmc.c | 1 - drivers/mmc/dw_mmc.c| 2 -- drivers/mmc/fsl_esdhc.c | 1 - drivers/mmc/fsl_esdhc_spl.c | 1 - drivers/mmc/mmc-uclass.c| 1 - drivers/mmc/mmc.c | 1 - drivers/mmc/msm_sdhci.c | 1 - drivers/mmc/mtk-sd.c| 1 - drivers/mmc/piton_mmc.c | 1 - drivers/mmc/rpmb.c | 1 - drivers/mmc/tegra_mmc.c | 1 - 12 files changed, 13 deletions(-) diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c index 87a6f66ebb3..b1752d2f881 100644 --- a/drivers/mmc/aspeed_sdhci.c +++ b/drivers/mmc/aspeed_sdhci.c @@ -93,7 +93,6 @@ U_BOOT_DRIVER(aspeed_sdhci_drv) = { .plat_auto = sizeof(struct aspeed_sdhci_plat), }; - static int aspeed_sdc_probe(struct udevice *parent) { struct clk clk; diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 5107fcd8362..e055026847f 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -473,7 +473,6 @@ int davinci_mmc_init(struct bd_info *bis, struct davinci_mmc *host) } #else - static int davinci_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index e6107c770fe..f4ecd7422ce 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -55,7 +55,6 @@ static void dwmci_prepare_data(struct dwmci_host *host, unsigned int i = 0, flags, cnt, blk_cnt; ulong data_start, data_end; - blk_cnt = data->blocks; dwmci_wait_reset(host, DWMCI_CTRL_FIFO_RESET); @@ -357,7 +356,6 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, return -EIO; } - if (cmd->resp_type & MMC_RSP_PRESENT) { if (cmd->resp_type & MMC_RSP_136) { cmd->response[0] = dwmci_readl(host, DWMCI_RESP3); diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 0c66980b621..683a7931c98 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -850,7 +850,6 @@ __weak int esdhc_status_fixup(void *blob, const char *compat) return 0; } - #if CONFIG_IS_ENABLED(DM_MMC) static int fsl_esdhc_get_cd(struct udevice *dev); static void esdhc_disable_for_no_card(void *blob) diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c index 1a11258be4d..3dd106bed4b 100644 --- a/drivers/mmc/fsl_esdhc_spl.c +++ b/drivers/mmc/fsl_esdhc_spl.c @@ -25,7 +25,6 @@ extern uchar mmc_u_boot_offs[]; #define MBRDBR_BOOT_SIG_55 0x1fe #define MBRDBR_BOOT_SIG_AA 0x1ff - void mmc_spl_load_image(uint32_t offs, unsigned int size, void *vdst) { uint blk_start, blk_cnt, err; diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index da6a39b7d99..83cdc9fd66d 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -538,7 +538,6 @@ U_BOOT_DRIVER(mmc_blk) = { }; #endif /* CONFIG_BLK */ - UCLASS_DRIVER(mmc) = { .id = UCLASS_MMC, .name = "mmc", diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b18dc331f78..cf8277cbed8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -785,7 +785,6 @@ static int mmc_complete_op_cond(struct mmc *mmc) return 0; } - int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd) { struct mmc_cmd cmd; diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 4ce0de6c47d..f5e9930c799 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -114,7 +114,6 @@ static int msm_sdc_mci_init(struct msm_sdhc *prv) writel(readl(prv->base + SDCC_MCI_POWER) | SDCC_MCI_POWER_SW_RST, prv->base + SDCC_MCI_POWER); - /* Wait for reset to be written to register */ if (wait_for_bit_le32(prv->base + SDCC_MCI_STATUS2, SDCC_MCI_STATUS2_MCI_ACT, false, 10, false)) { diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index ebd72178b59..d676cf9e314 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -1631,7 +1631,6 @@ static void msdc_init_hw(struct msdc_host *host) clrsetbits_le32(>base->sdc_cfg, SDC_CFG_DTOC_M, 3 << SDC_CFG_DTOC_S); - host->def_tune_para.iocon = readl(>base->msdc_iocon); host->def_tune_para.pad_tune = readl(>base->pad_tune); } diff --git a/drivers/mmc/piton_mmc.c b/drivers/mmc/piton_mmc.c index fed1f841608..5ef2781eedf 100644 --- a/drivers/mmc/piton_mmc.c +++ b/drivers/mmc/piton_mmc.c @@ -22,7 +22,6 @@ #include #include - #define PITON_MMC_DUMMY_F_MAX 2000 #define PITON_MMC_DUMMY_F_MIN 1000 #define PITON_MMC_DUMMY_CAPACITY SZ_4G << 3 diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c index 0658ce22cf1..fa3ac2d9e37 100644 --- a/driv
[PATCH 17/40] drivers: misc: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/misc/cros_ec_i2c.c | 1 - drivers/misc/stm32_rcc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c index 5516aa8b3ff..cbdc55054ba 100644 --- a/drivers/misc/cros_ec_i2c.c +++ b/drivers/misc/cros_ec_i2c.c @@ -99,7 +99,6 @@ static int cros_ec_i2c_packet(struct udevice *udev, int out_bytes, int in_bytes) return -EBADMSG; } - /* drop result and packet_len */ memmove(dev->din, _response_i2c->ec_response, in_bytes); diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c index 0dd827e1dd0..5a6f979f91b 100644 --- a/drivers/misc/stm32_rcc.c +++ b/drivers/misc/stm32_rcc.c @@ -76,7 +76,6 @@ static int stm32_rcc_bind(struct udevice *dev) dev_ofnode(dev), ); } - static const struct udevice_id stm32_rcc_ids[] = { {.compatible = "st,stm32f42xx-rcc", .data = (ulong)_rcc_clk_f42x }, {.compatible = "st,stm32f469-rcc", .data = (ulong)_rcc_clk_f469 }, -- 2.43.0
[PATCH 16/40] drivers: led: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/led/led_lp5562.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/led/led_lp5562.c b/drivers/led/led_lp5562.c index 0c5f9bc4300..a5776d3174f 100644 --- a/drivers/led/led_lp5562.c +++ b/drivers/led/led_lp5562.c @@ -122,7 +122,6 @@ static int lp5562_led_reg_update(struct udevice *dev, int regnum, else ret = dm_i2c_reg_clrset(dev, regnum, mask, value); - /* * Data sheet says "Delay between consecutive I2C writes to * ENABLE register (00h) need to be longer than 488 us @@ -521,7 +520,6 @@ U_BOOT_DRIVER(lp5562_led) = { .ops = _led_ops, }; - static int lp5562_led_wrap_probe(struct udevice *dev) { struct lp5562_led_wrap_priv *priv = dev_get_priv(dev); -- 2.43.0
[PATCH 14/40] drivers: i2c: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/i2c/exynos_hs_i2c.c | 1 - drivers/i2c/i2c-uniphier.c | 1 - drivers/i2c/imx_lpi2c.c | 1 - drivers/i2c/muxes/i2c-mux-gpio.c | 1 - drivers/i2c/mxc_i2c.c| 1 - drivers/i2c/rcar_i2c.c | 1 - drivers/i2c/soft_i2c.c | 1 - 7 files changed, 7 deletions(-) diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c index 9a364fdae37..2ab0bae4499 100644 --- a/drivers/i2c/exynos_hs_i2c.c +++ b/drivers/i2c/exynos_hs_i2c.c @@ -76,7 +76,6 @@ DECLARE_GLOBAL_DATA_PTR; HSI2C_TRANS_ABORT) #define HSI2C_TRANS_FINISHED_MASK (HSI2C_TRANS_ERROR_MASK | HSI2C_TRANS_SUCCESS) - /* I2C_FIFO_STAT Register bits */ #define HSI2C_RX_FIFO_EMPTY(1u << 24) #define HSI2C_RX_FIFO_FULL (1u << 23) diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c index 6eafbeeef4e..cc22c075ab1 100644 --- a/drivers/i2c/i2c-uniphier.c +++ b/drivers/i2c/i2c-uniphier.c @@ -198,7 +198,6 @@ static int uniphier_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) return 0; } - static const struct dm_i2c_ops uniphier_i2c_ops = { .xfer = uniphier_i2c_xfer, .set_bus_speed = uniphier_i2c_set_bus_speed, diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index 6c0d8eb5f4f..a1be841b119 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -263,7 +263,6 @@ static int bus_i2c_write(struct udevice *bus, u32 chip, u8 *buf, int len) return result; } - u32 __weak imx_get_i2cclk(u32 i2c_num) { return 0; diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index f212bd1f983..0a2800ebd7a 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -38,7 +38,6 @@ struct i2c_mux_gpio_priv { u32 idle; }; - static int i2c_mux_gpio_select(struct udevice *dev, struct udevice *bus, uint channel) { diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 0acdaf7e743..84c0050eac0 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -512,7 +512,6 @@ static int i2c_init_transfer(struct mxc_i2c_bus *i2c_bus, u8 chip, return ret; } - static int i2c_write_data(struct mxc_i2c_bus *i2c_bus, u8 chip, const u8 *buf, int len) { diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index f0f9b2afacf..3bd5108fd23 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -54,7 +54,6 @@ #define RCAR_I2C_ICFBSCR 0x38 #define RCAR_I2C_ICFBSCR_TCYC170x0f /* 17*Tcyc */ - enum rcar_i2c_type { RCAR_I2C_TYPE_GEN2, RCAR_I2C_TYPE_GEN3, diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 1f2afc65e8b..89ddf821063 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -96,7 +96,6 @@ DECLARE_GLOBAL_DATA_PTR; #define I2C_ACK0 /* PD_SDA level to ack a byte */ #define I2C_NOACK 1 /* PD_SDA level to noack a byte */ - #ifdef DEBUG_I2C #define PRINTD(fmt,args...)do {\ printf (fmt ,##args); \ -- 2.43.0
[PATCH 15/40] drivers: input: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/input/cros_ec_keyb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c index 0917ee20fed..dd1e1bc468e 100644 --- a/drivers/input/cros_ec_keyb.c +++ b/drivers/input/cros_ec_keyb.c @@ -28,7 +28,6 @@ struct cros_ec_keyb_priv { int ghost_filter; /* 1 to enable ghost filter, else 0 */ }; - /** * Check the keyboard controller and return a list of key matrix positions * for which a key is pressed -- 2.43.0
[PATCH 13/40] drivers: gpio: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/gpio/altera_pio.c | 1 - drivers/gpio/pca953x_gpio.c | 1 - drivers/gpio/sunxi_gpio.c | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 7ba1595e4ae..469c50a6016 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -59,7 +59,6 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin) return !!(readl(>data) & (1 << pin)); } - static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) { struct altera_pio_plat *plat = dev_get_plat(dev); diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 80ebaadb3e4..e84038f312e 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -39,7 +39,6 @@ #define PCA957X_INVERT 1 #define PCA957X_DIRECTION 4 - #define PCA_GPIO_MASK 0x00FF #define PCA_INT 0x0100 #define PCA_PCAL BIT(9) diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 5e86474d3db..218ca2af397 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -157,7 +157,6 @@ void sunxi_gpio_set_pull_bank(void *bank_base, int pin_offset, u32 val) 0x3U << offset, val << offset); } - /* === Non-DM code, used by the SPL. */ #if !CONFIG_IS_ENABLED(DM_GPIO) -- 2.43.0
[PATCH 12/40] drivers: fpga: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/fpga/ACEX1K.c | 1 - drivers/fpga/fpga.c | 1 - drivers/fpga/ivm_core.c | 1 - drivers/fpga/lattice.c | 1 - drivers/fpga/spartan2.c | 2 -- drivers/fpga/spartan3.c | 2 -- 6 files changed, 8 deletions(-) diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c index cb7877a8afe..3de9011ac06 100644 --- a/drivers/fpga/ACEX1K.c +++ b/drivers/fpga/ACEX1K.c @@ -79,7 +79,6 @@ int ACEX1K_info( Altera_desc *desc ) return FPGA_SUCCESS; } - /* - */ /* ACEX1K Passive Serial Generic Implementation */ diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 38ba6c21ea2..1f6782537de 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -30,7 +30,6 @@ static void fpga_no_sup(char *fn, char *msg) printf("No FPGA support!\n"); } - /* fpga_get_desc * map a device number to a descriptor */ diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c index b9cecdd8720..3c9a01e5110 100644 --- a/drivers/fpga/ivm_core.c +++ b/drivers/fpga/ivm_core.c @@ -580,7 +580,6 @@ void ispVMFreeMem(void) } } - /* * * ispVMDataSize diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c index 036580cad70..3f481e38565 100644 --- a/drivers/fpga/lattice.c +++ b/drivers/fpga/lattice.c @@ -35,7 +35,6 @@ extern unsigned short g_usIntelDataIndex; extern unsigned short g_usIntelBufferSize; extern char *const g_szSupportedVersions[]; - /* * ispVMDelay * diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c index 9cd6cb7f0fb..906649ea181 100644 --- a/drivers/fpga/spartan2.c +++ b/drivers/fpga/spartan2.c @@ -85,7 +85,6 @@ static int spartan2_info(xilinx_desc *desc) return FPGA_SUCCESS; } - /* - */ /* Spartan-II Slave Parallel Generic Implementation */ @@ -285,7 +284,6 @@ static int spartan2_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize) return ret_val; } - /* - */ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize) diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index b4d87d47d93..98405589134 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -91,7 +91,6 @@ static int spartan3_info(xilinx_desc *desc) return FPGA_SUCCESS; } - /* - */ /* Spartan-II Slave Parallel Generic Implementation */ @@ -293,7 +292,6 @@ static int spartan3_sp_dump(xilinx_desc *desc, const void *buf, size_t bsize) return ret_val; } - /* - */ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize) -- 2.43.0
[PATCH 11/40] drivers: firmware: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/firmware/ti_sci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 8ce0f46e70c..e591333ba38 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -139,7 +139,6 @@ static struct ti_sci_xfer *ti_sci_setup_one_xfer(struct ti_sci_info *info, return ERR_PTR(-ERANGE); } - info->seq = ~info->seq; xfer->tx_message.buf = buf; xfer->tx_message.len = tx_message_size; -- 2.43.0
[PATCH 10/40] drivers: dma: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/dma/fsl_dma.c| 1 - drivers/dma/ti/k3-udma.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index 0cd9bcb5110..e5d242f4f8f 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -21,7 +21,6 @@ #define FSL_DMA_MR_DEFAULT (FSL_DMA_MR_BWC_DIS | FSL_DMA_MR_CTM_DIRECT) #endif - #if defined(CONFIG_MPC83xx) dma83xx_t *dma_base = (void *)(CFG_SYS_MPC83xx_DMA_ADDR); #elif defined(CONFIG_MPC85xx) diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index da341a24778..b7e674f2186 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1710,7 +1710,6 @@ static int udma_probe(struct udevice *dev) struct udma_tisci_rm *tisci_rm = >tisci_rm; ofnode navss_ofnode = ofnode_get_parent(dev_ofnode(dev)); - ud->match_data = (void *)dev_get_driver_data(dev); ret = udma_get_mmrs(dev); if (ret) -- 2.43.0
[PATCH 09/40] drivers: dfu: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/dfu/dfu_mmc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index cfa6334e439..8f7ecfa8fc7 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -269,7 +269,6 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) } } - static int mmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { -- 2.43.0
[PATCH 08/40] drivers: ddr: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/ddr/altera/sdram_arria10.c| 1 - drivers/ddr/altera/sequencer.c| 2 -- drivers/ddr/altera/sequencer.h| 1 - drivers/ddr/fsl/arm_ddr_gen3.c| 1 - drivers/ddr/fsl/interactive.c | 5 - drivers/ddr/fsl/lc_common_dimm_params.c | 1 - drivers/ddr/imx/phy/ddrphy_train.c| 1 - drivers/ddr/marvell/a38x/ddr3_init.c | 2 -- drivers/ddr/marvell/a38x/ddr3_training.c | 4 drivers/ddr/marvell/a38x/ddr3_training_ip_def.h | 1 - drivers/ddr/marvell/a38x/ddr3_training_leveling.c | 1 - drivers/ddr/marvell/a38x/ddr_ml_wrapper.h | 1 - drivers/ddr/marvell/a38x/mv_ddr_plat.c| 1 - drivers/ddr/marvell/a38x/mv_ddr_plat.h| 1 - drivers/ddr/marvell/a38x/mv_ddr_regs.h| 1 - 15 files changed, 24 deletions(-) diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c index bd2af94bb0d..d3305a6c82d 100644 --- a/drivers/ddr/altera/sdram_arria10.c +++ b/drivers/ddr/altera/sdram_arria10.c @@ -645,7 +645,6 @@ static int of_sdram_firewall_setup(const void *blob) writel(0, _noc_fw_ddr_mpu_fpga2sdram_base->enable); writel(0, _noc_fw_ddr_l3_base->enable); - for (i = 0; i < ARRAY_SIZE(firewall_table); i++) { sprintf(name, "%s", firewall_table[i].prop_name); ret = fdtdec_get_int_array(blob, child, name, diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 7636e71a0a6..69937fc2d56 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -689,7 +689,6 @@ static void scc_mgr_apply_group_dm_out1_delay(struct socfpga_sdrseq *seq, } } - /* apply and load delay on both DQS and OCT out1 */ static void scc_mgr_apply_group_dqs_io_and_oct_out1(struct socfpga_sdrseq *seq, u32 write_group, u32 delay) @@ -2580,7 +2579,6 @@ static int rw_mgr_mem_calibrate_vfifo_center(struct socfpga_sdrseq *seq, _bit_chk, left_edge, right_edge, use_read_test); - /* Search for the right edge of the window for each bit */ ret = search_right_edge(seq, 0, rank_bgn, rw_group, rw_group, start_dqs, start_dqs_en, diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h index 618ba00da64..96a6bac83b4 100644 --- a/drivers/ddr/altera/sequencer.h +++ b/drivers/ddr/altera/sequencer.h @@ -164,7 +164,6 @@ struct param_type { u32 write_correct_mask_vg; }; - /* global variable holder */ struct gbl_type { uint32_t phy_debug_mode_flags; diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c index 9f9aea804d9..f1dcba4603e 100644 --- a/drivers/ddr/fsl/arm_ddr_gen3.c +++ b/drivers/ddr/fsl/arm_ddr_gen3.c @@ -19,7 +19,6 @@ #error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL #endif - /* * regs has the to-be-set values for DDR controller registers * ctrl_num is the DDR controller number diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index 94a5e447d56..52a20504bd9 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -1209,7 +1209,6 @@ void ddr2_spd_dump(const ddr2_spd_eeprom_t *spd) for (i = 0; i < 18; i++) printf("%c", spd->mpart[i]); - printf("<<* 73 Manufacturer's Part Number *\n"); printf("%-3d-%3d: %02x %02x %s\n", 91, 92, spd->rev[0], spd->rev[1], @@ -1227,7 +1226,6 @@ void ddr2_spd_dump(const ddr2_spd_eeprom_t *spd) for (i = 0; i < 27; i++) printf("%02x", spd->mspec[i]); - printf("* 99 Manufacturer Specific Data *\n"); } #endif @@ -1946,7 +1944,6 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set) if (argc == 0) continue; - if (strcmp(argv[0], "help") == 0) { puts(usage); continue; @@ -2042,7 +2039,6 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set) debug("src_ctlr_num = %u, src_dimm_num = %u, dst_ctlr_num = %u, dst_dimm_num = %u, step_mask = %x\n", src_ctlr_num, src_dimm_num, dst_ctlr_num, dst_dimm_num, step_mask); - switch (step_mask) { case STEP_GET_SPD: @@ -2117,7 +2113,6 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set) if (error) continue; - /* Check arguments */
[PATCH 07/40] drivers: crypto: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/crypto/fsl/desc.h | 1 - drivers/crypto/fsl/error.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/crypto/fsl/desc.h b/drivers/crypto/fsl/desc.h index 5705c4f9447..eb108a9628b 100644 --- a/drivers/crypto/fsl/desc.h +++ b/drivers/crypto/fsl/desc.h @@ -691,7 +691,6 @@ #define OP_ALG_RNG4_MAS(0x1f3 << OP_ALG_RNG4_SHIFT) #define OP_ALG_RNG4_SK (0x100 << OP_ALG_RNG4_SHIFT) - /* Structures for Protocol Data Blocks */ struct __packed pdb_ecdsa_verify { uint32_t pdb_hdr; diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c index 7b232d94c2a..dfcf5dbab35 100644 --- a/drivers/crypto/fsl/error.c +++ b/drivers/crypto/fsl/error.c @@ -26,7 +26,6 @@ #define JRSTA_DECOERR_INDEX_MASK0xff00 #define JRSTA_DECOERR_ERROR_MASK0x00ff - static const struct { u8 value; const char *error_text; -- 2.43.0
[PATCH 06/40] drivers: core: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/core/of_addr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c index c893447a1b1..6c7b4c97d67 100644 --- a/drivers/core/of_addr.c +++ b/drivers/core/of_addr.c @@ -401,7 +401,6 @@ out: return ret; } - static int __of_address_to_resource(const struct device_node *dev, const __be32 *addrp, u64 size, unsigned int flags, const char *name, struct resource *r) -- 2.43.0
[PATCH 05/40] drivers: clk: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/clk/clk-uclass.c | 1 - drivers/clk/clk_zynqmp.c | 1 - drivers/clk/imx/clk-imxrt1170.c | 3 --- drivers/clk/imx/clk-pll14xx.c | 1 - drivers/clk/qcom/clock-qcom.c | 1 - drivers/clk/qcom/clock-qcs404.c | 1 - drivers/clk/rockchip/clk_rk3328.c | 1 - 7 files changed, 9 deletions(-) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 4c832f1a530..c48a62ba099 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -130,7 +130,6 @@ static int clk_get_by_indexed_prop(struct udevice *dev, const char *prop_name, return log_ret(ret); } - return clk_get_by_index_tail(ret, dev_ofnode(dev), , "clocks", index, clk); } diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c index 5266148..97f3b999d7c 100644 --- a/drivers/clk/clk_zynqmp.c +++ b/drivers/clk/clk_zynqmp.c @@ -109,7 +109,6 @@ static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020; #define PLLCTRL_PRE_SRC_SHFT 20 #define PLLCTRL_PRE_SRC_MASK (0x7 << PLLCTRL_PRE_SRC_SHFT) - #define NUM_MIO_PINS 77 enum zynqmp_clk { diff --git a/drivers/clk/imx/clk-imxrt1170.c b/drivers/clk/imx/clk-imxrt1170.c index 20b9dc31500..88a294f4165 100644 --- a/drivers/clk/imx/clk-imxrt1170.c +++ b/drivers/clk/imx/clk-imxrt1170.c @@ -113,8 +113,6 @@ static int imxrt1170_clk_probe(struct udevice *dev) /* Anatop clocks */ base = (void *)ofnode_get_addr(ofnode_by_compatible(ofnode_null(), "fsl,imxrt-anatop")); - - clk_dm(IMXRT1170_CLK_RCOSC_48M, imx_clk_fixed_factor("rcosc48M", "rcosc16M", 3, 1)); clk_dm(IMXRT1170_CLK_RCOSC_400M, @@ -122,7 +120,6 @@ static int imxrt1170_clk_probe(struct udevice *dev) clk_dm(IMXRT1170_CLK_RCOSC_48M_DIV2, imx_clk_fixed_factor("rcosc48M_div2", "rcosc48M", 1, 2)); - clk_dm(IMXRT1170_CLK_PLL_ARM, imx_clk_pllv3(IMX_PLLV3_SYS, "pll_arm", "osc", base + 0x200, 0xff)); diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c index 3911e033905..7ec78dc3a80 100644 --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -248,7 +248,6 @@ static ulong clk_pll1416x_set_rate(struct clk *clk, unsigned long drate) tmp |= BYPASS_MASK; writel(tmp, pll->base); - div_val = (rate->mdiv << MDIV_SHIFT) | (rate->pdiv << PDIV_SHIFT) | (rate->sdiv << SDIV_SHIFT); writel(div_val, pll->base + 0x4); diff --git a/drivers/clk/qcom/clock-qcom.c b/drivers/clk/qcom/clock-qcom.c index 3a9cf2a231f..79c7606a225 100644 --- a/drivers/clk/qcom/clock-qcom.c +++ b/drivers/clk/qcom/clock-qcom.c @@ -376,7 +376,6 @@ static int qcom_power_set(struct power_domain *pwr, bool on) !(value & GDSC_PWR_ON_MASK), GDSC_STATUS_POLL_TIMEOUT_US); - if (ret == -ETIMEDOUT) printf("WARNING: GDSC %lu is stuck during power on/off\n", pwr->id); diff --git a/drivers/clk/qcom/clock-qcs404.c b/drivers/clk/qcom/clock-qcs404.c index 70a1f648e58..8b11de03a7d 100644 --- a/drivers/clk/qcom/clock-qcs404.c +++ b/drivers/clk/qcom/clock-qcs404.c @@ -67,7 +67,6 @@ #define EMAC_PTP_CMD_RCGR (0x4e014) #define EMAC_CMD_RCGR (0x4e01c) - /* GPLL0 clock control registers */ #define GPLL0_STATUS_ACTIVE BIT(31) diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c index a4f6dd5a0f5..9137dbe69ce 100644 --- a/drivers/clk/rockchip/clk_rk3328.c +++ b/drivers/clk/rockchip/clk_rk3328.c @@ -334,7 +334,6 @@ void rk3328_configure_cpu(struct rk3328_cru *cru, aclkm_div << ACLKM_CORE_DIV_SHIFT); } - static ulong rk3328_i2c_get_clk(struct rk3328_cru *cru, ulong clk_id) { u32 div, con; -- 2.43.0
[PATCH 04/40] drivers: cache: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/cache/cache-l2x0.c| 1 - drivers/cache/sandbox_cache.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/cache/cache-l2x0.c b/drivers/cache/cache-l2x0.c index c7bdd9d064a..8b29af42338 100644 --- a/drivers/cache/cache-l2x0.c +++ b/drivers/cache/cache-l2x0.c @@ -62,7 +62,6 @@ static int l2x0_probe(struct udevice *dev) return 0; } - static const struct udevice_id l2x0_ids[] = { { .compatible = "arm,pl310-cache" }, {} diff --git a/drivers/cache/sandbox_cache.c b/drivers/cache/sandbox_cache.c index 2e20b83ab80..375892fafb0 100644 --- a/drivers/cache/sandbox_cache.c +++ b/drivers/cache/sandbox_cache.c @@ -27,7 +27,6 @@ static int snadbox_disable(struct udevice *dev) return 0; } - static const struct cache_ops sandbox_cache_ops = { .get_info = sandbox_get_info, .enable = sandbox_enable, -- 2.43.0
[PATCH 03/40] drivers: block: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/block/ide.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/ide.c b/drivers/block/ide.c index b16623d7a3a..cab5e1bc92b 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -790,7 +790,6 @@ static ulong ide_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, pwrsave = 1; } - while (blkcnt-- > 0) { c = ide_wait(device, IDE_TIME_OUT); -- 2.43.0
[PATCH 02/40] drivers: bios_emulator: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/bios_emulator/besys.c| 1 - drivers/bios_emulator/include/x86emu/debug.h | 1 - drivers/bios_emulator/x86emu/prim_ops.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c index 690fb5a4d7b..2fd794f76c6 100644 --- a/drivers/bios_emulator/besys.c +++ b/drivers/bios_emulator/besys.c @@ -422,7 +422,6 @@ static u32 BE_accessReg(int regOffset, u32 value, int func) u16 val16; u32 val32; - /* Decode the configuration register values for the register we wish to * access */ diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h index 859b54d8600..1c043b78ba4 100644 --- a/drivers/bios_emulator/include/x86emu/debug.h +++ b/drivers/bios_emulator/include/x86emu/debug.h @@ -105,7 +105,6 @@ #ifdef CONFIG_X86EMU_DEBUG - # define DECODE_PRINTF(x) if (DEBUG_DECODE()) \ x86emu_decode_printf(x) # define DECODE_PRINTF2(x,y) if (DEBUG_DECODE()) \ diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c index b3cccb17f20..afe9a40a322 100644 --- a/drivers/bios_emulator/x86emu/prim_ops.c +++ b/drivers/bios_emulator/x86emu/prim_ops.c @@ -97,7 +97,6 @@ * / - #define PRIM_OPS_NO_REDEFINE_ASM #include "x86emu/x86emui.h" @@ -120,7 +119,6 @@ static u32 x86emu_parity_tab[8] = /*- Implementation */ - /*- Side effects helper functions ---*/ / -- 2.43.0
[PATCH 01/40] drivers: ata: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- drivers/ata/ahci.c | 7 --- 1 file changed, 7 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ac869296d52..8058d5ff1c3 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -294,7 +294,6 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) return 0; } - static void ahci_print_info(struct ahci_uc_priv *uc_priv) { void __iomem *mmio = uc_priv->mmio_base; @@ -520,7 +519,6 @@ static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port) return wait_spinup(port_mmio); } - static int ahci_device_data_io(struct ahci_uc_priv *uc_priv, u8 port, u8 *fis, int fis_len, u8 *buf, int buf_len, u8 is_write) { @@ -647,7 +645,6 @@ static int ata_scsiop_inquiry(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI READ10/WRITE10 command operation. */ @@ -759,7 +756,6 @@ static int ata_scsiop_read_write(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI READ CAPACITY10 command operation. */ @@ -790,7 +786,6 @@ static int ata_scsiop_read_capacity10(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI READ CAPACITY16 command operation. */ @@ -817,7 +812,6 @@ static int ata_scsiop_read_capacity16(struct ahci_uc_priv *uc_priv, return 0; } - /* * SCSI TEST UNIT READY command operation. */ @@ -827,7 +821,6 @@ static int ata_scsiop_test_unit_ready(struct ahci_uc_priv *uc_priv, return (uc_priv->ataid[pccb->target]) ? 0 : -EPERM; } - static int ahci_scsi_exec(struct udevice *dev, struct scsi_cmd *pccb) { struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev->parent); -- 2.43.0
[PATCH 37/37] board: xilinx: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c | 2 -- board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c| 2 -- board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c| 2 -- board/xilinx/zynq/zynq-zed/ps7_init_gpl.c | 2 -- board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c | 3 --- 5 files changed, 11 deletions(-) diff --git a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c index 602a789e775..e7f1d6ef5ec 100644 --- a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c @@ -4060,7 +4060,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8263,7 +8262,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c index 9343683f4d7..48001269cd7 100644 --- a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c @@ -4167,7 +4167,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8483,7 +8482,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c index 6b153aa3796..76ef5d9323e 100644 --- a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c @@ -4136,7 +4136,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8421,7 +8420,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c index 6f2edf16c24..67642798b41 100644 --- a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c @@ -4026,7 +4026,6 @@ unsigned long ps7_post_config_3_0[] = { // }; - unsigned long ps7_pll_init_data_2_0[] = { // START: top // .. START: SLCR SETTINGS @@ -8195,7 +8194,6 @@ unsigned long ps7_post_config_2_0[] = { // }; - unsigned long ps7_pll_init_data_1_0[] = { // START: top // .. START: SLCR SETTINGS diff --git a/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c index 04d2e5f1375..6a3236ce2d2 100644 --- a/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c @@ -4082,7 +4082,6 @@ unsigned long ps7_post_config_3_0[] = { /* */ }; - unsigned long ps7_pll_init_data_2_0[] = { /* START: top */ /* .. START: SLCR SETTINGS */ @@ -8313,7 +8312,6 @@ unsigned long ps7_post_config_2_0[] = { /* */ }; - unsigned long ps7_pll_init_data_1_0[] = { /* START: top */ /* .. START: SLCR SETTINGS */ @@ -12477,7 +12475,6 @@ unsigned long ps7_post_config_1_0[] = { /* */ }; - #include "xil_io.h" unsigned long *ps7_mio_init_data = ps7_mio_init_data_3_0; -- 2.43.0
[PATCH 36/37] board: vscom: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/vscom/baltos/board.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 2c91e9fac43..cea25f8c900 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -285,7 +285,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) mac_addr[4] = header.MAC1[4]; mac_addr[5] = header.MAC1[5]; - node = fdt_path_offset(blob, "ethernet0"); if (node < 0) { printf("no ethernet0 path offset\n"); -- 2.43.0
[PATCH 35/37] board: toradex: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/toradex/apalis_imx6/apalis_imx6.c | 2 -- board/toradex/colibri_imx6/colibri_imx6.c | 2 -- board/toradex/colibri_imx7/colibri_imx7.c | 1 - 3 files changed, 5 deletions(-) diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 2dcc042ab26..4a1cfb89345 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -783,7 +783,6 @@ static void ccgr_init(void) writel(0x010E0101, >ccosr); } - #define PAD_CTL_INPUT_DDR BIT(17) struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { @@ -951,7 +950,6 @@ static const struct mx6_ddr3_cfg ddr3_cfg_it = { .SRT = 1, }; - /* Perform DDR DRAM calibration */ static void spl_dram_perform_cal(const struct mx6_ddr_sysinfo *ddr_sysinfo) { diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 34e82c2b078..251970b99cc 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -759,7 +759,6 @@ MX6_MMDC_P0_MDMISC, 0x000b17c0, */ MX6_MMDC_P0_MDSCR, 0x8000, - /* 800mhz_2x64mx16.cfg */ MX6_MMDC_P0_MDPDC, 0x0002002D, @@ -891,7 +890,6 @@ MX6_MMDC_P0_MDMISC, 0x000b17c0, */ MX6_MMDC_P0_MDSCR, 0x8000, - /* 800mhz_2x64mx16.cfg */ MX6_MMDC_P0_MDPDC, 0x0002002D, diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index e966ffbf781..7de29e3abfb 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -223,7 +223,6 @@ int power_init_board(void) int reg, ver; int ret; - ret = pmic_get("pmic@33", ); if (ret) return ret; -- 2.43.0
[PATCH 34/37] board: ti: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/ti/am335x/board.c | 1 - board/ti/am43xx/board.c | 1 - board/ti/am57xx/board.c | 1 - board/ti/ks2_evm/ddr3_cfg.c | 1 - board/ti/panda/panda_mux_data.h | 1 - 5 files changed, 5 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 34f4a919656..681002ba1da 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -339,7 +339,6 @@ static void scale_vcores_bone(int freq) if (power_tps65217_init(0)) return; - /* * On Beaglebone White we need to ensure we have AC power * before increasing the frequency. diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 40b7fcfc387..431372954b2 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -336,7 +336,6 @@ const struct dpll_params *get_dpll_ddr_params(void) return NULL; } - /* * get_opp_offset: * Returns the index for safest OPP of the device to boot. diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 48668884bdd..cc5e64c9879 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -515,7 +515,6 @@ int get_voltrail_opp(int rail_offset) return opp; } - #ifdef CONFIG_SPL_BUILD /* No env to setup for SPL */ static inline void setup_board_eeprom_env(void) { } diff --git a/board/ti/ks2_evm/ddr3_cfg.c b/board/ti/ks2_evm/ddr3_cfg.c index fe350fee795..690c4e2731f 100644 --- a/board/ti/ks2_evm/ddr3_cfg.c +++ b/board/ti/ks2_evm/ddr3_cfg.c @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, */ - #include #include "ddr3_cfg.h" diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h index ad9e36525b4..3bf6c0146c2 100644 --- a/board/ti/panda/panda_mux_data.h +++ b/board/ti/panda/panda_mux_data.h @@ -11,7 +11,6 @@ #include - const struct pad_conf_entry core_padconf_array_essential[] = { {GPMC_AD0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat0 */ -- 2.43.0
[PATCH 33/37] board: theadorable: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/theadorable/theadorable.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c index cca5c3d33b5..d7234532fe6 100644 --- a/board/theadorable/theadorable.c +++ b/board/theadorable/theadorable.c @@ -288,7 +288,6 @@ int board_late_init(void) } } while (get_timer(start_time) < ABORT_TIMEOUT); - /* * At this stage the bootcounter has not been incremented * yet. We need to do this manually here to get an actually -- 2.43.0
[PATCH 32/37] board: terasic: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/terasic/de1-soc/qts/iocsr_config.h | 1 - board/terasic/de1-soc/qts/pll_config.h | 1 - board/terasic/de10-nano/qts/iocsr_config.h | 1 - board/terasic/de10-nano/qts/pll_config.h | 1 - board/terasic/de10-standard/qts/iocsr_config.h | 1 - board/terasic/de10-standard/qts/pll_config.h | 1 - board/terasic/sockit/qts/iocsr_config.h| 1 - board/terasic/sockit/qts/pll_config.h | 1 - 8 files changed, 8 deletions(-) diff --git a/board/terasic/de1-soc/qts/iocsr_config.h b/board/terasic/de1-soc/qts/iocsr_config.h index 359fd0e4173..46ef8288ed5 100644 --- a/board/terasic/de1-soc/qts/iocsr_config.h +++ b/board/terasic/de1-soc/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de1-soc/qts/pll_config.h b/board/terasic/de1-soc/qts/pll_config.h index 2811e04c480..ae3cd316743 100644 --- a/board/terasic/de1-soc/qts/pll_config.h +++ b/board/terasic/de1-soc/qts/pll_config.h @@ -86,5 +86,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/terasic/de10-nano/qts/iocsr_config.h b/board/terasic/de10-nano/qts/iocsr_config.h index a889d3da348..10007a3 100644 --- a/board/terasic/de10-nano/qts/iocsr_config.h +++ b/board/terasic/de10-nano/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de10-nano/qts/pll_config.h b/board/terasic/de10-nano/qts/pll_config.h index 192ffb4e27b..794fa203d94 100644 --- a/board/terasic/de10-nano/qts/pll_config.h +++ b/board/terasic/de10-nano/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/terasic/de10-standard/qts/iocsr_config.h b/board/terasic/de10-standard/qts/iocsr_config.h index 4aed74e8b29..80086b0c293 100644 --- a/board/terasic/de10-standard/qts/iocsr_config.h +++ b/board/terasic/de10-standard/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/de10-standard/qts/pll_config.h b/board/terasic/de10-standard/qts/pll_config.h index c1ecd4b8208..b09b6adfab0 100644 --- a/board/terasic/de10-standard/qts/pll_config.h +++ b/board/terasic/de10-standard/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/terasic/sockit/qts/iocsr_config.h b/board/terasic/sockit/qts/iocsr_config.h index 7b72ae9c3c2..8c247c8dfe5 100644 --- a/board/terasic/sockit/qts/iocsr_config.h +++ b/board/terasic/sockit/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/terasic/sockit/qts/pll_config.h b/board/terasic/sockit/qts/pll_config.h index 104e324d8a4..52f1eb0c7b4 100644 --- a/board/terasic/sockit/qts/pll_config.h +++ b/board/terasic/sockit/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 31/37] board: tcl: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/tcl/sl50/board.c | 1 - board/tcl/sl50/mux.c | 1 - 2 files changed, 2 deletions(-) diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index 2e54ede62d6..484b4e24428 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -348,7 +348,6 @@ int board_eth_init(struct bd_info *bis) eth_env_set_enetaddr("eth1addr", mac_addr); } - writel(MII_MODE_ENABLE, >miisel); cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_MII; diff --git a/board/tcl/sl50/mux.c b/board/tcl/sl50/mux.c index 6d89c4a3998..2e2bd63f870 100644 --- a/board/tcl/sl50/mux.c +++ b/board/tcl/sl50/mux.c @@ -107,7 +107,6 @@ static struct module_pin_mux mii1_pin_mux[] = { {-1}, }; - void enable_uart0_pin_mux(void) { configure_module_pin_mux(uart0_pin_mux); -- 2.43.0
[PATCH 30/37] board: synopsys: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/synopsys/emsdp/emsdp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c index adec7d32199..ffa544fa963 100644 --- a/board/synopsys/emsdp/emsdp.c +++ b/board/synopsys/emsdp/emsdp.c @@ -76,7 +76,6 @@ int board_early_init_r(void) // Switch PSRAM controller back to memory mode writel(0, PSRAM_FLASH_CONFIG_REG_0); - // Switch PSRAM controller to command mode writel(CRE_ENABLE | CRE_DRIVE_CMD, PSRAM_FLASH_CONFIG_REG_1); // Program Refresh Configuration Register (RCR) for BANK1 -- 2.43.0
[PATCH 29/37] board: sr1500: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/sr1500/qts/iocsr_config.h | 1 - board/sr1500/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/sr1500/qts/iocsr_config.h b/board/sr1500/qts/iocsr_config.h index 2622b960314..f94769bcbd4 100644 --- a/board/sr1500/qts/iocsr_config.h +++ b/board/sr1500/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/sr1500/qts/pll_config.h b/board/sr1500/qts/pll_config.h index 885fe91eeba..990432ac7f9 100644 --- a/board/sr1500/qts/pll_config.h +++ b/board/sr1500/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 28/37] board: softing: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/softing/vining_fpga/qts/iocsr_config.h | 1 - board/softing/vining_fpga/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/softing/vining_fpga/qts/iocsr_config.h b/board/softing/vining_fpga/qts/iocsr_config.h index 4059ed5ad12..62a25b9942e 100644 --- a/board/softing/vining_fpga/qts/iocsr_config.h +++ b/board/softing/vining_fpga/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/softing/vining_fpga/qts/pll_config.h b/board/softing/vining_fpga/qts/pll_config.h index 40bc8f7f7c1..2b930fa9463 100644 --- a/board/softing/vining_fpga/qts/pll_config.h +++ b/board/softing/vining_fpga/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 27/37] board: socrates: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/socrates/ddr.c | 1 - board/socrates/nand.c | 1 - board/socrates/sdram.c | 1 - board/socrates/tlb.c | 1 - 4 files changed, 4 deletions(-) diff --git a/board/socrates/ddr.c b/board/socrates/ddr.c index bf4894eff67..317c6b0a9f5 100644 --- a/board/socrates/ddr.c +++ b/board/socrates/ddr.c @@ -3,7 +3,6 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ - #include #include diff --git a/board/socrates/nand.c b/board/socrates/nand.c index 517a4a0af6a..b8e6e2cd76e 100644 --- a/board/socrates/nand.c +++ b/board/socrates/nand.c @@ -56,7 +56,6 @@ static void sc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) } } - /** * sc_nand_read_byte - read one byte from the chip * @mtd: MTD device structure diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c index d0415d26ce7..00a3f2b31e7 100644 --- a/board/socrates/sdram.c +++ b/board/socrates/sdram.c @@ -14,7 +14,6 @@ #include #include - #if !defined(CONFIG_SPD_EEPROM) /* * Autodetect onboard DDR SDRAM on 85xx platforms diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c index 0cc675781d1..b4ddb1b1739 100644 --- a/board/socrates/tlb.c +++ b/board/socrates/tlb.c @@ -28,7 +28,6 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, 0, 0, 0, BOOKE_PAGESZ_4K, 0), - /* * TLB 1: 64M Non-cacheable, guarded * 0xfc00 64M FLASH -- 2.43.0
[PATCH 26/37] board: siemens: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/siemens/common/board_am335x.c | 1 - board/siemens/pxm2/pmic.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/siemens/common/board_am335x.c b/board/siemens/common/board_am335x.c index 445af9ddbf6..2a727606bc3 100644 --- a/board/siemens/common/board_am335x.c +++ b/board/siemens/common/board_am335x.c @@ -22,7 +22,6 @@ DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_SPL_BUILD void set_uart_mux_conf(void) { diff --git a/board/siemens/pxm2/pmic.h b/board/siemens/pxm2/pmic.h index f4ce7f16b29..6990fd7ce87 100644 --- a/board/siemens/pxm2/pmic.h +++ b/board/siemens/pxm2/pmic.h @@ -50,7 +50,6 @@ #define PMIC_REG_ST_OFF_1 (0x2) #define PMIC_REG_ST_ON_LOW_POW (0x3) - /* VDD2 & VDD1 voltage selection register. (VDD2_OP_REG & VDD1_OP_REG) */ #define PMIC_OP_REG_SEL(0x7F) -- 2.43.0
[PATCH 25/37] board: qualcomm: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/qualcomm/dragonboard410c/dragonboard410c.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index bd2e213b3bc..fcbf2c3fe60 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -115,7 +115,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) do_fixup_by_compat(blob, "qcom,wcnss-wlan", "local-mac-address", mac, ARP_HLEN, 1); - if (!eth_env_get_enetaddr("btaddr", mac)) { msm_generate_mac_addr(mac); -- 2.43.0
[PATCH 24/37] board: opalkelly: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c index 0cbfc08183c..1c63277d928 100644 --- a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c +++ b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c @@ -254,7 +254,6 @@ unsigned long ps7_reset_apu_3_0[] = { EMIT_EXIT(), }; - int ps7_post_config(void) { return ps7_config(ps7_post_config_3_0); -- 2.43.0
[PATCH 23/37] board: mntre: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/mntre/imx8mq_reform2/imx8mq_reform2.c | 2 -- board/mntre/imx8mq_reform2/lpddr4_timing.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/board/mntre/imx8mq_reform2/imx8mq_reform2.c b/board/mntre/imx8mq_reform2/imx8mq_reform2.c index ebc490e24b1..6ee1c5c52a1 100644 --- a/board/mntre/imx8mq_reform2/imx8mq_reform2.c +++ b/board/mntre/imx8mq_reform2/imx8mq_reform2.c @@ -28,14 +28,12 @@ DECLARE_GLOBAL_DATA_PTR; - #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE) static iomux_v3_cfg_t const wdog_pads[] = { IMX8MQ_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; - int board_early_init_f(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; diff --git a/board/mntre/imx8mq_reform2/lpddr4_timing.c b/board/mntre/imx8mq_reform2/lpddr4_timing.c index e5303db0f80..96d2a3fc6c7 100644 --- a/board/mntre/imx8mq_reform2/lpddr4_timing.c +++ b/board/mntre/imx8mq_reform2/lpddr4_timing.c @@ -312,7 +312,6 @@ static struct dram_cfg_param lpddr4_fsp0_cfg[] = { { 0xd, 1 }, }; - /* P1 message block parameter for training firmware */ static struct dram_cfg_param lpddr4_fsp1_cfg[] = { { 0xd, 0 }, @@ -352,7 +351,6 @@ static struct dram_cfg_param lpddr4_fsp1_cfg[] = { { 0xd, 1 }, }; - /* P0 2D message block parameter for training firmware */ static struct dram_cfg_param lpddr4_fsp0_2d_cfg[] = { { 0xd, 0 }, -- 2.43.0
[PATCH 22/37] board: logicpd: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/logicpd/omap3som/omap3logic.h | 1 - 1 file changed, 1 deletion(-) diff --git a/board/logicpd/omap3som/omap3logic.h b/board/logicpd/omap3som/omap3logic.h index ba63aa04c34..55d8f429513 100644 --- a/board/logicpd/omap3som/omap3logic.h +++ b/board/logicpd/omap3som/omap3logic.h @@ -19,7 +19,6 @@ #define NET_LAN92XX_GPMC_CONFIG5 0x00080a0a #define NET_LAN92XX_GPMC_CONFIG6 0x03000280 - const omap3_sysinfo sysinfo = { DDR_DISCRETE, "Logic DM37x/OMAP35x reference board", -- 2.43.0
[PATCH 21/37] board: l+g: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/l+g/vinco/vinco.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c index 066d315baa2..39e7ff633b3 100644 --- a/board/l+g/vinco/vinco.c +++ b/board/l+g/vinco/vinco.c @@ -62,7 +62,6 @@ static void vinco_spi0_hw_init(void) } #endif /* CONFIG_ATMEL_SPI */ - #ifdef CONFIG_CMD_USB static void vinco_usb_hw_init(void) { @@ -72,7 +71,6 @@ static void vinco_usb_hw_init(void) } #endif - #ifdef CONFIG_GENERIC_ATMEL_MCI void vinco_mci0_hw_init(void) { -- 2.43.0
[PATCH 20/37] board: kontron: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/kontron/pitx_imx8m/pitx_imx8m.c | 1 - board/kontron/pitx_imx8m/spl.c| 2 -- 2 files changed, 3 deletions(-) diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index a908aee9ecc..2ee97169c6f 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -84,7 +84,6 @@ int board_phys_sdram_size(phys_size_t *memsize) return 0; } - #ifdef CONFIG_FEC_MXC #define FEC_RST_PAD IMX_GPIO_NR(1, 11) static iomux_v3_cfg_t const fec1_rst_pads[] = { diff --git a/board/kontron/pitx_imx8m/spl.c b/board/kontron/pitx_imx8m/spl.c index 475e52f6231..bd5981bf694 100644 --- a/board/kontron/pitx_imx8m/spl.c +++ b/board/kontron/pitx_imx8m/spl.c @@ -28,7 +28,6 @@ extern struct dram_timing_info dram_timing_4gb; DECLARE_GLOBAL_DATA_PTR; - static void spl_dram_init(void) { struct dram_timing_info *dram_timing; @@ -89,7 +88,6 @@ int board_mmc_getcd(struct mmc *mmc) return 0; } - #define USDHC_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE | \ PAD_CTL_FSEL2) #define USDHC_GPIO_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_DSE1) -- 2.43.0
[PATCH 19/37] board: is1: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/is1/qts/iocsr_config.h | 1 - board/is1/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/is1/qts/iocsr_config.h b/board/is1/qts/iocsr_config.h index e54af2caed4..619b8a6706e 100644 --- a/board/is1/qts/iocsr_config.h +++ b/board/is1/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/is1/qts/pll_config.h b/board/is1/qts/pll_config.h index 0a5f5dd196f..95a4fb6305e 100644 --- a/board/is1/qts/pll_config.h +++ b/board/is1/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 18/37] board: hisilicon: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/hisilicon/hikey/hikey.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 95a831efcaf..29165266630 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -244,7 +244,6 @@ static int config_sd_carddetect(void) return 0; } - static void mmc1_init_pll(void) { uint32_t data; @@ -339,7 +338,6 @@ static void mmc0_reset_clk(void) } while (data & PERI_RST0_MMC0); } - /* PMU SSI is the IP that maps the external PMU hi6553 registers as IO */ static void hi6220_pmussi_init(void) { @@ -398,7 +396,6 @@ static int init_dwmmc(void) if (ret) printf("%s: Error adding eMMC port (%d)\n", __func__, ret); - /* take mmc1 (sd slot) out of reset, configure clocks and pinmuxing */ mmc1_init_pll(); mmc1_reset_clk(); -- 2.43.0
[PATCH 17/37] board: ge: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/ge/bx50v3/bx50v3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index 2d8951964a8..e1d08475e94 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -434,7 +434,6 @@ static const struct boot_mode board_boot_modes[] = { }; #endif - /* * The SoM used by these boards has XTAL not connected despite datasheet * suggesting connecting unused XTAL pins to ground. Without explicitly -- 2.43.0
[PATCH 16/37] board: gdsys: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/gdsys/common/dp501.c | 1 - board/gdsys/common/ioep-fpga.c | 1 - board/gdsys/common/osd.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c index 7698e76b524..715544c31ec 100644 --- a/board/gdsys/common/dp501.c +++ b/board/gdsys/common/dp501.c @@ -136,7 +136,6 @@ void dp501_powerdown(u8 addr) dp501_setbits(addr, 0x0a, 0x30); /* power down encoder, standby mode */ } - int dp501_probe(unsigned screen, bool power) { #ifdef CONFIG_SYS_DP501_BASE diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c index f01b48b5c8e..eea486a03fb 100644 --- a/board/gdsys/common/ioep-fpga.c +++ b/board/gdsys/common/ioep-fpga.c @@ -6,7 +6,6 @@ #ifdef CONFIG_GDSYS_LEGACY_DRIVERS - #include #include diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c index bd9c5ca9969..915b733547f 100644 --- a/board/gdsys/common/osd.c +++ b/board/gdsys/common/osd.c @@ -165,7 +165,6 @@ static unsigned int ics8n3qv01_get_fout_calc(unsigned index) return fout_calc; } - static void ics8n3qv01_calc_parameters(unsigned int fout, unsigned int *_mint, unsigned int *_mfrac, unsigned int *_n) @@ -424,7 +423,6 @@ int osd_write(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) y = hextoul(argv[2], NULL); rp = argv[3]; - while (*rp) { char substr[5]; -- 2.43.0
[PATCH 15/37] board: freescale: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/freescale/common/cadmus.c | 5 - board/freescale/common/cadmus.h | 4 board/freescale/common/eeprom.h | 3 --- board/freescale/common/fsl_validate.c | 2 -- board/freescale/imx8mn_evk/ddr4_timing.c | 1 - board/freescale/imx8mn_evk/ddr4_timing_ld.c | 2 -- board/freescale/ls1012ardb/ls1012ardb.c | 1 - board/freescale/ls1021aiot/ls1021aiot.c | 1 - board/freescale/ls1043aqds/ls1043aqds.c | 1 - board/freescale/ls1088a/ddr.c | 1 - board/freescale/ls2080aqds/ddr.c | 1 - board/freescale/ls2080aqds/ddr.h | 1 - board/freescale/ls2080ardb/ddr.c | 1 - board/freescale/ls2080ardb/ddr.h | 1 - board/freescale/m5249evb/m5249evb.c | 2 -- board/freescale/m5253demo/m5253demo.c | 1 - board/freescale/m5275evb/m5275evb.c | 1 - board/freescale/mpc8548cds/ddr.c | 1 - board/freescale/mx6sabreauto/mx6sabreauto.c | 3 --- board/freescale/mx6sllevk/mx6sllevk.c | 1 - board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 1 - board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 -- board/freescale/p1010rdb/p1010rdb.c | 1 - board/freescale/t102xrdb/cpld.h | 1 - board/freescale/t104xrdb/eth.c| 1 - board/freescale/t208xqds/t208xqds_qixis.h | 1 - board/freescale/t208xqds/tlb.c| 1 - board/freescale/t208xrdb/tlb.c| 1 - board/freescale/t4rdb/ddr.c | 1 - board/freescale/t4rdb/ddr.h | 1 - board/freescale/vf610twr/vf610twr.c | 1 - 31 files changed, 46 deletions(-) diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c index 6f66ed6851d..e5ecd0e19c6 100644 --- a/board/freescale/common/cadmus.c +++ b/board/freescale/common/cadmus.c @@ -3,7 +3,6 @@ * Copyright 2004, 2011 Freescale Semiconductor. */ - #include #include #include @@ -27,7 +26,6 @@ typedef struct cadmus_reg { u_char cm_reserved[248]; /* Total 256 bytes */ } cadmus_reg_t; - unsigned int get_board_version(void) { @@ -36,7 +34,6 @@ get_board_version(void) return cadmus->cm_ver; } - unsigned long get_board_sys_clk(void) { @@ -54,7 +51,6 @@ get_board_sys_clk(void) } } - unsigned int get_pci_slot(void) { @@ -66,7 +62,6 @@ get_pci_slot(void) return ((cadmus->cm_csr >> 6) & 0x3) + 1; } - unsigned int get_pci_dual(void) { diff --git a/board/freescale/common/cadmus.h b/board/freescale/common/cadmus.h index fb74e8f6db5..93cea120845 100644 --- a/board/freescale/common/cadmus.h +++ b/board/freescale/common/cadmus.h @@ -6,7 +6,6 @@ #ifndef __CADMUS_H_ #define __CADMUS_H_ - /* * CADMUS Board System Register interface. */ @@ -21,17 +20,14 @@ extern unsigned int get_board_version(void); */ extern unsigned long get_board_sys_clk(void); - /* * Returns 1 - 4, as found in the USER CSR[6:7] bits. */ extern unsigned int get_pci_slot(void); - /* * Returns PCI DUAL as found in CM_PCI[3]. */ extern unsigned int get_pci_dual(void); - #endif /* __CADMUS_H_ */ diff --git a/board/freescale/common/eeprom.h b/board/freescale/common/eeprom.h index 328fd3974b1..1d0685fde67 100644 --- a/board/freescale/common/eeprom.h +++ b/board/freescale/common/eeprom.h @@ -6,12 +6,10 @@ #ifndef __EEPROM_H_ #define __EEPROM_H_ - /* * EEPROM Board System Register interface. */ - /* * CPU Board Revision */ @@ -29,5 +27,4 @@ */ extern unsigned int get_cpu_board_revision(void); - #endif /* __CADMUS_H_ */ diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index e03434dcdfe..657f4533bcd 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -327,7 +327,6 @@ static u32 read_validate_ie_tbl(struct fsl_secboot_img_priv *img) } #endif - /* This function return length of public key.*/ static inline u32 get_key_len(struct fsl_secboot_img_priv *img) { @@ -858,7 +857,6 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr) return 0; } - /* haddr - Address of the header of image to be validated. * arg_hash_str - Option hash string. If provided, this * overrides the key hash in the SFP fuses. diff --git a/board/freescale/imx8mn_evk/ddr4_timing.c b/board/freescale/imx8mn_evk/ddr4_timing.c index 77611ea0260..ce39c9e2bcf 100644 --- a/board/freescale/imx8mn_evk/ddr4_timing.c +++ b/board/freescale/imx8mn_evk/ddr4_timing.c @@ -787,7 +787,6 @@ struct dram_cfg_param ddr_fsp1_cfg[] = { { 0xd, 0x1 }, }; - /* P0 2D message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp0_2d_cfg[] = { { 0xd0
[PATCH 14/37] board: engicam: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/engicam/imx6q/imx6q.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c index d799fe6526a..a8d54128476 100644 --- a/board/engicam/imx6q/imx6q.c +++ b/board/engicam/imx6q/imx6q.c @@ -5,7 +5,6 @@ * Author: Jagan Teki */ - #include #include #include -- 2.43.0
[PATCH 13/37] board: ebv: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/ebv/socrates/qts/iocsr_config.h | 1 - board/ebv/socrates/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/ebv/socrates/qts/iocsr_config.h b/board/ebv/socrates/qts/iocsr_config.h index c24b5cb5f0b..d9a0c72044b 100644 --- a/board/ebv/socrates/qts/iocsr_config.h +++ b/board/ebv/socrates/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/ebv/socrates/qts/pll_config.h b/board/ebv/socrates/qts/pll_config.h index eaa18c1c802..baee1a922a8 100644 --- a/board/ebv/socrates/qts/pll_config.h +++ b/board/ebv/socrates/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 12/37] board: dhelectronics: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c index 3a5495ea18e..a50763e1926 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c +++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c @@ -541,7 +541,6 @@ static int spl_dram_perform_cal(struct mx6_ddr_sysinfo const *sysinfo) return ret; } - /* DRAM */ static void dhcom_spl_dram_init(void) { -- 2.43.0
[PATCH 11/37] board: devboards: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/devboards/dbm-soc1/qts/iocsr_config.h | 1 - board/devboards/dbm-soc1/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/devboards/dbm-soc1/qts/iocsr_config.h b/board/devboards/dbm-soc1/qts/iocsr_config.h index 56b2130671a..6bec839e283 100644 --- a/board/devboards/dbm-soc1/qts/iocsr_config.h +++ b/board/devboards/dbm-soc1/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/devboards/dbm-soc1/qts/pll_config.h b/board/devboards/dbm-soc1/qts/pll_config.h index 104e324d8a4..52f1eb0c7b4 100644 --- a/board/devboards/dbm-soc1/qts/pll_config.h +++ b/board/devboards/dbm-soc1/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 10/37] board: davinci: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/davinci/da8xxevm/omapl138_lcdk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 607e05ad9ae..03c34455c50 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -167,7 +167,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; - /* setup the SUSPSRC for ARM to control emulation suspend */ writel(readl(_syscfg_regs->suspsrc) & ~(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C | @@ -195,7 +194,6 @@ int board_init(void) _emif_regs->ab2cr); /* CS3 */ #endif - #ifdef CONFIG_MMC_DAVINCI if (davinci_configure_pin_mux(mmc0_pins, ARRAY_SIZE(mmc0_pins)) != 0) return 1; -- 2.43.0
[PATCH 09/37] board: congatec: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/congatec/cgtqmx8/cgtqmx8.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index 99c33a1943e..054e4e10867 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -371,7 +371,6 @@ void detail_board_ddr_info(void) puts("\nDDR"); } - #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { -- 2.43.0
[PATCH 08/37] board: compulab: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/compulab/cm_fx6/cm_fx6.c | 1 - board/compulab/cm_fx6/common.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 4a6cc3e5630..c6d33c32ccd 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -252,7 +252,6 @@ I2C_PADS(i2c2_pads, PAD_GPIO_6__GPIO1_IO06 | MUX_PAD_CTRL(I2C_PAD_CTRL), IMX_GPIO_NR(1, 6)); - static int cm_fx6_setup_one_i2c(int busnum, struct i2c_pads_info *pads) { int ret; diff --git a/board/compulab/cm_fx6/common.h b/board/compulab/cm_fx6/common.h index debef15880f..17b56ddc283 100644 --- a/board/compulab/cm_fx6/common.h +++ b/board/compulab/cm_fx6/common.h @@ -31,6 +31,5 @@ #define CM_FX6_SATA_NRSTDLYIMX_GPIO_NR(6, 6) #define CM_FX6_SATA_PWLOSS_INT IMX_GPIO_NR(6, 31) - void cm_fx6_set_usdhc_iomux(void); void cm_fx6_set_ecspi_iomux(void); -- 2.43.0
[PATCH 07/37] board: cobra5272: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/cobra5272/flash.c | 5 - 1 file changed, 5 deletions(-) diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 157b71da85e..616842e62f4 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -61,7 +61,6 @@ Done: return; } - unsigned long flash_init(void) { int i, j; @@ -112,7 +111,6 @@ unsigned long flash_init(void) return size; } - #define CMD_READ_ARRAY 0x00F0 #define CMD_UNLOCK10x00AA #define CMD_UNLOCK20x0055 @@ -133,7 +131,6 @@ unsigned long flash_init(void) #define ERR 2 #define TMO 4 - int flash_erase(flash_info_t *info, int s_first, int s_last) { ulong result; @@ -267,7 +264,6 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) if ((result & data) != data) return ERR_NOT_ERASED; - /* * Disable interrupts which might cause a timeout * here. Remember that our exception vectors are @@ -317,7 +313,6 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) return rc; } - int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { ulong wp, data; -- 2.43.0
[PATCH 06/37] board: cadence: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/cadence/xtfpga/xtfpga.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 6b92fe31c0e..5e6470d771f 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -23,7 +23,6 @@ DECLARE_GLOBAL_DATA_PTR; * (Print information about the board to stdout.) */ - #if defined(CONFIG_XTFPGA_LX60) const char *board = "XT_AV60"; const char *description = "Avnet Xilinx LX60 FPGA Evaluation Board / "; -- 2.43.0
[PATCH 05/37] board: armltd: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/armltd/vexpress64/pcie.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index 1045c905f73..301d95e44fa 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -109,7 +109,6 @@ static void xr3pci_setup_atr(void) XR3_PCI_MEMSPACE64_SIZE, XR3PCI_ATR_TRSLID_AXIMEMORY); - /* setup CPU to PCIe address translation table */ base = XR3_CONFIG_BASE + XR3PCI_ATR_AXI4_SLV0; -- 2.43.0
[PATCH 04/37] board: aries: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/aries/mcvevk/qts/iocsr_config.h | 1 - board/aries/mcvevk/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/aries/mcvevk/qts/iocsr_config.h b/board/aries/mcvevk/qts/iocsr_config.h index dbcc1d719d4..3084c6a4eb8 100644 --- a/board/aries/mcvevk/qts/iocsr_config.h +++ b/board/aries/mcvevk/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/aries/mcvevk/qts/pll_config.h b/board/aries/mcvevk/qts/pll_config.h index 62cf6796afc..fc1ba89819a 100644 --- a/board/aries/mcvevk/qts/pll_config.h +++ b/board/aries/mcvevk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 03/37] board: altera: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/altera/arria5-socdk/qts/iocsr_config.h | 1 - board/altera/arria5-socdk/qts/pll_config.h | 1 - board/altera/cyclone5-socdk/qts/iocsr_config.h | 1 - board/altera/cyclone5-socdk/qts/pll_config.h | 1 - 4 files changed, 4 deletions(-) diff --git a/board/altera/arria5-socdk/qts/iocsr_config.h b/board/altera/arria5-socdk/qts/iocsr_config.h index f201ad34587..9bd3e1b5abf 100644 --- a/board/altera/arria5-socdk/qts/iocsr_config.h +++ b/board/altera/arria5-socdk/qts/iocsr_config.h @@ -691,5 +691,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4100, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/altera/arria5-socdk/qts/pll_config.h b/board/altera/arria5-socdk/qts/pll_config.h index 7fe290b28d9..902caf450d3 100644 --- a/board/altera/arria5-socdk/qts/pll_config.h +++ b/board/altera/arria5-socdk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 2 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/altera/cyclone5-socdk/qts/iocsr_config.h b/board/altera/cyclone5-socdk/qts/iocsr_config.h index a571fb3e509..6df8cdb12dd 100644 --- a/board/altera/cyclone5-socdk/qts/iocsr_config.h +++ b/board/altera/cyclone5-socdk/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4100, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/altera/cyclone5-socdk/qts/pll_config.h b/board/altera/cyclone5-socdk/qts/pll_config.h index a46d124e9e9..59a9dcfdb61 100644 --- a/board/altera/cyclone5-socdk/qts/pll_config.h +++ b/board/altera/cyclone5-socdk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 02/37] board: advantech: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index 070933fb54b..cc3a6624155 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -59,7 +59,6 @@ struct efi_capsule_update_info update_info = { #endif /* EFI_HAVE_CAPSULE_SUPPORT */ - int board_early_init_f(void) { init_uart_clk(2); -- 2.43.0
[PATCH 01/37] board: BuS: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/BuS/eb_cpu5282/eb_cpu5282.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index cf5610861b5..c254da62bf4 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -181,5 +181,4 @@ void __led_set(led_id_t mask, int state) /*---*/ - /* EOF EB+MCF-EV123.c */ -- 2.43.0
Re: [PATCH 01/37] board: BuS: Remove duplicate newlines
On 7/19/24 12:27 PM, Marek Vasut wrote: Drop all duplicate newlines. No functional change. Please ignore, my ISP sucks, I have to resend this.
[PATCH 14/37] board: engicam: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/engicam/imx6q/imx6q.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c index d799fe6526a..a8d54128476 100644 --- a/board/engicam/imx6q/imx6q.c +++ b/board/engicam/imx6q/imx6q.c @@ -5,7 +5,6 @@ * Author: Jagan Teki */ - #include #include #include -- 2.43.0
[PATCH 13/37] board: ebv: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/ebv/socrates/qts/iocsr_config.h | 1 - board/ebv/socrates/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/ebv/socrates/qts/iocsr_config.h b/board/ebv/socrates/qts/iocsr_config.h index c24b5cb5f0b..d9a0c72044b 100644 --- a/board/ebv/socrates/qts/iocsr_config.h +++ b/board/ebv/socrates/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/ebv/socrates/qts/pll_config.h b/board/ebv/socrates/qts/pll_config.h index eaa18c1c802..baee1a922a8 100644 --- a/board/ebv/socrates/qts/pll_config.h +++ b/board/ebv/socrates/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 12/37] board: dhelectronics: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c index 3a5495ea18e..a50763e1926 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c +++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c @@ -541,7 +541,6 @@ static int spl_dram_perform_cal(struct mx6_ddr_sysinfo const *sysinfo) return ret; } - /* DRAM */ static void dhcom_spl_dram_init(void) { -- 2.43.0
[PATCH 11/37] board: devboards: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/devboards/dbm-soc1/qts/iocsr_config.h | 1 - board/devboards/dbm-soc1/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/devboards/dbm-soc1/qts/iocsr_config.h b/board/devboards/dbm-soc1/qts/iocsr_config.h index 56b2130671a..6bec839e283 100644 --- a/board/devboards/dbm-soc1/qts/iocsr_config.h +++ b/board/devboards/dbm-soc1/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/devboards/dbm-soc1/qts/pll_config.h b/board/devboards/dbm-soc1/qts/pll_config.h index 104e324d8a4..52f1eb0c7b4 100644 --- a/board/devboards/dbm-soc1/qts/pll_config.h +++ b/board/devboards/dbm-soc1/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 10/37] board: davinci: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/davinci/da8xxevm/omapl138_lcdk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 607e05ad9ae..03c34455c50 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -167,7 +167,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; - /* setup the SUSPSRC for ARM to control emulation suspend */ writel(readl(_syscfg_regs->suspsrc) & ~(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C | @@ -195,7 +194,6 @@ int board_init(void) _emif_regs->ab2cr); /* CS3 */ #endif - #ifdef CONFIG_MMC_DAVINCI if (davinci_configure_pin_mux(mmc0_pins, ARRAY_SIZE(mmc0_pins)) != 0) return 1; -- 2.43.0
[PATCH 09/37] board: congatec: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/congatec/cgtqmx8/cgtqmx8.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index 99c33a1943e..054e4e10867 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -371,7 +371,6 @@ void detail_board_ddr_info(void) puts("\nDDR"); } - #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { -- 2.43.0
[PATCH 06/37] board: cadence: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/cadence/xtfpga/xtfpga.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 6b92fe31c0e..5e6470d771f 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -23,7 +23,6 @@ DECLARE_GLOBAL_DATA_PTR; * (Print information about the board to stdout.) */ - #if defined(CONFIG_XTFPGA_LX60) const char *board = "XT_AV60"; const char *description = "Avnet Xilinx LX60 FPGA Evaluation Board / "; -- 2.43.0
[PATCH 08/37] board: compulab: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/compulab/cm_fx6/cm_fx6.c | 1 - board/compulab/cm_fx6/common.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 4a6cc3e5630..c6d33c32ccd 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -252,7 +252,6 @@ I2C_PADS(i2c2_pads, PAD_GPIO_6__GPIO1_IO06 | MUX_PAD_CTRL(I2C_PAD_CTRL), IMX_GPIO_NR(1, 6)); - static int cm_fx6_setup_one_i2c(int busnum, struct i2c_pads_info *pads) { int ret; diff --git a/board/compulab/cm_fx6/common.h b/board/compulab/cm_fx6/common.h index debef15880f..17b56ddc283 100644 --- a/board/compulab/cm_fx6/common.h +++ b/board/compulab/cm_fx6/common.h @@ -31,6 +31,5 @@ #define CM_FX6_SATA_NRSTDLYIMX_GPIO_NR(6, 6) #define CM_FX6_SATA_PWLOSS_INT IMX_GPIO_NR(6, 31) - void cm_fx6_set_usdhc_iomux(void); void cm_fx6_set_ecspi_iomux(void); -- 2.43.0
[PATCH 07/37] board: cobra5272: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/cobra5272/flash.c | 5 - 1 file changed, 5 deletions(-) diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 157b71da85e..616842e62f4 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -61,7 +61,6 @@ Done: return; } - unsigned long flash_init(void) { int i, j; @@ -112,7 +111,6 @@ unsigned long flash_init(void) return size; } - #define CMD_READ_ARRAY 0x00F0 #define CMD_UNLOCK10x00AA #define CMD_UNLOCK20x0055 @@ -133,7 +131,6 @@ unsigned long flash_init(void) #define ERR 2 #define TMO 4 - int flash_erase(flash_info_t *info, int s_first, int s_last) { ulong result; @@ -267,7 +264,6 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) if ((result & data) != data) return ERR_NOT_ERASED; - /* * Disable interrupts which might cause a timeout * here. Remember that our exception vectors are @@ -317,7 +313,6 @@ static int write_word(flash_info_t *info, ulong dest, ulong data) return rc; } - int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { ulong wp, data; -- 2.43.0
[PATCH 05/37] board: armltd: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/armltd/vexpress64/pcie.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index 1045c905f73..301d95e44fa 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -109,7 +109,6 @@ static void xr3pci_setup_atr(void) XR3_PCI_MEMSPACE64_SIZE, XR3PCI_ATR_TRSLID_AXIMEMORY); - /* setup CPU to PCIe address translation table */ base = XR3_CONFIG_BASE + XR3PCI_ATR_AXI4_SLV0; -- 2.43.0
[PATCH 04/37] board: aries: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/aries/mcvevk/qts/iocsr_config.h | 1 - board/aries/mcvevk/qts/pll_config.h | 1 - 2 files changed, 2 deletions(-) diff --git a/board/aries/mcvevk/qts/iocsr_config.h b/board/aries/mcvevk/qts/iocsr_config.h index dbcc1d719d4..3084c6a4eb8 100644 --- a/board/aries/mcvevk/qts/iocsr_config.h +++ b/board/aries/mcvevk/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4000, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/aries/mcvevk/qts/pll_config.h b/board/aries/mcvevk/qts/pll_config.h index 62cf6796afc..fc1ba89819a 100644 --- a/board/aries/mcvevk/qts/pll_config.h +++ b/board/aries/mcvevk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 3 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 03/37] board: altera: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/altera/arria5-socdk/qts/iocsr_config.h | 1 - board/altera/arria5-socdk/qts/pll_config.h | 1 - board/altera/cyclone5-socdk/qts/iocsr_config.h | 1 - board/altera/cyclone5-socdk/qts/pll_config.h | 1 - 4 files changed, 4 deletions(-) diff --git a/board/altera/arria5-socdk/qts/iocsr_config.h b/board/altera/arria5-socdk/qts/iocsr_config.h index f201ad34587..9bd3e1b5abf 100644 --- a/board/altera/arria5-socdk/qts/iocsr_config.h +++ b/board/altera/arria5-socdk/qts/iocsr_config.h @@ -691,5 +691,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4100, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/altera/arria5-socdk/qts/pll_config.h b/board/altera/arria5-socdk/qts/pll_config.h index 7fe290b28d9..902caf450d3 100644 --- a/board/altera/arria5-socdk/qts/pll_config.h +++ b/board/altera/arria5-socdk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 2 #define CFG_HPS_ALTERAGRP_DBGATCLK 3 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ diff --git a/board/altera/cyclone5-socdk/qts/iocsr_config.h b/board/altera/cyclone5-socdk/qts/iocsr_config.h index a571fb3e509..6df8cdb12dd 100644 --- a/board/altera/cyclone5-socdk/qts/iocsr_config.h +++ b/board/altera/cyclone5-socdk/qts/iocsr_config.h @@ -655,5 +655,4 @@ const unsigned long iocsr_scan_chain3_table[] = { 0x4100, }; - #endif /* __SOCFPGA_IOCSR_CONFIG_H__ */ diff --git a/board/altera/cyclone5-socdk/qts/pll_config.h b/board/altera/cyclone5-socdk/qts/pll_config.h index a46d124e9e9..59a9dcfdb61 100644 --- a/board/altera/cyclone5-socdk/qts/pll_config.h +++ b/board/altera/cyclone5-socdk/qts/pll_config.h @@ -80,5 +80,4 @@ #define CFG_HPS_ALTERAGRP_MAINCLK 4 #define CFG_HPS_ALTERAGRP_DBGATCLK 4 - #endif /* __SOCFPGA_PLL_CONFIG_H__ */ -- 2.43.0
[PATCH 02/37] board: advantech: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index 070933fb54b..cc3a6624155 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -59,7 +59,6 @@ struct efi_capsule_update_info update_info = { #endif /* EFI_HAVE_CAPSULE_SUPPORT */ - int board_early_init_f(void) { init_uart_clk(2); -- 2.43.0
[PATCH 01/37] board: BuS: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut --- board/BuS/eb_cpu5282/eb_cpu5282.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index cf5610861b5..c254da62bf4 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -181,5 +181,4 @@ void __led_set(led_id_t mask, int state) /*---*/ - /* EOF EB+MCF-EV123.c */ -- 2.43.0
[PULL] u-boot-sh/master
The following changes since commit b182816c1fb436916661949213c543bf4d42250b: turris_1x: Normalize Kconfig usage (2024-07-13 10:42:15 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sh.git master for you to fetch changes up to 5485f53289b37aeab4bf20c3980927cfc3dbf247: dt-bindings: clock: rcar-gen2: Remove obsolete header files (2024-07-13 20:08:09 +0200) Geert Uytterhoeven (1): dt-bindings: clock: rcar-gen2: Remove obsolete header files include/dt-bindings/clock/r8a7790-clock.h | 158 - include/dt-bindings/clock/r8a7791-clock.h | 161 -- include/dt-bindings/clock/r8a7792-clock.h | 98 -- include/dt-bindings/clock/r8a7793-clock.h | 159 - include/dt-bindings/clock/r8a7794-clock.h | 137 - 5 files changed, 713 deletions(-) delete mode 100644 include/dt-bindings/clock/r8a7790-clock.h delete mode 100644 include/dt-bindings/clock/r8a7791-clock.h delete mode 100644 include/dt-bindings/clock/r8a7792-clock.h delete mode 100644 include/dt-bindings/clock/r8a7793-clock.h delete mode 100644 include/dt-bindings/clock/r8a7794-clock.h
[PULL] u-boot-usb/master
The following changes since commit b182816c1fb436916661949213c543bf4d42250b: turris_1x: Normalize Kconfig usage (2024-07-13 10:42:15 -0600) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 1bd136715a4d3a8e44ccbe693e4c2a9010efb342: eth: asix88179: reset during probe (2024-07-13 19:51:16 +0200) Caleb Connolly (1): eth: asix88179: reset during probe drivers/usb/eth/asix88179.c | 6 ++ 1 file changed, 6 insertions(+)
Re: [PATCH uboot] dt-bindings: clock: rcar-gen2: Remove obsolete header files
On 7/12/24 3:17 PM, Geert Uytterhoeven wrote: The clock definitions in were superseded by those in a long time ago. In fact U-Boot never used . The unused headers, their replacements, and the corresponding r8a779?.dtsi files were introduced together in U-Boot v2018.03. Fixes: 16b6e4aa3732cee1 ("ARM: dts: rmobile: Import R8A7790 DTS from Linux 4.15-rc8") Fixes: edd15fcffba31452 ("ARM: dts: rmobile: Import R8A7791 DTS from Linux 4.15-rc8") Fixes: a3fb9ff3b33fae05 ("ARM: dts: rmobile: Import R8A7792 DTS from Linux 4.15-rc8") Fixes: 92aa09959271d08f ("ARM: dts: rmobile: Import R8A7793 DTS from Linux 4.15-rc8") Fixes: 9a26fc5a73fe2369 ("ARM: dts: rmobile: Import R8A7794 DTS from Linux 4.15-rc8") Signed-off-by: Geert Uytterhoeven Reviewed-by: Marek Vasut Thanks