Merge branch 'next-dev' into thunder-boot

UPSTREAM: usb: gadget: Make g_dnl USB settings common

The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadg

UPSTREAM: usb: gadget: Make g_dnl USB settings common

The g_dnl USB settings for the vendor ID, product ID and manufacturer are
actually common settings that can and should be shared by all the gadgets.

Make them common by renaming them, and convert all the users.

Conflicts:
configs/cgtqmx6eval_defconfig
configs/dms-ba16-1g_defconfig
configs/evb-rk3036_defconfig
configs/evb-rk3229_defconfig
configs/evb-rv1108_defconfig
configs/fennec-rk3288_defconfig
configs/stih410-b2260_defconfig

Change-Id: Ib855d37af9f539ef794a2519c75c027e67bd091c
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit a95aee6af70d8815547b81329125f2800c8ee37c)

show more ...

Merge branch 'next-dev' into thunder-boot

rockchip: rk3399: update SPL_STACK_R_ADDR

Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config;
default to 0x4000000(64MB) instead of 0x80000(512KB) for this address
can support all

rockchip: rk3399: update SPL_STACK_R_ADDR

Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config;
default to 0x4000000(64MB) instead of 0x80000(512KB) for this address
can support all the SoCs including those may have only 64MB memory, and
also reserve enough space for atf, kernel(in falcon mode) loading.

After the ATF entry move to 0x40000, the stack from 0x80000 may be override
when loading ATF bl31.

Change-Id: I9bb524ee0762e908bd390393168f30ca197e2a52
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

rockchip: rk3399: configs: no need to reserve IRAM in SPL

Remove CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000 and it will default to
0. No need to reserve the space for we move the bl31 entry to 0x40000

rockchip: rk3399: configs: no need to reserve IRAM in SPL

Remove CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000 and it will default to
0. No need to reserve the space for we move the bl31 entry to 0x40000
and limit the size of SPL at 0~0x40000.

Change-Id: Iff502eec2a38bfe112b5cadc22d772fded39c4ed
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

driver: ram: rockchip: modify sdram common driver

Remove the config about SDRAM_COMMON_CAP_DETECT,SDRAM_COMMON_OSREG,
SDRAM_COMMON_MSCH_RK3399 and SDRAM_COMMON_MSCH_PX30.

Change-Id: I17f2bdae585454

driver: ram: rockchip: modify sdram common driver

Remove the config about SDRAM_COMMON_CAP_DETECT,SDRAM_COMMON_OSREG,
SDRAM_COMMON_MSCH_RK3399 and SDRAM_COMMON_MSCH_PX30.

Change-Id: I17f2bdae585454a1d869ae9d967843d1d169381f
Signed-off-by: YouMin Chen <cym@rock-chips.com>

show more ...

driver: ram: rockchip: rk3399: dram init select common code

Add support dram capacity detect.
Select dram timing file base on dram type and clock frequency,
don't need care dram capacity.Dram capaci

driver: ram: rockchip: rk3399: dram init select common code

Add support dram capacity detect.
Select dram timing file base on dram type and clock frequency,
don't need care dram capacity.Dram capacity will auto detect.

Change-Id: I0554a0ec0c753a159406330aa0baa2daafe7ab93
Signed-off-by: YouMin Chen <cym@rock-chips.com>

show more ...

rockchip: rk3399: update defconfig for TPL

The SPL is now running at SDRAM, and 0x10000 is used by BL31,
and the ARM SPL do not support relocate now, we need reserved
0x50000 so that it won't overwr

rockchip: rk3399: update defconfig for TPL

The SPL is now running at SDRAM, and 0x10000 is used by BL31,
and the ARM SPL do not support relocate now, we need reserved
0x50000 so that it won't overwrite the code when we load the
bl31 to target space.
We should remove this after we enable the relocate feature.

The SPL need malloc 0x9000 for MMC as buffer used for transfer
data to IRAM(The EMMC DMA can not transfer data to IRAM directly).

Change-Id: Ib6b73b3004345989d091d17c85b10698a97538b7
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

show more ...

configs: add android6.0-rk3399_defconfig

This is a copy from evb-rk3399_defconfig

Change-Id: I2c9511252da97832ca7774f399170ea7494ee2e4
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>