June 2017 - U-Boot

[U-Boot] [PATCH] ARM: rmobile: Shuffle defconfig around
by Marek Vasut 20 Jun '17

20 Jun '17

Just shuffle the defconfigs around with savedefconfig, no functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- configs/r8a7795_salvator-x_defconfig | 4 ++-- configs/r8a7796_salvator-x_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 0cab920d96..04d6ec8b84 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -1,17 +1,17 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_RCAR_GEN3=y CONFIG_R8A7795=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y -CONFIG_CMD_MMC=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_SH_SDHI=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index dfd91d2755..d57305112b 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -1,17 +1,17 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y +CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y -CONFIG_CMD_MMC=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_SH_SDHI=y -- 2.11.0

2 2

[U-Boot] [PATCH] tegra: mmc: Set the bus width correctly
by Simon Glass 20 Jun '17

20 Jun '17

The driver currently does not reset bit 5 of the hostctl register even if the MMC stack requests it. Then means that once a bus width of 8 is selected it is not possible to change it back to 1. This breaks 'mmc rescan' which needs to start off with a bus width of 1. The problem was surfaced by enabling CONFIG_DM_MMC_OPS on tegra. Without this option the MMC stack fully reinits the driver on a 'mmc rescan'. But with this option driver model does not re-probe a driver once it has been probed once. Fix the driver to honour the request. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/mmc/tegra_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 338e42b528..7d945a172e 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -438,7 +438,7 @@ static int tegra_mmc_set_ios(struct udevice *dev) else if (mmc->bus_width == 4) ctrl |= (1 << 1); else - ctrl &= ~(1 << 1); + ctrl &= ~(1 << 1 | 1 << 5); writeb(ctrl, &priv->reg->hostctl); debug("mmc_set_ios: hostctl = %08X\n", ctrl); -- 2.13.0.506.g27d5fe0cd-goog

4 4

[U-Boot] [PATCH] ARM: dts: omap3: Fix dts->dtb typo
by Marek Vasut 20 Jun '17

20 Jun '17

Trivial, fix typo. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- arch/arm/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 05bd2a1d7f..7b405e5c93 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -393,7 +393,7 @@ dtb-$(CONFIG_TARGET_AT91SAM9N12EK) += at91sam9n12ek.dtb dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \ logicpd-torpedo-37xx-devkit.dtb \ - logicpd-som-lv-37xx-devkit.dts + logicpd-som-lv-37xx-devkit.dtb dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \ at91-sama5d2_xplained.dtb -- 2.11.0

1 0

[U-Boot] [PATCH v2] efi: Export mbr partition for EFI.
by Emmanuel Vadot 20 Jun '17

20 Jun '17

