June 2017 - U-Boot

[U-Boot] [PATCH] ARM: uniphier: fix various sparse warnings
by Masahiro Yamada 25 Jun '17

25 Jun '17

Fix warnings reported by sparse: - ... was not declared. Should it be static?" - cast to restricted __be32 While fixing those, the type conflict of cci500_init() was found. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-uniphier/arm64/arm-cci500.c | 2 ++ arch/arm/mach-uniphier/arm64/smp_kick_cpus.c | 2 ++ arch/arm/mach-uniphier/board_init.c | 2 +- arch/arm/mach-uniphier/clk/pll-pxs3.c | 2 ++ arch/arm/mach-uniphier/dram/umc-ld11.c | 14 +++++++------- arch/arm/mach-uniphier/dram/umc-pxs2.c | 2 +- arch/arm/mach-uniphier/dram_init.c | 1 + arch/arm/mach-uniphier/init.h | 3 ++- drivers/clk/uniphier/clk-uniphier-core.c | 2 +- drivers/reset/reset-uniphier.c | 18 +++++++++--------- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-uniphier/arm64/arm-cci500.c b/arch/arm/mach-uniphier/arm64/arm-cci500.c index f18595dc1311..bf0fad459bbd 100644 --- a/arch/arm/mach-uniphier/arm64/arm-cci500.c +++ b/arch/arm/mach-uniphier/arm64/arm-cci500.c @@ -11,6 +11,8 @@ #include <linux/io.h> #include <linux/sizes.h> +#include "../init.h" + #define CCI500_BASE 0x5FD00000 #define CCI500_SLAVE_OFFSET 0x1000 diff --git a/arch/arm/mach-uniphier/arm64/smp_kick_cpus.c b/arch/arm/mach-uniphier/arm64/smp_kick_cpus.c index 4f08963118a3..8e5b198c96ce 100644 --- a/arch/arm/mach-uniphier/arm64/smp_kick_cpus.c +++ b/arch/arm/mach-uniphier/arm64/smp_kick_cpus.c @@ -8,6 +8,8 @@ #include <linux/io.h> #include <linux/sizes.h> +#include "../init.h" + #define UNIPHIER_SMPCTRL_ROM_RSV0 0x59801200 void uniphier_smp_setup(void); diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index e05d6bffd5ce..ca910f6d7254 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -21,7 +21,7 @@ static void uniphier_setup_xirq(void) { const void *fdt = gd->fdt_blob; int soc_node, aidet_node; - const u32 *val; + const fdt32_t *val; unsigned long aidet_base; u32 tmp; diff --git a/arch/arm/mach-uniphier/clk/pll-pxs3.c b/arch/arm/mach-uniphier/clk/pll-pxs3.c index e29d9d000142..201d3517a86a 100644 --- a/arch/arm/mach-uniphier/clk/pll-pxs3.c +++ b/arch/arm/mach-uniphier/clk/pll-pxs3.c @@ -2,6 +2,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include "../init.h" + void uniphier_pxs3_pll_init(void) { } diff --git a/arch/arm/mach-uniphier/dram/umc-ld11.c b/arch/arm/mach-uniphier/dram/umc-ld11.c index 69aa4f2eebe3..9e2021a627e5 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld11.c +++ b/arch/arm/mach-uniphier/dram/umc-ld11.c @@ -28,11 +28,11 @@ enum dram_size { }; /* PHY */ -const int rof_pos_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} }; -const int rof_neg_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} }; -const int rof_pos_shift[RANK_BLOCKS_TR][2] = { {-35, -35}, {-35, -35} }; -const int rof_neg_shift[RANK_BLOCKS_TR][2] = { {-17, -17}, {-17, -17} }; -const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} }; +static const int rof_pos_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} }; +static const int rof_neg_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} }; +static const int rof_pos_shift[RANK_BLOCKS_TR][2] = { {-35, -35}, {-35, -35} }; +static const int rof_neg_shift[RANK_BLOCKS_TR][2] = { {-17, -17}, {-17, -17} }; +static const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} }; /* Register address */ #define PHY_ZQ0CR1 0x00000184 @@ -65,7 +65,7 @@ const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} }; #define PHY_DSWBD_MASK 0x3F000000 /* bit[29:24] */ #define PHY_DSDQOE_MASK 0x00000FFF -static void ddrphy_maskwritel(u32 data, u32 mask, void *addr) +static void ddrphy_maskwritel(u32 data, u32 mask, void __iomem *addr) { u32 value; @@ -73,7 +73,7 @@ static void ddrphy_maskwritel(u32 data, u32 mask, void *addr) writel(value, addr); } -static u32 ddrphy_maskreadl(u32 mask, void *addr) +static u32 ddrphy_maskreadl(u32 mask, void __iomem *addr) { return readl(addr) & mask; } diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c index 7fa29f119d08..8068ef13882e 100644 --- a/arch/arm/mach-uniphier/dram/umc-pxs2.c +++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c @@ -436,7 +436,7 @@ static void umc_set_system_latency(void __iomem *dc_base, int phy_latency) } /* enable/disable auto refresh */ -void umc_refresh_ctrl(void __iomem *dc_base, int enable) +static void umc_refresh_ctrl(void __iomem *dc_base, int enable) { u32 tmp; diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index f79b7cf3ca67..6eb8d2650424 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <fdt_support.h> #include <fdtdec.h> #include <linux/errno.h> #include <linux/sizes.h> diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h index d413d00f951b..154918b18966 100644 --- a/arch/arm/mach-uniphier/init.h +++ b/arch/arm/mach-uniphier/init.h @@ -87,6 +87,7 @@ int uniphier_pro5_dpll_init(const struct uniphier_board_data *bd); int uniphier_pxs2_dpll_init(const struct uniphier_board_data *bd); int uniphier_ld11_dpll_init(const struct uniphier_board_data *bd); int uniphier_ld20_dpll_init(const struct uniphier_board_data *bd); +int uniphier_pxs3_dpll_init(const struct uniphier_board_data *bd); void uniphier_sld3_early_clk_init(void); void uniphier_ld11_early_clk_init(void); @@ -126,7 +127,7 @@ int uniphier_have_internal_stm(void); int uniphier_boot_from_backend(void); int uniphier_pin_init(const char *pinconfig_name); void uniphier_smp_kick_all_cpus(void); -void cci500_init(int nr_slaves); +void cci500_init(unsigned int nr_slaves); #undef pr_warn #define pr_warn(fmt, args...) printf(fmt, ##args) diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c index d88bd62812d3..0fb48541b9b7 100644 --- a/drivers/clk/uniphier/clk-uniphier-core.c +++ b/drivers/clk/uniphier/clk-uniphier-core.c @@ -121,7 +121,7 @@ static ulong uniphier_clk_set_rate(struct clk *clk, ulong rate) return best_rate; } -const struct clk_ops uniphier_clk_ops = { +static const struct clk_ops uniphier_clk_ops = { .enable = uniphier_clk_enable, .get_rate = uniphier_clk_get_rate, .set_rate = uniphier_clk_set_rate, diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index e98df43bdb81..17e971a427f9 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -56,12 +56,12 @@ struct uniphier_reset_data { #define UNIPHIER_PRO4_SYS_RESET_USB3(id, ch) \ UNIPHIER_RESETX((id), 0x2000 + 0x4 * (ch), 17) -const struct uniphier_reset_data uniphier_sld3_sys_reset_data[] = { +static const struct uniphier_reset_data uniphier_sld3_sys_reset_data[] = { UNIPHIER_SLD3_SYS_RESET_STDMAC(8), /* Ether, HSC, MIO */ UNIPHIER_RESET_END, }; -const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = { +static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = { UNIPHIER_SLD3_SYS_RESET_STDMAC(8), /* HSC, MIO, RLE */ UNIPHIER_PRO4_SYS_RESET_GIO(12), /* Ether, SATA, USB3 */ UNIPHIER_PRO4_SYS_RESET_USB3(14, 0), @@ -69,7 +69,7 @@ const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = { UNIPHIER_RESET_END, }; -const struct uniphier_reset_data uniphier_pro5_sys_reset_data[] = { +static const struct uniphier_reset_data uniphier_pro5_sys_reset_data[] = { UNIPHIER_SLD3_SYS_RESET_STDMAC(8), /* HSC */ UNIPHIER_PRO4_SYS_RESET_GIO(12), /* PCIe, USB3 */ UNIPHIER_PRO4_SYS_RESET_USB3(14, 0), @@ -77,7 +77,7 @@ const struct uniphier_reset_data uniphier_pro5_sys_reset_data[] = { UNIPHIER_RESET_END, }; -const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = { +static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = { UNIPHIER_SLD3_SYS_RESET_STDMAC(8), /* HSC, RLE */ UNIPHIER_PRO4_SYS_RESET_USB3(14, 0), UNIPHIER_PRO4_SYS_RESET_USB3(15, 1), @@ -91,12 +91,12 @@ const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = { UNIPHIER_RESET_END, }; -const struct uniphier_reset_data uniphier_ld11_sys_reset_data[] = { +static const struct uniphier_reset_data uniphier_ld11_sys_reset_data[] = { UNIPHIER_LD11_SYS_RESET_STDMAC(8), /* HSC, MIO */ UNIPHIER_RESET_END, }; -const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = { +static const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = { UNIPHIER_LD11_SYS_RESET_STDMAC(8), /* HSC */ UNIPHIER_LD20_SYS_RESET_GIO(12), /* PCIe, USB3 */ UNIPHIER_RESETX(16, 0x200c, 12), /* USB30-PHY0 */ @@ -125,7 +125,7 @@ const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = { #define UNIPHIER_MIO_RESET_DMAC(id) \ UNIPHIER_RESETX((id), 0x110, 17) -const struct uniphier_reset_data uniphier_mio_reset_data[] = { +static const struct uniphier_reset_data uniphier_mio_reset_data[] = { UNIPHIER_MIO_RESET_SD(0, 0), UNIPHIER_MIO_RESET_SD(1, 1), UNIPHIER_MIO_RESET_SD(2, 2), @@ -155,7 +155,7 @@ const struct uniphier_reset_data uniphier_mio_reset_data[] = { #define UNIPHIER_PERI_RESET_FI2C(id, ch) \ UNIPHIER_RESETX((id), 0x114, 24 + (ch)) -const struct uniphier_reset_data uniphier_ld4_peri_reset_data[] = { +static const struct uniphier_reset_data uniphier_ld4_peri_reset_data[] = { UNIPHIER_PERI_RESET_UART(0, 0), UNIPHIER_PERI_RESET_UART(1, 1), UNIPHIER_PERI_RESET_UART(2, 2), @@ -168,7 +168,7 @@ const struct uniphier_reset_data uniphier_ld4_peri_reset_data[] = { UNIPHIER_RESET_END, }; -const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = { +static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = { UNIPHIER_PERI_RESET_UART(0, 0), UNIPHIER_PERI_RESET_UART(1, 1), UNIPHIER_PERI_RESET_UART(2, 2), -- 2.7.4

