December 2018 - U-Boot

[U-Boot] [BUG] sandbox_defconfig cannot be run anymore after 4a5b5e1a466d76f "sandbox: Update some drivers to work in SPL/TPL"
by Heinrich Schuchardt 03 Dec '18

03 Dec '18

On Debian Buster with gcc 8.2.0 commit d814ff34a1ffb1e60059c964ad692c5c8fc8564b $ make mrproper $ make sandbox_defconfig $ ./u-boot -D Error binding driver 'sandbox_tpm': -12 Error binding driver 'serial_sandbox': -12 Some drivers failed to bind initcall sequence 000055af34e45860 failed at call 000055af34cf5749 (err=-12) ### ERROR ### Please RESET the board ## Git bisect points to commit 4a5b5e1a466d76fc1c9e6fc8a6ee1337acdcadd0 Author: Simon Glass <sjg(a)chromium.org> Date: Tue Nov 6 15:21:27 2018 -0700 sandbox: Update some drivers to work in SPL/TPL At present sandbox drivers are mostly not used before relocation. Some of these are needed by Chromium OS verified boot, since it uses sandbox TPL, so update them accordingly. Signed-off-by: Simon Glass <sjg(a)chromium.org> Best regards Heinrich

3 2

[U-Boot] [PATCH v1 0/3] ddr: vybrid: Support for vf610 built-in DDR3 memory calibration
by Lukasz Majewski 03 Dec '18

03 Dec '18

This patch series provides code to perform read leveling - RDLVL, which is adjusting the DQS strobe in relation to the DQ signals so that the strobe edge is centered in the window of valid read data. The code is based on Vybrid's Reference Manual's: "VFxxx Controller Reference Manual, Rev. 0, 10/2016", page 1600, 10.1.6.16.4.1 "Software Read Leveling in MC Evaluation Mode" and uses clarification provided by following NXP's community thread: "Vybrid: About DDR leveling feature on DDRMC." https://community.nxp.com/thread/395323 It depends on a BITMAP rework patch: usb: composite: Move bitmap related operations to ./include/linux/bitmap.h http://patchwork.ozlabs.org/patch/1006448/ Lukasz Majewski (3): ddr: vybrid: Add DDRMC calibration related registers (DQS to DQ) ddr: vybrid: Provide code to perform on-boot calibration ddr: vybrid: Add calibration code to memory controler's (DDRMC) setup code arch/arm/include/asm/arch-vf610/imx-regs.h | 6 + arch/arm/mach-imx/Kconfig | 8 + arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/ddrmc-vf610-calibration.c | 336 ++++++++++++++++++++++++++++ arch/arm/mach-imx/ddrmc-vf610-calibration.h | 59 +++++ arch/arm/mach-imx/ddrmc-vf610.c | 7 + 6 files changed, 417 insertions(+) create mode 100644 arch/arm/mach-imx/ddrmc-vf610-calibration.c create mode 100644 arch/arm/mach-imx/ddrmc-vf610-calibration.h -- 2.11.0

3 10

[U-Boot] [PATCH v2 1/3] Enable FEC driver to retrieve PHY address from device tree
by Martyn Welch 03 Dec '18

03 Dec '18

