[U-Boot] [PULL] Please pull u-boot-rockchip/master
Dr. Philipp Tomsich
philipp.tomsich at theobroma-systems.com
Fri Dec 1 23:32:00 UTC 2017
Here’s v2 of the pull-request with the issues fixed.
Looks like I’ll need to become even more restrictive on the quality of vendor patches.
Sorry for causing extra work.
Regards,
Philipp.
The following changes since commit 9804d88630cdb22f5f0ace05ac05942928410fd9:
Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh (2017-11-30 10:39:04 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-rockchip.git master
for you to fetch changes up to 4fc495e9e2e497afee383294a6ee9212e9a8bd73:
rockchip: clk: rk3128: fix DCLK_VOP_DIV_CON_MASK (2017-12-02 00:27:42 +0100)
----------------------------------------------------------------
Andy Yan (1):
rockchip: board: evb_rv1108: update README
Kever Yang (10):
rockchip: rk3128: add device tree file
rockchip: rk3128: add soc basic support
rockchip: rk3128: add clock driver
rockchip: rk3128: add pinctrl driver
rockchip: rk3128: add evb-rk3128 support
rockchip: rk3128: add defconfig for evb-rk3128
rockchip: rk3128: add sdram driver
rockchip: rk3036: fix pll config for correct frequency
rockchip: rk3036: update clock driver for ddr
rockchip: rk3036: sdram: correct setting for pll integer mode
Philipp Tomsich (8):
MAINTAINERS: update maintained files for Rockchip
rockchip: board: evb-rk3128: add empty Makefile
rockchip: rk3399-puma: implement usb_hub_reset_devices for puma-rk3399
rockchip: dts: rk3399-puma: add a 'tsd, usb-port-power' stringlist for USB1
rockchip: rk3399-puma: add code to allow forcing a power-on reset
rockchip: dts: rk3399-puma: add /config/sysreset-gpio property
rockchip: clk: rk3128: fix NANDC_PLL_SEL_MASK
rockchip: clk: rk3128: fix DCLK_VOP_DIV_CON_MASK
MAINTAINERS | 12 ++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3128-evb.dts | 95 +++++++++++++
arch/arm/dts/rk3128.dtsi | 804 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/dts/rk3399-puma.dtsi | 6 +
arch/arm/include/asm/arch-rockchip/cru_rk3128.h | 212 ++++++++++++++++++++++++++++
arch/arm/include/asm/arch-rockchip/grf_rk3128.h | 551 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/mach-rockchip/Kconfig | 10 ++
arch/arm/mach-rockchip/Makefile | 2 +
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 22 ++-
arch/arm/mach-rockchip/rk3128-board.c | 127 +++++++++++++++++
arch/arm/mach-rockchip/rk3128/Kconfig | 24 ++++
arch/arm/mach-rockchip/rk3128/Makefile | 9 ++
arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 32 +++++
arch/arm/mach-rockchip/rk3128/rk3128.c | 12 ++
arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 21 +++
board/rockchip/evb_rk3128/Kconfig | 15 ++
board/rockchip/evb_rk3128/MAINTAINERS | 6 +
board/rockchip/evb_rk3128/Makefile | 5 +
board/rockchip/evb_rk3128/evk-rk3128.c | 0
board/rockchip/evb_rv1108/README | 5 +-
board/theobroma-systems/puma_rk3399/puma-rk3399.c | 114 ++++++++++++++-
configs/evb-rk3128_defconfig | 56 ++++++++
doc/device-tree-bindings/config.txt | 6 +
drivers/clk/rockchip/Makefile | 3 +-
drivers/clk/rockchip/clk_rk3128.c | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/pinctrl/Kconfig | 10 ++
drivers/pinctrl/rockchip/Makefile | 4 +-
drivers/pinctrl/rockchip/pinctrl_rk3128.c | 187 +++++++++++++++++++++++++
drivers/ram/rockchip/Makefile | 1 +
drivers/ram/rockchip/sdram_rk3128.c | 59 ++++++++
include/configs/evb_rk3128.h | 15 ++
include/configs/rk3128_common.h | 70 ++++++++++
include/dt-bindings/clock/rk3128-cru.h | 190 +++++++++++++++++++++++++
34 files changed, 3263 insertions(+), 19 deletions(-)
create mode 100644 arch/arm/dts/rk3128-evb.dts
create mode 100644 arch/arm/dts/rk3128.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3128.h
create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3128.h
create mode 100644 arch/arm/mach-rockchip/rk3128-board.c
create mode 100644 arch/arm/mach-rockchip/rk3128/Kconfig
create mode 100644 arch/arm/mach-rockchip/rk3128/Makefile
create mode 100644 arch/arm/mach-rockchip/rk3128/clk_rk3128.c
create mode 100644 arch/arm/mach-rockchip/rk3128/rk3128.c
create mode 100644 arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
create mode 100644 board/rockchip/evb_rk3128/Kconfig
create mode 100644 board/rockchip/evb_rk3128/MAINTAINERS
create mode 100644 board/rockchip/evb_rk3128/Makefile
create mode 100644 board/rockchip/evb_rk3128/evk-rk3128.c
create mode 100644 configs/evb-rk3128_defconfig
create mode 100644 drivers/clk/rockchip/clk_rk3128.c
create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c
create mode 100644 drivers/ram/rockchip/sdram_rk3128.c
create mode 100644 include/configs/evb_rk3128.h
create mode 100644 include/configs/rk3128_common.h
create mode 100644 include/dt-bindings/clock/rk3128-cru.h
> On 1 Dec 2017, at 22:47, Tom Rini <trini at konsulko.com> wrote:
>
> On Fri, Dec 01, 2017 at 07:00:36PM +0100, Dr. Philipp Tomsich wrote:
>
>> Tom,
>>
>> Another set of changes on u-boot-rockchip is ready for your tree.
>> This includes support for the RK3128, documentation updates and convenience changes for some of our boards.
>>
>> Thanks,
>> Philipp.
>>
>>
>> The following changes since commit 9804d88630cdb22f5f0ace05ac05942928410fd9:
>>
>> Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh (2017-11-30 10:39:04 -0500)
>>
>> are available in the git repository at:
>>
>> git://git.denx.de/u-boot-rockchip.git master
>>
>> for you to fetch changes up to 5f104178bf713615dc404fdfcf0fb53d89c66a07:
>>
>> rockchip: dts: rk3399-puma: add /config/sysreset-gpio property (2017-11-30 22:59:54 +0100)
>>
>
> NAK:
> +(evb-rk3128) writel(((clr) | (set)) << 16 | (set), addr)
> +(evb-rk3128) ^
> +(evb-rk3128) ../drivers/clk/rockchip/clk_rk3128.c:234:2: note: in expansion of macro ?rk_clrsetreg?
> +(evb-rk3128) rk_clrsetreg(&cru->cru_clksel_con[2],
> +(evb-rk3128) ^~~~~~~~~~~~
> +(evb-rk3128) ../drivers/clk/rockchip/clk_rk3128.c:445:3: note: in expansion of macro ?rk_clrsetreg?
> +(evb-rk3128) rk_clrsetreg(&cru->cru_clksel_con[27],
> +(evb-rk3128) ^~~~~~~~~~~~
> w+(evb-rk3128) ../drivers/clk/rockchip/clk_rk3128.c: In function ?rkclk_init?:
> w+(evb-rk3128) include/asm/arch/hardware.h:17:28: warning: result of ?122624 << 16? requires 34 bits to represent, but ?int? only has 32 bits [-Wshift-overflow=]
> w+(evb-rk3128) ../drivers/clk/rockchip/clk_rk3128.c: In function ?rk3128_vop_set_clk?:
> w+(evb-rk3128) include/asm/arch/hardware.h:17:28: warning: result of ?1048321 << 16? requires 37 bits to represent, but ?int? only has 32 bits [-Wshift-overflow=]
>
> Please fix, thanks!
>
> --
> Tom
More information about the U-Boot
mailing list