1 1

[U-Boot] [PATCH] odroid-c2: Populate serial# environment variable from efuse
by Martin Böh 23 Jun '17

23 Jun '17

--- board/amlogic/odroid-c2/odroid-c2.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c index 9306b56a6a..b29f56d5eb 100644 --- a/board/amlogic/odroid-c2/odroid-c2.c +++ b/board/amlogic/odroid-c2/odroid-c2.c @@ -24,6 +24,7 @@ int board_init(void) int misc_init_r(void) { u8 mac_addr[EFUSE_MAC_SIZE]; + char serial[EFUSE_SN_SIZE]; ssize_t len; /* Set RGMII mode */ @@ -50,5 +51,12 @@ int misc_init_r(void) eth_setenv_enetaddr("ethaddr", mac_addr); } + if (!getenv("serial#")) { + len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, + EFUSE_SN_SIZE); + if (len == EFUSE_SN_SIZE) + setenv("serial#", serial); + } + return 0; } -- 2.13.0

1 0

[U-Boot] please pull u-boot-samsung master
by Jaehoon Chung 23 Jun '17

23 Jun '17

From: Minkyu Kang <mk7.kang(a)samsung.com> Dear Tom, The following changes since commit 5cafcbab580bac6c7f44ca4a164c422b7e1ecf20: Merge git://git.denx.de/u-boot-net (2017-06-03 18:05:28 -0400) are available in the git repository at: git://git.denx.de/u-boot-samsung master for you to fetch changes up to 2c62e313b14186d67f5bf26095f36a246cb0c3a4: odroid: remove CONFIG_DM_I2C_COMPAT config (2017-06-19 13:10:19 +0900) ---------------------------------------------------------------- Jaehoon Chung (5): ARM: dts: exynos4: change the nodes relevant to mmc/sd configs: enable the CONFIG_DM_MMC for exynos4 series ARM: dts: exynos5422-odroidxu3: add the LDO's nodes configs: odroid-xu3: remove the CONFIG_I2C_COMPAT odroid: remove CONFIG_DM_I2C_COMPAT config arch/arm/dts/exynos4.dtsi | 25 +++++++----- arch/arm/dts/exynos4210-origen.dts | 24 +++--------- arch/arm/dts/exynos4210-trats.dts | 40 +++++++------------- arch/arm/dts/exynos4210-universal_c210.dts | 36 +++++++----------- arch/arm/dts/exynos4412-odroid.dts | 50 ++++++++++-------------- arch/arm/dts/exynos4412-trats2.dts | 49 ++++++++++++------------ arch/arm/dts/exynos4x12.dtsi | 13 ------- arch/arm/dts/exynos5422-odroidxu3.dts | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configs/odroid-xu3_defconfig | 2 +- configs/odroid_defconfig | 3 +- configs/origen_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + include/configs/odroid.h | 5 --- 15 files changed, 310 insertions(+), 150 deletions(-) -- Thanks, Minkyu Kang.