Currently if we have more than one phy on the MDIO bus, we do not have a good mechanism for determining which should be used at runtime. Enable the FEC driver to determine the address for the PHY from the device tree. Signed-off-by: Martyn Welch <martyn.welch(a)collabora.com> --- Changes in v2: - New in v2 drivers/net/fec_mxc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 99c5c649a0..425f6197cb 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1264,11 +1264,32 @@ static const struct eth_ops fecmxc_ops = { .read_rom_hwaddr = fecmxc_read_rom_hwaddr, }; +static int device_get_phy_addr(struct udevice *dev) +{ + struct ofnode_phandle_args phandle_args; + int reg; + + if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, + &phandle_args)) { + debug("Failed to find phy-handle"); + return -ENODEV; + } + + reg = ofnode_read_u32_default(phandle_args.node, "reg", 0); + + return reg; +} + static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) { struct phy_device *phydev; + int addr; int mask = 0xffffffff; + addr = device_get_phy_addr(dev); + if (addr >= 0) + mask = 1 << addr; + #ifdef CONFIG_FEC_MXC_PHYADDR mask = 1 << CONFIG_FEC_MXC_PHYADDR; #endif -- 2.19.1

7 14

[U-Boot] adding saveenv-command for bananapi r2
by Frank Wunderlich 03 Dec '18

03 Dec '18

>From f5a9045316f962f397497bd169a20dc293b14641 Mon Sep 17 00:00:00 2001 From: Frank Wunderlich <frank-w(a)public-files.de> Date: Mon, 3 Dec 2018 15:32:58 +0100 Subject: [PATCH] adding saveenv-command for bananapi r2 BananaPi r2 can be booted from sd-card and emmc saving the environment have to choose the storage from which the device has booted also the offset is set to 1MB to make sure env is written to block "user data area" between uboot and first partition https://www.fw-web.de/dokuwiki/lib/exe/fetch.php?cache=&media=bpi-r2:boot-s… Signed-off-by: Frank Wunderlich <frank-w(a)public-files.de> --- board/mediatek/mt7623/mt7623_rfb.c | 22 ++++++++++++++++++++++ configs/mt7623n_bpir2_defconfig | 3 +++ include/configs/mt7623.h | 3 +++ 3 files changed, 28 insertions(+) diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c index 08468b50ea..542314adfc 100644 --- a/board/mediatek/mt7623/mt7623_rfb.c +++ b/board/mediatek/mt7623/mt7623_rfb.c @@ -14,3 +14,25 @@ int board_init(void) return 0; } + +int mmc_get_boot_dev(void) +{ + int g_mmc_devid = -1; + char *uflag = (char *)0x81DFFFF0; + if (strncmp(uflag,"eMMC",4)==0) + { + g_mmc_devid = 0; + printf("Boot From Emmc(id:%d)\n\n", g_mmc_devid); + } + else + { + g_mmc_devid = 1; + printf("Boot From SD(id:%d)\n\n", g_mmc_devid); + } + return g_mmc_devid; +} + +int mmc_get_env_dev(void) +{ + return mmc_get_boot_dev(); +} diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index 3a4de72e23..640c881ce9 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -52,3 +52,6 @@ CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y CONFIG_LZMA=y # CONFIG_EFI_LOADER is not set + +#enables savenenv-command +CONFIG_ENV_IS_IN_MMC=y diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 68da920e30..91d6369dd2 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -53,4 +53,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ FDT_HIGH +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_ENV_OFFSET 0x100000 + #endif -- 2.17.1

3 2

Re: [U-Boot] Uboot File not found in MMC
by Kasiviswanathan.Venkatakrishnan＠us.fujitsu.com 03 Dec '18

03 Dec '18

Hi all, We are getting the below error when U-Boot is not able to find the file: ext4fs_devread read outside partition 1953216 As shared below when we do a ext2ls of the partition the files are still there. Thanks, Kasiviswanathan.V -----Original Message----- From: Venkatakrishnan, Kasiviswanathan Sent: Friday, November 30, 2018 10:17 PM To: 'u-boot(a)lists.denx.de' <u-boot(a)lists.denx.de> Subject: Uboot File not found in MMC Hi all, We are using U-Boot of version 2015.01 in one of our PPC boards. The development board has few FPGA's and its corresponding images are downloaded into the /boot partition from the linux prompt which is of ext2 type. If we download new files to the /boot partition i.e when we update the FPGA images and reboot U-Boot is not able to identify the updated files from the /boot partition. But when we do a listing of the files in U-Boot it is shown as available. We tried to change the partition type of /boot from ext2 to ext4 but still U-Boot is not able to find the files. Is there any fix available for this issue ? Thanks in advance. Thanks, Kasiviswanathan.V

1 0

[U-Boot] [PATCH] ddrmc: vybrid: We shall perform bitwise AND, not logical one
by Lukasz Majewski 03 Dec '18

03 Dec '18

With logical AND - we exit the memory setup procedure on any interrupt - also on errors. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- arch/arm/mach-imx/ddrmc-vf610.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c index 3d7da1c25e..ea6a49e0fa 100644 --- a/arch/arm/mach-imx/ddrmc-vf610.c +++ b/arch/arm/mach-imx/ddrmc-vf610.c @@ -231,6 +231,6 @@ void ddrmc_ctrl_init_ddr3(struct ddr3_jedec_timings const *timings, /* all inits done, start the DDR controller */ writel(DDRMC_CR00_DRAM_CLASS_DDR3 | DDRMC_CR00_START, &ddrmr->cr[0]); - while (!(readl(&ddrmr->cr[80]) && 0x100)) + while (!(readl(&ddrmr->cr[80]) & 0x100)) udelay(10); } -- 2.11.0

3 2

[U-Boot] [PATCH 1/2] mtd: nand: arasan_nfc: Add support for nand multi chip select
by Michal Simek 03 Dec '18

03 Dec '18

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> This patch adds support for nand multi chip select. Also adding CONFIG_SYS_NAND_MAX_CHIPS to Kconfig to specify maximum number of nand chips. Signed-off-by: Tummala Karthik Reddy <t.karthik.reddy(a)xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mtd/nand/raw/Kconfig | 7 +++++++ drivers/mtd/nand/raw/arasan_nfc.c | 27 +++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 008f7b4b4ba1..86e8b5e55d8a 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -243,6 +243,13 @@ config SYS_NAND_BUSWIDTH_16BIT not available while configuring controller. So a static CONFIG_NAND_xx is needed to know the device's bus-width in advance. +config SYS_NAND_MAX_CHIPS + int "NAND max chips" + default 1 + depends on NAND_ARASAN + help + The maximum number of NAND chips per device to be supported. + if SPL config SYS_NAND_U_BOOT_LOCATIONS diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c index dc531ccb6822..2cd3f64dc63c 100644 --- a/drivers/mtd/nand/raw/arasan_nfc.c +++ b/drivers/mtd/nand/raw/arasan_nfc.c @@ -90,6 +90,8 @@ struct arasan_nand_command_format { #define ARASAN_NAND_MEM_ADDR1_PAGE_SHIFT 16 #define ARASAN_NAND_MEM_ADDR2_PAGE_MASK 0xFF #define ARASAN_NAND_MEM_ADDR2_CS_MASK 0xC0000000 +#define ARASAN_NAND_MEM_ADDR2_CS0_MASK (0x3 << 30) +#define ARASAN_NAND_MEM_ADDR2_CS1_MASK (0x1 << 30) #define ARASAN_NAND_MEM_ADDR2_BCH_MASK 0xE000000 #define ARASAN_NAND_MEM_ADDR2_BCH_SHIFT 25 @@ -261,6 +263,16 @@ static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; static void arasan_nand_select_chip(struct mtd_info *mtd, int chip) { + u32 reg_val; + + reg_val = readl(&arasan_nand_base->memadr_reg2); + if (chip == 0) { + reg_val &= ~ARASAN_NAND_MEM_ADDR2_CS0_MASK; + writel(reg_val, &arasan_nand_base->memadr_reg2); + } else if (chip == 1) { + reg_val |= ARASAN_NAND_MEM_ADDR2_CS1_MASK; + writel(reg_val, &arasan_nand_base->memadr_reg2); + } } static void arasan_nand_enable_ecc(void) @@ -713,9 +725,6 @@ static int arasan_nand_send_wrcmd(struct arasan_nand_command_format *curr_cmd, reg_val &= ~ARASAN_NAND_MEM_ADDR2_PAGE_MASK; reg_val |= (page_addr >> ARASAN_NAND_MEM_ADDR1_PAGE_SHIFT); writel(reg_val, &arasan_nand_base->memadr_reg2); - reg_val = readl(&arasan_nand_base->memadr_reg2); - reg_val &= ~ARASAN_NAND_MEM_ADDR2_CS_MASK; - writel(reg_val, &arasan_nand_base->memadr_reg2); return 0; } @@ -804,9 +813,6 @@ static int arasan_nand_erase(struct arasan_nand_command_format *curr_cmd, reg_val &= ~ARASAN_NAND_MEM_ADDR2_PAGE_MASK; reg_val |= (page_addr >> ARASAN_NAND_MEM_ADDR1_PAGE_SHIFT); writel(reg_val, &arasan_nand_base->memadr_reg2); - reg_val = readl(&arasan_nand_base->memadr_reg2); - reg_val &= ~ARASAN_NAND_MEM_ADDR2_CS_MASK; - writel(reg_val, &arasan_nand_base->memadr_reg2); writel(curr_cmd->pgm, &arasan_nand_base->pgm_reg); while (!(readl(&arasan_nand_base->intsts_reg) & @@ -859,10 +865,6 @@ static int arasan_nand_read_status(struct arasan_nand_command_format *curr_cmd, reg_val |= (1 << ARASAN_NAND_PKT_REG_PKT_CNT_SHFT) | 1; writel(reg_val, &arasan_nand_base->pkt_reg); - reg_val = readl(&arasan_nand_base->memadr_reg2); - reg_val &= ~ARASAN_NAND_MEM_ADDR2_CS_MASK; - writel(reg_val, &arasan_nand_base->memadr_reg2); - writel(curr_cmd->pgm, &arasan_nand_base->pgm_reg); while (!(readl(&arasan_nand_base->intsts_reg) & ARASAN_NAND_INT_STS_XFR_CMPLT_MASK) && timeout) { @@ -932,9 +934,6 @@ static int arasan_nand_send_rdcmd(struct arasan_nand_command_format *curr_cmd, reg_val |= (page_addr >> ARASAN_NAND_MEM_ADDR1_PAGE_SHIFT); writel(reg_val, &arasan_nand_base->memadr_reg2); - reg_val = readl(&arasan_nand_base->memadr_reg2); - reg_val &= ~ARASAN_NAND_MEM_ADDR2_CS_MASK; - writel(reg_val, &arasan_nand_base->memadr_reg2); buf_index = 0; return 0; @@ -1219,7 +1218,7 @@ static int arasan_nand_init(struct nand_chip *nand_chip, int devnum) writel(0x0, &arasan_nand_base->pgm_reg); /* first scan to find the device and get the page size */ - if (nand_scan_ident(mtd, 1, NULL)) { + if (nand_scan_ident(mtd, CONFIG_SYS_NAND_MAX_CHIPS, NULL)) { printf("%s: nand_scan_ident failed\n", __func__); goto fail; } -- 1.9.1

1 1

[U-Boot] [PULL u-boot] Please pull u-boot-amlogic-20181203
by Neil Armstrong 03 Dec '18

03 Dec '18

Hi Tom, I hope it's not too late, It's a single patch from Loic he reposted last week. Thanks, Neil The following changes since commit 952061352acfd24034e6990b6b7d32cded020c0a: drivers: rtc: correctly convert seconds to time structure (2018-12-01 18:03:14 -0500) are available in the Git repository at: git://git.denx.de/u-boot-amlogic.git tags/u-boot-amlogic-20181203 for you to fetch changes up to 8973d816588a8479eeb0e3a9f1e730922d3efc07: ARM: meson: Add regmap support for clock driver (2018-12-03 13:34:21 +0100) ---------------------------------------------------------------- ARM: meson: Add regmap support for clock driver and sync DT with 4.19 ---------------------------------------------------------------- Loic Devulder (1): ARM: meson: Add regmap support for clock driver arch/arm/dts/meson-gx.dtsi | 31 +++++++++++--- arch/arm/dts/meson-gxbb-nanopi-k2.dts | 48 ++++++++++++++++++++++ arch/arm/dts/meson-gxbb.dtsi | 14 ++++--- arch/arm/dts/meson-gxl-mali.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 5 +-- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 8 ++-- arch/arm/dts/meson-gxl.dtsi | 26 +++++------- arch/arm/dts/meson-gxm-khadas-vim2.dts | 24 +++++++++++ drivers/clk/clk_meson.c | 59 ++++++++++++++------------- 9 files changed, 151 insertions(+), 66 deletions(-)

2 1

[U-Boot] Please pull ARC changes
by Alexey Brodkin 03 Dec '18

03 Dec '18

Hi Tom, The following changes since commit 952061352acfd24034e6990b6b7d32cded020c0a: drivers: rtc: correctly convert seconds to time structure (2018-12-01 18:03:14 -0500) are available in the Git repository at: git://git.denx.de/u-boot-arc.git tags/arc-updates-for-2019.01-rc1 for you to fetch changes up to 6ef705b1575045f7b63bf011a0774228159715b2: arc: devboards: Implement checkboard() (2018-12-03 14:26:53 +0300) ---------------------------------------------------------------- We introduce much better automatic identification of ARC cores. 1. Try to match found HW features to known ARC core templates 2. Print CPU frequency for all ARC boards 3. Add more board-specific info ---------------------------------------------------------------- Alexey Brodkin (6): arc: emsdp: Bump RAM size to 16 Mb ARC: Improve identification of ARC cores arc: Get rid of board-specific print_cpuinfo() arc: emsdp: Read real CPU clock value from hardware arc: emsdp: Refactor register and bit accesses arc: devboards: Implement checkboard() arch/arc/include/asm/arcregs.h | 25 +++++++++++++- arch/arc/lib/cpu.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- ------- board/synopsys/axs10x/axs10x.c | 8 +++++ board/synopsys/emsdp/emsdp.c | 70 ++++++++++++++++++++++++++++++++------- board/synopsys/hsdk/hsdk.c | 8 ++--- board/synopsys/iot_devkit/iot_devkit.c | 10 ------ include/configs/emsdp.h | 2 +- 7 files changed, 274 insertions(+), 49 deletions(-) -Alexey

2 1

[U-Boot] [PATCH] usb: composite: Move bitmap related operations to ./include/linux/bitmap.h
by Lukasz Majewski 03 Dec '18

03 Dec '18

The BITMAP related operations can now be moved to ./include/linux/bitmap.h file to mimic the Linux kernel directory tree. This change also allows removing the lin_gadget_compat.h header file (which is a legacy code only for composite U-boot layer). It was also possible to remove #includes from several USB gadget drivers as relevant bit operations have been mored out earlier from this file. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- drivers/usb/dwc3/gadget.c | 1 - drivers/usb/dwc3/ti_usb_phy.c | 1 - drivers/usb/eth/r8152.c | 1 - drivers/usb/gadget/at91_udc.c | 1 - drivers/usb/gadget/atmel_usba_udc.c | 1 - drivers/usb/gadget/dwc2_udc_otg.c | 1 - drivers/usb/gadget/dwc2_udc_otg_phy.c | 1 - drivers/usb/gadget/dwc2_udc_otg_priv.h | 1 - drivers/usb/gadget/f_mass_storage.c | 2 +- drivers/usb/gadget/pxa25x_udc.c | 1 - include/linux/bitmap.h | 23 ++++++++++++++++++++++ include/linux/types.h | 3 +++ include/linux/usb/composite.h | 2 +- include/usb/lin_gadget_compat.h | 35 ---------------------------------- 14 files changed, 28 insertions(+), 46 deletions(-) create mode 100644 include/linux/bitmap.h delete mode 100644 include/usb/lin_gadget_compat.h diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e340cb268f..085f7b8968 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -16,7 +16,6 @@ #include <common.h> #include <malloc.h> #include <asm/dma-mapping.h> -#include <usb/lin_gadget_compat.h> #include <linux/bug.h> #include <linux/list.h> diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c index d168e868e3..e7ea12c163 100644 --- a/drivers/usb/dwc3/ti_usb_phy.c +++ b/drivers/usb/dwc3/ti_usb_phy.c @@ -19,7 +19,6 @@ #include <common.h> #include <malloc.h> #include <ti-usb-phy-uboot.h> -#include <usb/lin_gadget_compat.h> #include <linux/ioport.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index 941158abdd..e5f73e3d4c 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -10,7 +10,6 @@ #include <malloc.h> #include <memalign.h> #include <usb.h> -#include <usb/lin_gadget_compat.h> #include <linux/mii.h> #include <linux/bitops.h> #include "usb_ether.h" diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 39ea87005c..2a6626b443 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -24,7 +24,6 @@ #include <linux/usb/gadget.h> #include <linux/usb/at91_udc.h> #include <malloc.h> -#include <usb/lin_gadget_compat.h> #include "at91_udc.h" diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index c9d483318f..dffa5117f9 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -16,7 +16,6 @@ #include <linux/usb/gadget.h> #include <linux/usb/atmel_usba_udc.h> #include <malloc.h> -#include <usb/lin_gadget_compat.h> #include "atmel_usba_udc.h" diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index e3edd10e29..3c7ad033e3 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -33,7 +33,6 @@ #include "dwc2_udc_otg_regs.h" #include "dwc2_udc_otg_priv.h" -#include <usb/lin_gadget_compat.h> /***********************************************************/ diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index 47aa78ae94..c4338af0d7 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -33,7 +33,6 @@ #include "dwc2_udc_otg_regs.h" #include "dwc2_udc_otg_priv.h" -#include <usb/lin_gadget_compat.h> #include <usb/dwc2_udc.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h index b64e222b6d..aaa90187fb 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -12,7 +12,6 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/list.h> -#include <usb/lin_gadget_compat.h> #include <usb/dwc2_udc.h> /*-------------------------------------------------------------------------*/ diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index a3101afa0d..45c7b58eed 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -256,7 +256,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/gadget.h> #include <linux/usb/composite.h> -#include <usb/lin_gadget_compat.h> +#include <linux/bitmap.h> #include <g_dnl.h> /*------------------------------------------------------------------------*/ diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 44092df25b..09c0a30b2b 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -29,7 +29,6 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> -#include <usb/lin_gadget_compat.h> #include <asm/arch/pxa-regs.h> #include "pxa25x_udc.h" diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h new file mode 100644 index 0000000000..4a54ae0509 --- /dev/null +++ b/include/linux/bitmap.h @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +#ifndef __LINUX_BITMAP_H +#define __LINUX_BITMAP_H + +#include <asm/types.h> +#include <linux/types.h> +#include <linux/bitops.h> + +#define small_const_nbits(nbits) \ + (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG) + +static inline void bitmap_zero(unsigned long *dst, int nbits) +{ + if (small_const_nbits(nbits)) { + *dst = 0UL; + } else { + int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); + + memset(dst, 0, len); + } +} + +#endif /* __LINUX_BITMAP_H */ diff --git a/include/linux/types.h b/include/linux/types.h index 1f3cd63b8f..cc6f7cb39e 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -158,4 +158,7 @@ struct ustat { char f_fpack[6]; }; +#define DECLARE_BITMAP(name, bits) \ + unsigned long name[BITS_TO_LONGS(bits)] + #endif /* _LINUX_TYPES_H */ diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 30c464ce39..a49a66f2f8 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -24,7 +24,7 @@ #include <common.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> -#include <usb/lin_gadget_compat.h> +#include <linux/bitmap.h> /* * USB function drivers should return USB_GADGET_DELAYED_STATUS if they diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h deleted file mode 100644 index e5dba473b7..0000000000 --- a/include/usb/lin_gadget_compat.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (c) 2011 Samsung Electronics - * Lukasz Majewski <l.majewski(a)samsung.com> - * - * This is a Linux kernel compatibility layer for USB Gadget - */ - -#ifndef __LIN_COMPAT_H__ -#define __LIN_COMPAT_H__ - -#include <linux/bitops.h> -#include <linux/compat.h> - -/* common */ -#define DECLARE_BITMAP(name, bits) \ - unsigned long name[BITS_TO_LONGS(bits)] - -#define small_const_nbits(nbits) \ - (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG) - -static inline void bitmap_zero(unsigned long *dst, int nbits) -{ - if (small_const_nbits(nbits)) - *dst = 0UL; - else { - int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); - memset(dst, 0, len); - } -} - -#define dma_cache_maint(addr, size, mode) cache_flush() -void cache_flush(void); - -#endif /* __LIN_COMPAT_H__ */ -- 2.11.0

2 1