While MBR partition isn't supposed to work in a EFI environment some board rely partially or fully on MBR (BeagleBone, RPI and probably others). This export the MBR partition as logical partition which is useful to efi application that cannot read raw disks. Signed-off-by: Emmanuel Vadot <manu(a)bidouilliste.com> --- Changes in v2: * Pass correct arg to efi_disk_create_mbr lib/efi_loader/efi_disk.c | 59 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 39e602a868..097bb544d7 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -197,11 +197,13 @@ static void efi_disk_add_dev(const char *name, const char *if_typename, const struct blk_desc *desc, int dev_index, - lbaint_t offset) + disk_partition_t *info, + int logical_partition) { struct efi_disk_obj *diskobj; struct efi_device_path_file_path *dp; int objlen = sizeof(*diskobj) + (sizeof(*dp) * 2); + static int mediaid; /* Don't add empty devices */ if (!desc->lba) @@ -218,16 +220,26 @@ static void efi_disk_add_dev(const char *name, diskobj->ops = block_io_disk_template; diskobj->ifname = if_typename; diskobj->dev_index = dev_index; - diskobj->offset = offset; + if (info) + diskobj->offset = info->start; + diskobj->desc = desc; /* Fill in EFI IO Media info (for read/write callbacks) */ diskobj->media.removable_media = desc->removable; diskobj->media.media_present = 1; - diskobj->media.block_size = desc->blksz; - diskobj->media.io_align = desc->blksz; - diskobj->media.last_block = desc->lba - offset; + diskobj->media.media_id = mediaid++; diskobj->ops.media = &diskobj->media; + if (logical_partition) { + diskobj->media.logical_partition = 1; + diskobj->media.block_size = info->blksz; + diskobj->media.io_align = info->blksz; + diskobj->media.last_block = info->size - 1; + } else { + diskobj->media.block_size = desc->blksz; + diskobj->media.io_align = desc->blksz; + diskobj->media.last_block = desc->lba; + } /* Fill in device path */ dp = (void*)&diskobj[1]; @@ -262,8 +274,33 @@ static int efi_disk_create_eltorito(struct blk_desc *desc, while (!part_get_info(desc, part, &info)) { snprintf(devname, sizeof(devname), "%s:%d", pdevname, part); - efi_disk_add_dev(devname, if_typename, desc, diskid, - info.start); + efi_disk_add_dev(devname, if_typename, desc, diskid, 0, 0); + part++; + disks++; + } +#endif + + return disks; +} + +static int efi_disk_create_mbr(struct blk_desc *desc, + const char *if_typename, + int diskid) +{ + int disks = 0; +#if CONFIG_IS_ENABLED(DOS_PARTITION) + char devname[32] = { 0 }; /* dp->str is u16[32] long */ + disk_partition_t info; + int part = 1; + + if (desc->part_type != PART_TYPE_DOS) + return 0; + + while (!part_get_info(desc, part, &info)) { + snprintf(devname, sizeof(devname), "%s%d:%d", if_typename, + diskid, part); + + efi_disk_add_dev(devname, if_typename, desc, diskid, &info, 1); part++; disks++; } @@ -296,9 +333,11 @@ int efi_disk_register(void) const char *if_typename = dev->driver->name; printf("Scanning disk %s...\n", dev->name); - efi_disk_add_dev(dev->name, if_typename, desc, desc->devnum, 0); + efi_disk_add_dev(dev->name, if_typename, desc, desc->devnum, + NULL, 0); disks++; + disks += efi_disk_create_mbr(desc, if_typename, desc->devnum); /* * El Torito images show up as block devices in an EFI world, * so let's create them here @@ -332,15 +371,17 @@ int efi_disk_register(void) snprintf(devname, sizeof(devname), "%s%d", if_typename, i); - efi_disk_add_dev(devname, if_typename, desc, i, 0); + efi_disk_add_dev(devname, if_typename, desc, i, 0, 0); disks++; + disks += efi_disk_create_mbr(desc, if_typename, i); /* * El Torito images show up as block devices * in an EFI world, so let's create them here */ disks += efi_disk_create_eltorito(desc, if_typename, i, devname); + } } #endif -- 2.13.1

3 5

[U-Boot] [PATCH v5 00/11] rk3328: add support of usb host and gadget
by Meng Dongyang 20 Jun '17

20 Jun '17

Add support of usb host and gadget function for rk3328. Changes in v5: - Propagate return value and print error message when failed Changes in v4: - Splite patch [U-boot,v3,04/10] into two patches - Define set vbus as empty function if the macros aren't set - Prepare a mask and set capabilities in GUSBCFG register once Changes in v3: - Revert change of macro definition in dwc2 driver - Support host mode without HNP/SRP capability through DTS Changes in v2: - Add commit messages - Split patch [U-boot,7/8] into two patches - Use fixed regulator to control vbus instead of gpio Meng Dongyang (11): rockchip: configs: rk3328: support ehci and ohci controller rockchip: dts: rk3328: add ehci and ohci node and enable host0 port rockchip: configs: rk3328: config xhci controller usb: host: xhci-rockchip: use fixed regulator to control vbus usb: host: xhci-rockchip: add support for rk3328 rockchip: dts: rk3328: support and enable xhci rockchip: configs: rk3328: enable dwc2 driver and config fastboot usb: dwc2: force to host mode if not support HNP/SRP rockchip: rk3328: board: add support of dwc2 gadget rockchip: dts: rk3328: support and enable dwc2 rockchip: dts: rk3399: control vbus of typec by fixed regulator arch/arm/dts/rk3328-evb.dts | 36 +++++++++++++++++++++ arch/arm/dts/rk3328.dtsi | 35 +++++++++++++++++++++ arch/arm/dts/rk3399-evb.dts | 16 ++++++++-- board/rockchip/evb_rk3328/evb-rk3328.c | 43 +++++++++++++++++++++++-- configs/evb-rk3328_defconfig | 25 +++++++++++++++ drivers/usb/host/dwc2.c | 19 ++++++++++-- drivers/usb/host/xhci-rockchip.c | 57 ++++++++++++++++++++++++++-------- include/configs/rk3328_common.h | 9 ++++++ 8 files changed, 219 insertions(+), 21 deletions(-) -- 1.9.1

4 27

[U-Boot] [PATCH] efi: Export mbr partition for EFI.
by Emmanuel Vadot 20 Jun '17

20 Jun '17

While MBR partition isn't supposed to work in a EFI environment some board rely partially or fully on MBR (BeagleBone, RPI and probably others). This export the MBR partition as logical partition which is useful to efi application that cannot read raw disks. Signed-off-by: Emmanuel Vadot <manu(a)bidouilliste.com> --- lib/efi_loader/efi_disk.c | 59 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 39e602a868..1f8ca86e29 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -197,11 +197,13 @@ static void efi_disk_add_dev(const char *name, const char *if_typename, const struct blk_desc *desc, int dev_index, - lbaint_t offset) + disk_partition_t *info, + int logical_partition) { struct efi_disk_obj *diskobj; struct efi_device_path_file_path *dp; int objlen = sizeof(*diskobj) + (sizeof(*dp) * 2); + static int mediaid; /* Don't add empty devices */ if (!desc->lba) @@ -218,16 +220,26 @@ static void efi_disk_add_dev(const char *name, diskobj->ops = block_io_disk_template; diskobj->ifname = if_typename; diskobj->dev_index = dev_index; - diskobj->offset = offset; + if (info) + diskobj->offset = info->start; + diskobj->desc = desc; /* Fill in EFI IO Media info (for read/write callbacks) */ diskobj->media.removable_media = desc->removable; diskobj->media.media_present = 1; - diskobj->media.block_size = desc->blksz; - diskobj->media.io_align = desc->blksz; - diskobj->media.last_block = desc->lba - offset; + diskobj->media.media_id = mediaid++; diskobj->ops.media = &diskobj->media; + if (logical_partition) { + diskobj->media.logical_partition = 1; + diskobj->media.block_size = info->blksz; + diskobj->media.io_align = info->blksz; + diskobj->media.last_block = info->size - 1; + } else { + diskobj->media.block_size = desc->blksz; + diskobj->media.io_align = desc->blksz; + diskobj->media.last_block = desc->lba; + } /* Fill in device path */ dp = (void*)&diskobj[1]; @@ -262,8 +274,33 @@ static int efi_disk_create_eltorito(struct blk_desc *desc, while (!part_get_info(desc, part, &info)) { snprintf(devname, sizeof(devname), "%s:%d", pdevname, part); - efi_disk_add_dev(devname, if_typename, desc, diskid, - info.start); + efi_disk_add_dev(devname, if_typename, desc, diskid, 0, 0); + part++; + disks++; + } +#endif + + return disks; +} + +static int efi_disk_create_mbr(struct blk_desc *desc, + const char *if_typename, + int diskid) +{ + int disks = 0; +#if CONFIG_IS_ENABLED(DOS_PARTITION) + char devname[32] = { 0 }; /* dp->str is u16[32] long */ + disk_partition_t info; + int part = 1; + + if (desc->part_type != PART_TYPE_DOS) + return 0; + + while (!part_get_info(desc, part, &info)) { + snprintf(devname, sizeof(devname), "%s%d:%d", if_typename, + diskid, part); + + efi_disk_add_dev(devname, if_typename, desc, diskid, &info, 1); part++; disks++; } @@ -296,13 +333,15 @@ int efi_disk_register(void) const char *if_typename = dev->driver->name; printf("Scanning disk %s...\n", dev->name); - efi_disk_add_dev(dev->name, if_typename, desc, desc->devnum, 0); + efi_disk_add_dev(dev->name, if_typename, desc, desc->devnum, + NULL, 0); disks++; /* * El Torito images show up as block devices in an EFI world, * so let's create them here */ + disks += efi_disk_create_mbr(desc, if_typename, desc->devnum); disks += efi_disk_create_eltorito(desc, if_typename, desc->devnum, dev->name); } @@ -332,15 +371,17 @@ int efi_disk_register(void) snprintf(devname, sizeof(devname), "%s%d", if_typename, i); - efi_disk_add_dev(devname, if_typename, desc, i, 0); + efi_disk_add_dev(devname, if_typename, desc, i, 0, 0); disks++; /* * El Torito images show up as block devices * in an EFI world, so let's create them here */ + disks += efi_disk_create_mbr(desc, cur_drvr, i); disks += efi_disk_create_eltorito(desc, if_typename, i, devname); + } } #endif -- 2.13.1

1 0

[U-Boot] [PATCH v2] odroid: remove CONFIG_DM_I2C_COMPAT config
by Jaehoon Chung 20 Jun '17

20 Jun '17

Remove the CONFIG_DM_I2C_COMPAT config. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changelog on V2: - Rebased on latest u-boot-samsung - Added Simon's Reviewed tag - Fix the typo (COMPAT_DM_I2C_COMPAT -> CONFIG_DM_I2C_COMPAT) configs/odroid_defconfig | 2 +- include/configs/odroid.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index ebfb910..22e86e2 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -38,7 +38,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y -CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_S3C24X0=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y diff --git a/include/configs/odroid.h b/include/configs/odroid.h index afc7c5e..609a3d1 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -175,11 +175,6 @@ "scriptaddr=0x42000000\0" \ "fdtaddr=40800000\0" -/* I2C */ -#define CONFIG_SYS_I2C_S3C24X0 -#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 -#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0 - /* GPT */ #define CONFIG_RANDOM_UUID -- 2.10.2

2 1

[U-Boot] [PATCH v3] rockchip: video: mipi: Modify variable type for arm32 compatibility
by Eric Gao 20 Jun '17

20 Jun '17

Some address relevant varibable is defined originally as u64. To compatible with arm32, this patch change them to uintptr_t type. Signed-off-by: Eric Gao <eric.gao(a)rock-chips.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: -Change the address base variable from "uintptr_t *" to "uintptr_t" Changes in v1: -Change the address base variable to uintptr_t * type. drivers/video/rockchip/rk_mipi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c index ad00397..521256e 100644 --- a/drivers/video/rockchip/rk_mipi.c +++ b/drivers/video/rockchip/rk_mipi.c @@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR; * @txesc_clk: clock for tx esc mode */ struct rk_mipi_priv { - void __iomem *regs; + uintptr_t regs; struct rk3399_grf_regs *grf; struct udevice *panel; struct mipi_dsi *dsi; @@ -76,13 +76,13 @@ static int rk_mipi_read_timing(struct udevice *dev, * use define in rk_mipi.h directly for this parameter * @val: value that will be write to specified bits of register */ -static void rk_mipi_dsi_write(u32 regs, u32 reg, u32 val) +static void rk_mipi_dsi_write(uintptr_t regs, u32 reg, u32 val) { u32 dat; u32 mask; u32 offset = (reg >> OFFSET_SHIFT) & 0xff; u32 bits = (reg >> BITS_SHIFT) & 0xff; - u64 addr = (reg >> ADDR_SHIFT) + regs; + uintptr_t *addr = (reg >> ADDR_SHIFT) + regs; /* Mask for specifiled bits,the corresponding bits will be clear */ mask = ~((0xffffffff << offset) & (0xffffffff >> (32 - offset - bits))); @@ -108,7 +108,7 @@ static int rk_mipi_dsi_enable(struct udevice *dev, int node, timing_node; int val; struct rk_mipi_priv *priv = dev_get_priv(dev); - u64 regs = (u64)priv->regs; + uintptr_t regs = priv->regs; struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); u32 txbyte_clk = priv->txbyte_clk; u32 txesc_clk = priv->txesc_clk; @@ -224,7 +224,7 @@ static int rk_mipi_dsi_enable(struct udevice *dev, } /* rk mipi dphy write function. It is used to write test data to dphy */ -static void rk_mipi_phy_write(u32 regs, unsigned char test_code, +static void rk_mipi_phy_write(uintptr_t regs, unsigned char test_code, unsigned char *test_data, unsigned char size) { int i = 0; @@ -253,7 +253,7 @@ static int rk_mipi_phy_enable(struct udevice *dev) { int i; struct rk_mipi_priv *priv = dev_get_priv(dev); - u64 regs = (u64)priv->regs; + uintptr_t regs = priv->regs; u64 fbdiv; u64 prediv = 1; u32 max_fbdiv = 512; -- 1.9.1

1 0

[U-Boot] [PATCH v2 0/3] Add mipi dsi support for evb-rk3288.
by Eric Gao 20 Jun '17

20 Jun '17

Changes in v1: -Change function name from rk_display_enable to rk_mipi_enable. -Use IS_ERR to judge the return status. -Use dev_read_addr to replace devfdt_get_addr. -Make the subject more intelligible. Eric Gao (3): rockchip: video: mipi: Add rk3288 soc specific driver for mipi dsi rockchip: video: Makefile: Add soc specific driver for rk3288 mipi dsi rockchip: video: defconfig: Add mipi dsi support for evb-rk3288 configs/evb-rk3288_defconfig | 8 +- drivers/video/rockchip/Makefile | 1 + drivers/video/rockchip/rk3288_mipi.c | 191 +++++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 drivers/video/rockchip/rk3288_mipi.c -- 1.9.1

2 4

[U-Boot] Pull request: u-boot-sunxi/master
by Jagan Teki 20 Jun '17

20 Jun '17

Hi Tom, Please pull this PR. thanks! Jagan. The following changes since commit 24796d27be0d0f403ed6ad7e3022b33e36ac08b5: Merge git://git.denx.de/u-boot-ubi (2017-06-06 07:13:39 -0400) are available in the git repository at: git://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to 2b1a33213e810f43f9d7e33b9d8db99e1b80a1c0: sun50i: h5: Add initial NanoPi NEO2 support (2017-06-14 20:25:56 +0530) ---------------------------------------------------------------- Chen-Yu Tsai (1): sunxi: psci: Move entry address setting to separate function Icenowy Zheng (12): sunxi: makes an invisible option for H3-like DRAM controllers sunxi: Rename bus-width related macros in H3 DRAM code sunxi: add option for 16-bit DW DRAM controller sunxi: add bank detection code to H3 DRAM initialization code sunxi: Add selective DRAM type and timing sunxi: enable dual rank detection in DesignWare-like DRAM code sunxi: add support for the DDR2 in V3s SoC sunxi: add support for V3s DRAM controller sunxi: enable DRAM initialization and SPL for V3s SoC sunxi: add LPDDR3 DRAM type support for DesignWare-like DRAM controller sunxi: add LPDDR3 timing from stock boot0 sunxi: add a defconfig for SoPine w/ official baseboard Jagan Teki (4): sun8i: h3: Add initial NanoPi M1 Plus support sun50i: h5: Add initial Orangepi Zero Plus 2 support sun50i: a64: Add initial Orangepi Win/WinPlus support sun50i: h5: Add initial NanoPi NEO2 support arch/arm/cpu/armv7/sunxi/psci.c | 25 ++- arch/arm/dts/Makefile | 6 +- arch/arm/dts/sun50i-a64-orangepi-win.dts | 94 +++++++++++ arch/arm/dts/sun50i-h5-nanopi-neo2.dts | 86 ++++++++++ arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts | 97 +++++++++++ arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts | 64 +++++++ arch/arm/include/asm/arch-sunxi/dram.h | 6 +- .../{dram_sun8i_h3.h => dram_sunxi_dw.h} | 36 +++- arch/arm/mach-sunxi/Kconfig | 75 ++++++++- arch/arm/mach-sunxi/Makefile | 5 +- .../{dram_sun8i_h3.c => dram_sunxi_dw.c} | 187 +++++++-------------- arch/arm/mach-sunxi/dram_timings/Makefile | 3 + arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c | 84 +++++++++ arch/arm/mach-sunxi/dram_timings/ddr3_1333.c | 87 ++++++++++ arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c | 83 +++++++++ board/sunxi/MAINTAINERS | 25 +++ configs/nanopi_m1_plus_defconfig | 18 ++ configs/nanopi_neo2_defconfig | 16 ++ configs/orangepi_win_defconfig | 16 ++ configs/orangepi_zero_plus2_defconfig | 18 ++ configs/sopine_baseboard_defconfig | 22 +++ 21 files changed, 910 insertions(+), 143 deletions(-) create mode 100644 arch/arm/dts/sun50i-a64-orangepi-win.dts create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo2.dts create mode 100644 arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts create mode 100644 arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts rename arch/arm/include/asm/arch-sunxi/{dram_sun8i_h3.h => dram_sunxi_dw.h} (86%) rename arch/arm/mach-sunxi/{dram_sun8i_h3.c => dram_sunxi_dw.c} (84%) create mode 100644 arch/arm/mach-sunxi/dram_timings/Makefile create mode 100644 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c create mode 100644 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c create mode 100644 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c create mode 100644 configs/nanopi_m1_plus_defconfig create mode 100644 configs/nanopi_neo2_defconfig create mode 100644 configs/orangepi_win_defconfig create mode 100644 configs/orangepi_zero_plus2_defconfig create mode 100644 configs/sopine_baseboard_defconfig

3 4