3 2

[U-Boot] Please pull u-boot-marvell/master
by Stefan Roese 23 Jun '17

23 Jun '17

Hi Tom, please pull 2 mvebu related pinctrl bug-fixes from Ken. Thanks, Stefan The following changes since commit 235c5b8315c6a9eb566fd3d99a098cc6db869fc5: Merge branch 'master' of git://git.denx.de/u-boot-samsung (2017-06-21 08:01:07 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to ae118b6855a7d003a7d024129e686c8a4a400141: pinctrl: a3700: Fix the issue that gpio controller is registered with wrong node id (2017-06-23 07:09:40 +0200) ---------------------------------------------------------------- Ken Ma (2): pinctrl: a3700: Fix uart2 group selection register mask pinctrl: a3700: Fix the issue that gpio controller is registered with wrong node id drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

2 1

[U-Boot] Please pull u-boot-x86
by Bin Meng 23 Jun '17

23 Jun '17

Hi Tom, The following changes since commit 235c5b8315c6a9eb566fd3d99a098cc6db869fc5: Merge branch 'master' of git://git.denx.de/u-boot-samsung (2017-06-21 08:01:07 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to c8f258d8a8452b9f74c0032aaa3dee3804b1fd45: x86: Remove CONFIG_USB_MAX_CONTROLLER_COUNT (2017-06-22 14:58:17 +0800) ---------------------------------------------------------------- Bin Meng (2): x86: minnowmax: Configure GPIO pins to turn on USB ports VBUS x86: Remove CONFIG_USB_MAX_CONTROLLER_COUNT board/intel/minnowmax/minnowmax.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/conga-qeval20-qa3-e3845.h | 3 --- include/configs/dfi-bt700.h | 3 --- include/configs/minnowmax.h | 4 +--- include/configs/x86-common.h | 1 - 5 files changed, 54 insertions(+), 10 deletions(-) Regards, Bin

