[U-Boot] Pull request: u-boot-rockchip/master
Dr. Philipp Tomsich
philipp.tomsich at theobroma-systems.com
Tue Jul 11 18:06:33 UTC 2017
Tom,
With the new merge window open, I’d like to sync some of changes accumulated for Rockchip.
Please pull into u-boot/master. Thanks!
Thanks,
Phil.
The following changes since commit d85ca029f257b53a96da6c2fb421e78a003a9943:
Prepare v2017.07 (2017-07-10 13:07:38 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-rockchip.git master
for you to fetch changes up to 2454b719fb874120e06e4aa64bfb9450d091e56c:
rockchip: rk3288: Add pinctrl support for the gmac ethernet interface (2017-07-11 15:23:38 +0200)
----------------------------------------------------------------
Kever Yang (28):
rockchip: rk3328: correct mem_region
rockchip: add sdram_common for common functions
rockchip: use common sdram function
rockchip: rk3328: add sdram driver in U-Boot
rockchip: rk3368: add sdram driver for U-Boot
rockchip: dts: rk3328: add dmc node
rockchip: dts: rk3368: add dmc node
rockchip: correct the bank0 ram size
rockchip: rv1108: disable CONFIG_RAM before we have driver
rockchip: mkimage: add support for rk322x soc
rockchip: rk322x: add clock driver
rockchip: rk322x: add pinctrl driver
rockchip: rk322x: add dts file
rockchip: rk322x: add basic soc support
rockchip: rk322x: add sysreset driver
rockchip: add evb_rk3229 board
rockchip: rk3036: dtsi use max-frequency for mmc node
rockchip: rk3288: dtsi use max-frequency for mmc node
rockchip: rk3328: dtsi use max-frequency for mmc node
rockchip: dwmmc: use max-frequency when OF_PLATDATA enabled
rockchip: firefly-rk3399: dts: enable sdmmc device
rockchip: firefly-rk3399: enable dwmmc driver for the board
Revert "mmc: dw_mmc: rockchip: select proper card clock"
rockchip: rk3036 remove CONFIG_RAM from defconfig
rockchip: rk3036: sync os_reg2 define with other soc
rockchip: pinctrl: rk3328: use gpio instead of sdmmc-pwren
rockchip: dts: rk3328-evb: add sdmmc-pwren regulator
rockchip: evb-rk3328: enable boot on regulator
Meng Dongyang (8):
usb: Kconfig: config USB_XHCI_ROCKCHIP depends on DM_REGULATOR and DM_USB
usb: host: xhci-rockchip: use fixed regulator to control vbus
rockchip: dts: rk3328: add fixed regulator node for xhci
rockchip: dts: rk3328: add fixed regulator node for xhci
usb: dwc2: use dev_read_bool() instead of fdt_getprop()
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
Philipp Tomsich (8):
rockchip: pinctrl: dm: convert fdt_get to dev_read
rockchip: spi: dm: convert fdt_get to dev_read
rockchip: xhci: dm: convert fdt_get to dev_read
rockchip: mmc: dm: convert fdt_get to dev_read
rockchip: net: dm: convert fdt_get to dev_read
rockchip: ns16550: dm: convert fdt_get to dev_read
rockchip: dm: convert fdt_get to dev_read
usb: Kconfig: migrate USB_DWC2 to Kconfig
Sjoerd Simons (1):
rockchip: rk3288: Add pinctrl support for the gmac ethernet interface
Wadim Egorov (4):
power: regulator: rk8xx: Build get_ldo_reg only for SPL
power: regulator: rk8xx: Allow input current/charger shutdown configuration
rockchip: Add basic support for phyCORE-RK3288 SoM based carrier board
doc: rockchip: Add phyCORE-RK3288 RDK to board list
eric.gao at rock-chips.com (3):
rockchip: pwm: fix the register layout for the PWM controller
rockchip: video: mipi: Modify variable type for arm32 compatibility
rockchip: video: mipi: Modify format type for debug message
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3036.dtsi | 2 +-
arch/arm/dts/rk3229-evb.dts | 77 ++++++++++++
arch/arm/dts/rk322x.dtsi | 710 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/dts/rk3288-phycore-rdk.dts | 294 ++++++++++++++++++++++++++++++++++++++++++++
arch/arm/dts/rk3288-phycore-som.dtsi | 506 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/dts/rk3288.dtsi | 8 +-
arch/arm/dts/rk3328-evb.dts | 33 ++++-
arch/arm/dts/rk3328.dtsi | 25 +++-
arch/arm/dts/rk3368.dtsi | 7 ++
arch/arm/dts/rk3399-evb.dts | 16 ++-
arch/arm/dts/rk3399-firefly.dts | 7 ++
arch/arm/include/asm/arch-rockchip/clock.h | 1 +
arch/arm/include/asm/arch-rockchip/cru_rk322x.h | 215 ++++++++++++++++++++++++++++++++
arch/arm/include/asm/arch-rockchip/ddr_rk3288.h | 48 --------
arch/arm/include/asm/arch-rockchip/grf_rk322x.h | 519 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/include/asm/arch-rockchip/grf_rk3288.h | 178 +++++++++++++++++++++++++++
arch/arm/include/asm/arch-rockchip/grf_rk3368.h | 4 +-
arch/arm/include/asm/arch-rockchip/pwm.h | 2 +-
arch/arm/include/asm/arch-rockchip/sdram_common.h | 58 +++++++++
arch/arm/mach-rockchip/Kconfig | 14 +++
arch/arm/mach-rockchip/Makefile | 6 +
arch/arm/mach-rockchip/rk3036-board.c | 6 +
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 5 +-
arch/arm/mach-rockchip/rk3188-board.c | 22 ----
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c | 82 +++----------
arch/arm/mach-rockchip/rk322x-board-spl.c | 77 ++++++++++++
arch/arm/mach-rockchip/rk322x-board.c | 136 ++++++++++++++++++++
arch/arm/mach-rockchip/rk322x/Kconfig | 18 +++
arch/arm/mach-rockchip/rk322x/Makefile | 9 ++
arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 32 +++++
arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 22 ++++
arch/arm/mach-rockchip/rk3288-board-spl.c | 40 ++++++
arch/arm/mach-rockchip/rk3288-board.c | 22 ----
arch/arm/mach-rockchip/rk3288/Kconfig | 10 ++
arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 86 +++----------
arch/arm/mach-rockchip/rk3328/Makefile | 1 +
arch/arm/mach-rockchip/rk3328/rk3328.c | 21 +++-
arch/arm/mach-rockchip/rk3328/sdram_rk3328.c | 60 +++++++++
arch/arm/mach-rockchip/rk3368/Makefile | 1 +
arch/arm/mach-rockchip/rk3368/rk3368.c | 13 ++
arch/arm/mach-rockchip/rk3368/sdram_rk3368.c | 60 +++++++++
arch/arm/mach-rockchip/rk3399/rk3399.c | 13 ++
arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 102 ++-------------
arch/arm/mach-rockchip/sdram_common.c | 83 +++++++++++++
board/geekbuying/geekbox/geekbox.c | 14 ---
board/phytec/phycore_rk3288/Kconfig | 15 +++
board/phytec/phycore_rk3288/MAINTAINERS | 6 +
board/phytec/phycore_rk3288/Makefile | 8 ++
board/phytec/phycore_rk3288/phycore-rk3288.c | 8 ++
board/rockchip/evb_px5/evb-px5.c | 16 ---
board/rockchip/evb_rk3229/Kconfig | 15 +++
board/rockchip/evb_rk3229/MAINTAINERS | 6 +
board/rockchip/evb_rk3229/Makefile | 7 ++
board/rockchip/evb_rk3229/evb_rk3229.c | 12 ++
board/rockchip/evb_rk3328/evb-rk3328.c | 58 +++++++--
board/rockchip/evb_rk3399/evb-rk3399.c | 31 -----
board/rockchip/sheep_rk3368/sheep_rk3368.c | 15 ---
board/theobroma-systems/puma_rk3399/puma-rk3399.c | 31 -----
configs/evb-rk3036_defconfig | 1 -
configs/evb-rk3229_defconfig | 44 +++++++
configs/evb-rk3328_defconfig | 20 ++-
configs/evb-rv1108_defconfig | 1 -
configs/fennec-rk3288_defconfig | 1 +
configs/firefly-rk3288_defconfig | 1 +
configs/firefly-rk3399_defconfig | 2 +-
configs/hikey_defconfig | 1 +
configs/kylin-rk3036_defconfig | 2 +-
configs/miqi-rk3288_defconfig | 1 +
configs/phycore-rk3288_defconfig | 70 +++++++++++
configs/popmetal-rk3288_defconfig | 1 +
configs/rpi_2_defconfig | 1 +
configs/rpi_3_32b_defconfig | 1 +
configs/rpi_3_defconfig | 1 +
configs/rpi_defconfig | 1 +
configs/socfpga_arria5_defconfig | 1 +
configs/socfpga_cyclone5_defconfig | 1 +
configs/socfpga_de0_nano_soc_defconfig | 1 +
configs/socfpga_de10_nano_defconfig | 1 +
configs/socfpga_de1_soc_defconfig | 1 +
configs/socfpga_mcvevk_defconfig | 1 +
configs/socfpga_sockit_defconfig | 1 +
configs/socfpga_socrates_defconfig | 1 +
configs/socfpga_vining_fpga_defconfig | 1 +
configs/tinker-rk3288_defconfig | 1 +
doc/README.rockchip | 3 +-
drivers/clk/rockchip/Makefile | 1 +
drivers/clk/rockchip/clk_rk322x.c | 413 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/mmc/rockchip_dw_mmc.c | 25 ++--
drivers/mmc/rockchip_sdhci.c | 3 +-
drivers/net/designware.c | 7 +-
drivers/net/gmac_rockchip.c | 10 +-
drivers/pinctrl/Kconfig | 10 ++
drivers/pinctrl/rockchip/Makefile | 1 +
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 3 +-
drivers/pinctrl/rockchip/pinctrl_rk3188.c | 3 +-
drivers/pinctrl/rockchip/pinctrl_rk322x.c | 294 ++++++++++++++++++++++++++++++++++++++++++++
drivers/pinctrl/rockchip/pinctrl_rk3288.c | 121 +++++++++++++++++-
drivers/pinctrl/rockchip/pinctrl_rk3328.c | 9 +-
drivers/pinctrl/rockchip/pinctrl_rk3399.c | 3 +-
drivers/pinctrl/rockchip/pinctrl_rv1108.c | 3 +-
drivers/power/regulator/rk8xx.c | 74 ++++++++---
drivers/serial/ns16550.c | 11 +-
drivers/spi/rk_spi.c | 15 ++-
drivers/sysreset/sysreset_rk322x.c | 45 +++++++
drivers/usb/host/Kconfig | 12 ++
drivers/usb/host/dwc2.c | 16 +--
drivers/usb/host/xhci-rockchip.c | 49 ++++----
drivers/video/rockchip/rk_mipi.c | 22 ++--
include/configs/evb_rk3229.h | 60 +++++++++
include/configs/hikey.h | 1 -
include/configs/phycore_rk3288.h | 23 ++++
include/configs/rk3036_common.h | 2 +-
include/configs/rk3188_common.h | 2 +-
include/configs/rk322x_common.h | 92 ++++++++++++++
include/configs/rk3288_common.h | 2 +-
include/configs/rk3328_common.h | 2 +-
include/configs/rk3368_common.h | 2 +
include/configs/rk3399_common.h | 1 +
include/configs/rpi.h | 1 -
include/configs/socfpga_common.h | 3 -
include/dt-bindings/clock/rk3228-cru.h | 238 +++++++++++++++++++++++++++++++++++
include/power/rk8xx_pmic.h | 2 +
scripts/config_whitelist.txt | 1 -
tools/rkcommon.c | 1 +
125 files changed, 5044 insertions(+), 595 deletions(-)
create mode 100644 arch/arm/dts/rk3229-evb.dts
create mode 100644 arch/arm/dts/rk322x.dtsi
create mode 100644 arch/arm/dts/rk3288-phycore-rdk.dts
create mode 100644 arch/arm/dts/rk3288-phycore-som.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk322x.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk322x.h
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_common.h
create mode 100644 arch/arm/mach-rockchip/rk322x-board-spl.c
create mode 100644 arch/arm/mach-rockchip/rk322x-board.c
create mode 100644 arch/arm/mach-rockchip/rk322x/Kconfig
create mode 100644 arch/arm/mach-rockchip/rk322x/Makefile
create mode 100644 arch/arm/mach-rockchip/rk322x/clk_rk322x.c
create mode 100644 arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
create mode 100644 arch/arm/mach-rockchip/rk3328/sdram_rk3328.c
create mode 100644 arch/arm/mach-rockchip/rk3368/sdram_rk3368.c
create mode 100644 arch/arm/mach-rockchip/sdram_common.c
create mode 100644 board/phytec/phycore_rk3288/Kconfig
create mode 100644 board/phytec/phycore_rk3288/MAINTAINERS
create mode 100644 board/phytec/phycore_rk3288/Makefile
create mode 100644 board/phytec/phycore_rk3288/phycore-rk3288.c
create mode 100644 board/rockchip/evb_rk3229/Kconfig
create mode 100644 board/rockchip/evb_rk3229/MAINTAINERS
create mode 100644 board/rockchip/evb_rk3229/Makefile
create mode 100644 board/rockchip/evb_rk3229/evb_rk3229.c
create mode 100644 configs/evb-rk3229_defconfig
create mode 100644 configs/phycore-rk3288_defconfig
create mode 100644 drivers/clk/rockchip/clk_rk322x.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c
create mode 100644 drivers/sysreset/sysreset_rk322x.c
create mode 100644 include/configs/evb_rk3229.h
create mode 100644 include/configs/phycore_rk3288.h
create mode 100644 include/configs/rk322x_common.h
create mode 100644 include/dt-bindings/clock/rk3228-cru.h
More information about the U-Boot
mailing list