2 1

[U-Boot] [PATCH 0/7] Add Rockchip RK3229 SoC
by Kever Yang 23 Jun '17

23 Jun '17

RK3229 is a Quad-core Cortex-A7 SoC, which supports: - 4K 10bit H.264/H.265,VP9. - 32KB internal memory; - eMMC 4.5.1, SD3.0; - DDR3, LPDDR2, LPDDR3; - HDMI 2.0 output, 4K@60Hz; - USB2.0 OTG and USB2.0 host; Kever Yang (7): 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 arch/arm/dts/rk3229-evb.dts | 77 +++ arch/arm/dts/rk322x.dtsi | 710 ++++++++++++++++++++++++ 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/grf_rk322x.h | 519 +++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 14 + arch/arm/mach-rockchip/Makefile | 3 + arch/arm/mach-rockchip/rk322x-board-spl.c | 77 +++ arch/arm/mach-rockchip/rk322x-board.c | 159 ++++++ arch/arm/mach-rockchip/rk322x/Kconfig | 18 + arch/arm/mach-rockchip/rk322x/Makefile | 9 + arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 33 ++ arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 22 + 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 + configs/evb-rk3229_defconfig | 44 ++ drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_rk322x.c | 413 ++++++++++++++ drivers/pinctrl/Kconfig | 10 + drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl_rk322x.c | 295 ++++++++++ drivers/sysreset/sysreset_rk322x.c | 45 ++ include/configs/evb_rk3229.h | 60 ++ include/configs/rk322x_common.h | 92 +++ include/dt-bindings/clock/rk3228-cru.h | 247 +++++++++ tools/rkcommon.c | 1 + 28 files changed, 3106 insertions(+) create mode 100644 arch/arm/dts/rk3229-evb.dts create mode 100644 arch/arm/dts/rk322x.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/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 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 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/rk322x_common.h create mode 100644 include/dt-bindings/clock/rk3228-cru.h -- 1.9.1

3 19

[U-Boot] [PATCH 0/2] *** SUBJECT HERE ***
by make＠marvell.com 23 Jun '17

23 Jun '17

From: Ken Ma <make(a)marvell.com> *** BLURB HERE *** Fix 2 armada-37xx pinctrl issues. Ken Ma (2): pinctrl: a3700: Fix uart2 group selection register mask pinctrl: a3700: Fix the issue that gpio controller is registered with wrong node id drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 1.9.1

2 6

[U-Boot] [PATCH] Initilize IDE prior environment
by Otavio Salvador 23 Jun '17

23 Jun '17

To allow the loading of environment from IDE (for example, using FAT) the initilization of IDE subsystem must come before the environment one. Successfully tested on QEMU x86. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- common/board_r.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index adc1f1937e..247a6668fc 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -806,6 +806,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_MMC initr_mmc, #endif +#if defined(CONFIG_IDE) + initr_ide, +#endif #ifdef CONFIG_HAS_DATAFLASH initr_dataflash, #endif @@ -878,9 +881,6 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE) initr_pcmcia, #endif -#if defined(CONFIG_IDE) - initr_ide, -#endif #ifdef CONFIG_LAST_STAGE_INIT INIT_FUNC_WATCHDOG_RESET /* -- 2.13.1

6 6

[U-Boot] [PATCH v6 0/8] rk3328: add support of usb host and gadget
by Meng Dongyang 23 Jun '17

23 Jun '17

Add support of usb host and gadget function for rk3328. Changed in v6: - Rebase on the newest code of master branch - Make xhci-rockchip driver depend on DM_REGULATOR and DM_USB - Remove #ifdef DM_RERULATOR and DM_USB in xhci-rockchip driver - Use dev_read_boot() instead of fdt_getprop() in dwc2 driver 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 (8): usb: Kconfig: add depends on feature for xhci-rockchip driver usb: host: xhci-rockchip: use fixed regulator to control vbus rockchip: dts: rk3328: support and enable xhci rockchip: configs: rk3328: enable dwc2 driver and config fastboot 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 arch/arm/dts/rk3328-evb.dts | 25 +++++++++++++++++++- arch/arm/dts/rk3328.dtsi | 10 ++++++++ arch/arm/dts/rk3399-evb.dts | 16 +++++++++++-- board/rockchip/evb_rk3328/evb-rk3328.c | 42 ++++++++++++++++++++++++++++++++++ configs/evb-rk3328_defconfig | 19 +++++++++++++-- drivers/usb/host/Kconfig | 2 ++ drivers/usb/host/dwc2.c | 15 +++++------- drivers/usb/host/xhci-rockchip.c | 36 ++++++++++++++--------------- include/configs/rk3328_common.h | 3 +++ 9 files changed, 136 insertions(+), 32 deletions(-) -- 1.9.1

3 10

[U-Boot] [PATCH] usb: add static to local symbols
by Masahiro Yamada 22 Jun '17

22 Jun '17

Sparse reports "... was not declared. Should it be static?" Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/usb-uclass.c | 18 +++++++++--------- drivers/usb/host/xhci-dwc3.c | 2 +- drivers/usb/host/xhci.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 13aa70d60661..f08709d0212d 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -937,7 +937,7 @@ unknown: return -1; } -const struct ehci_ops default_ehci_ops = { +static const struct ehci_ops default_ehci_ops = { .set_usb_mode = ehci_set_usbmode, .get_port_speed = ehci_get_port_speed, .powerup_fixup = ehci_powerup_fixup, diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index 110ddc92fa3a..efc5d4e7d7b0 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -373,8 +373,8 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) } /* returns 0 if no match, 1 if match */ -int usb_match_device(const struct usb_device_descriptor *desc, - const struct usb_device_id *id) +static int usb_match_device(const struct usb_device_descriptor *desc, + const struct usb_device_id *id) { if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) && id->idVendor != le16_to_cpu(desc->idVendor)) @@ -410,9 +410,9 @@ int usb_match_device(const struct usb_device_descriptor *desc, } /* returns 0 if no match, 1 if match */ -int usb_match_one_id_intf(const struct usb_device_descriptor *desc, - const struct usb_interface_descriptor *int_desc, - const struct usb_device_id *id) +static int usb_match_one_id_intf(const struct usb_device_descriptor *desc, + const struct usb_interface_descriptor *int_desc, + const struct usb_device_id *id) { /* The interface class, subclass, protocol and number should never be * checked for a match if the device class is Vendor Specific, @@ -445,9 +445,9 @@ int usb_match_one_id_intf(const struct usb_device_descriptor *desc, } /* returns 0 if no match, 1 if match */ -int usb_match_one_id(struct usb_device_descriptor *desc, - struct usb_interface_descriptor *int_desc, - const struct usb_device_id *id) +static int usb_match_one_id(struct usb_device_descriptor *desc, + struct usb_interface_descriptor *int_desc, + const struct usb_device_id *id) { if (!usb_match_device(desc, id)) return 0; @@ -680,7 +680,7 @@ int usb_detect_change(void) return change; } -int usb_child_post_bind(struct udevice *dev) +static int usb_child_post_bind(struct udevice *dev) { struct usb_dev_platdata *plat = dev_get_parent_platdata(dev); int val; diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 33961cd63455..a4591f2e02ca 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -19,7 +19,7 @@ void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode) DWC3_GCTL_PRTCAPDIR(mode)); } -void dwc3_phy_reset(struct dwc3 *dwc3_reg) +static void dwc3_phy_reset(struct dwc3 *dwc3_reg) { /* Assert USB3 PHY reset */ setbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST); diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 32011774768f..bd8f4c43b4b2 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -192,7 +192,7 @@ static int xhci_start(struct xhci_hcor *hcor) * @param hcor pointer to host controller operation registers * @return -EBUSY if XHCI Controller is not halted else status of handshake */ -int xhci_reset(struct xhci_hcor *hcor) +static int xhci_reset(struct xhci_hcor *hcor) { u32 cmd; u32 state; @@ -481,7 +481,7 @@ static int xhci_address_device(struct usb_device *udev, int root_portnr) * @param udev pointer to the Device Data Structure * @return Returns 0 on succes else return error code on failure */ -int _xhci_alloc_device(struct usb_device *udev) +static int _xhci_alloc_device(struct usb_device *udev) { struct xhci_ctrl *ctrl = xhci_get_ctrl(udev); union xhci_trb *event; -- 2.7.4

3 2