September 2015 - U-Boot

[U-Boot] [PATCH v2 00/14] ARM: uniphier: clean-up, refactor, and then new SoCs support
by Masahiro Yamada 23 Sep '15

23 Sep '15

Masahiro Yamada (14): ARM: uniphier: remove unused header file ARM: uniphier: remove useless wrapper functions ARM: uniphier: refactor LED function ARM: uniphier: move CONFIG_SUPPORT_CARD_* macros to local file ARM: uniphier: allow to disable CONFIG_MICRO_SUPPORT_CARD ARM: uniphier: rename CONFIG_MACH_* to CONFIG_ARCH_UNIPHIER_* ARM: uniphier: delete unneeded input enable for low-level debug ARM: uniphier: fix glitch signal problem for low-level debug ARM: uniphier: unify low-level debug init code ARM: uniphier: remove kernel parameter settings from environment ARM: uniphier: allow to enable multiple SoCs ARM: uniphier: add PH1-Pro5 support ARM: uniphier: add ProXstream2 and PH1-LD6b support ARM: uniphier: fix init page table for ProXstream2/PH1-LD6b USB boot arch/arm/dts/Makefile | 5 +- arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 1 + arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 64 +++++++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 62 +++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 62 +++++++ arch/arm/mach-uniphier/Kconfig | 76 +++++---- arch/arm/mach-uniphier/Makefile | 20 ++- arch/arm/mach-uniphier/bcu/Makefile | 3 + .../{ph1-ld4/bcu_init.c => bcu/bcu-ph1-ld4.c} | 8 +- .../{ph1-sld3/bcu_init.c => bcu/bcu-ph1-sld3.c} | 8 +- arch/arm/mach-uniphier/board_common.c | 11 +- arch/arm/mach-uniphier/board_early_init_f.c | 73 ++++++-- arch/arm/mach-uniphier/board_early_init_r.c | 7 +- arch/arm/mach-uniphier/boards.c | 130 +++++++++++++++ arch/arm/mach-uniphier/boot-mode/Makefile | 9 + .../boot-mode.c => boot-mode/boot-mode-ph1-ld4.c} | 21 ++- .../mach-uniphier/boot-mode/boot-mode-ph1-pro5.c | 75 +++++++++ .../boot-mode.c => boot-mode/boot-mode-ph1-sld3.c} | 23 ++- .../boot-mode/boot-mode-proxstream2.c | 75 +++++++++ arch/arm/mach-uniphier/boot-mode/boot-mode.c | 45 +++++ arch/arm/mach-uniphier/clk/Makefile | 7 + .../{ph1-ld4/clkrst_init.c => clk/clk-ph1-ld4.c} | 3 +- .../{ph1-pro4/clkrst_init.c => clk/clk-ph1-pro4.c} | 3 +- arch/arm/mach-uniphier/clk/clk-ph1-pro5.c | 44 +++++ arch/arm/mach-uniphier/clk/clk-proxstream2.c | 50 ++++++ arch/arm/mach-uniphier/cmd_pinmon.c | 43 +++-- arch/arm/mach-uniphier/ddrphy/Makefile | 3 + .../ddrphy_init.c => ddrphy/ddrphy-ph1-ld4.c} | 4 +- .../ddrphy_init.c => ddrphy/ddrphy-ph1-pro4.c} | 4 +- .../ddrphy_init.c => ddrphy/ddrphy-ph1-sld8.c} | 4 +- .../ddrphy-training.c} | 0 arch/arm/mach-uniphier/debug_ll.S | 185 +++++++++++++++++++++ arch/arm/mach-uniphier/early-clk/Makefile | 7 + .../early-clk-ph1-ld4.c} | 5 +- .../mach-uniphier/early-clk/early-clk-ph1-pro5.c | 39 +++++ .../early-clk/early-clk-proxstream2.c | 44 +++++ arch/arm/mach-uniphier/early-pinctrl/Makefile | 1 + .../early-pinctrl-ph1-sld3.c} | 5 +- arch/arm/mach-uniphier/include/mach/boot-device.h | 15 +- arch/arm/mach-uniphier/include/mach/ddrphy-regs.h | 7 +- arch/arm/mach-uniphier/include/mach/debug-uart.S | 23 --- arch/arm/mach-uniphier/include/mach/init.h | 99 +++++++++++ arch/arm/mach-uniphier/include/mach/led.h | 100 ----------- .../include/mach/{board.h => micro-support-card.h} | 23 ++- arch/arm/mach-uniphier/include/mach/platdevice.h | 24 --- arch/arm/mach-uniphier/include/mach/sc-regs.h | 25 ++- arch/arm/mach-uniphier/include/mach/sg-regs.h | 10 +- arch/arm/mach-uniphier/include/mach/soc_info.h | 63 +++++++ arch/arm/mach-uniphier/init/Makefile | 9 + arch/arm/mach-uniphier/init/init-ph1-ld4.c | 60 +++++++ arch/arm/mach-uniphier/init/init-ph1-pro4.c | 58 +++++++ arch/arm/mach-uniphier/init/init-ph1-pro5.c | 42 +++++ arch/arm/mach-uniphier/init/init-ph1-sld3.c | 53 ++++++ arch/arm/mach-uniphier/init/init-ph1-sld8.c | 60 +++++++ arch/arm/mach-uniphier/init/init-proxstream2.c | 41 +++++ arch/arm/mach-uniphier/init/init.c | 58 +++++++ arch/arm/mach-uniphier/init_page_table.S | 2 +- arch/arm/mach-uniphier/lowlevel_init.S | 3 +- arch/arm/mach-uniphier/memconf.c | 103 ------------ arch/arm/mach-uniphier/memconf/Makefile | 4 + arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c | 59 +++++++ .../mach-uniphier/memconf/memconf-proxstream2.c | 64 +++++++ arch/arm/mach-uniphier/memconf/memconf.c | 104 ++++++++++++ .../{support_card.c => micro-support-card.c} | 86 +++++++++- arch/arm/mach-uniphier/ph1-ld4/Makefile | 14 -- arch/arm/mach-uniphier/ph1-ld4/boot-mode.c | 1 - arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S | 29 ---- arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c | 1 - arch/arm/mach-uniphier/ph1-pro4/Makefile | 14 -- arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S | 39 ----- arch/arm/mach-uniphier/ph1-sld3/Makefile | 14 -- arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c | 1 - .../arm/mach-uniphier/ph1-sld3/early_clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-sld3/lowlevel_debug.S | 33 ---- arch/arm/mach-uniphier/ph1-sld3/memconf.c | 52 ------ arch/arm/mach-uniphier/ph1-sld3/sg_init.c | 9 - arch/arm/mach-uniphier/ph1-sld3/umc_init.c | 15 -- arch/arm/mach-uniphier/ph1-sld8/Makefile | 1 - arch/arm/mach-uniphier/ph1-sld8/bcu_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/boot-mode.c | 1 - arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c | 1 - .../arm/mach-uniphier/ph1-sld8/early_clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S | 29 ---- arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c | 1 - arch/arm/mach-uniphier/ph1-sld8/sbc_init.c | 1 - arch/arm/mach-uniphier/pinctrl/Makefile | 7 + .../pinctrl.c => pinctrl/pinctrl-ph1-ld4.c} | 3 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c | 45 +++++ .../pinctrl.c => pinctrl/pinctrl-ph1-pro4.c} | 3 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c | 43 +++++ .../pinctrl.c => pinctrl/pinctrl-ph1-sld3.c} | 3 +- .../pinctrl.c => pinctrl/pinctrl-ph1-sld8.c} | 3 +- .../mach-uniphier/pinctrl/pinctrl-proxstream2.c | 45 +++++ arch/arm/mach-uniphier/pll/Makefile | 8 + .../{ph1-ld4/pll_init.c => pll/pll-init-ph1-ld4.c} | 34 ++-- .../pll_init.c => pll/pll-init-ph1-pro4.c} | 36 ++-- .../pll_init.c => pll/pll-init-ph1-sld3.c} | 5 +- .../pll_init.c => pll/pll-init-ph1-sld8.c} | 5 +- .../pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c} | 6 +- .../pll_spectrum.c => pll/pll-spectrum-ph1-sld3.c} | 5 +- arch/arm/mach-uniphier/print_misc_info.c | 2 +- arch/arm/mach-uniphier/sbc/Makefile | 7 + .../{ph1-ld4/sbc_init.c => sbc/sbc-ph1-ld4.c} | 5 +- .../{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} | 5 +- .../{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} | 5 +- arch/arm/mach-uniphier/sbc/sbc-proxstream2.c | 48 ++++++ arch/arm/mach-uniphier/soc_info.c | 61 +++++++ arch/arm/mach-uniphier/spl.c | 83 --------- arch/arm/mach-uniphier/umc/Makefile | 3 + .../{ph1-ld4/umc_init.c => umc/umc-ph1-ld4.c} | 30 ++-- .../{ph1-pro4/umc_init.c => umc/umc-ph1-pro4.c} | 36 ++-- .../{ph1-sld8/umc_init.c => umc/umc-ph1-sld8.c} | 30 ++-- configs/ph1_ld4_defconfig | 2 +- configs/ph1_ld6b_defconfig | 30 ++++ configs/ph1_pro4_defconfig | 1 + configs/ph1_pro5_defconfig | 30 ++++ configs/ph1_sld3_defconfig | 2 +- configs/ph1_sld8_defconfig | 2 +- doc/README.uniphier | 12 ++ drivers/pinctrl/uniphier/Kconfig | 12 +- include/configs/uniphier.h | 90 ++-------- 122 files changed, 2542 insertions(+), 889 deletions(-) create mode 100644 arch/arm/dts/uniphier-ph1-pro5-4kbox.dts create mode 100644 arch/arm/dts/uniphier-proxstream2-gentil.dts create mode 100644 arch/arm/dts/uniphier-proxstream2-vodka.dts create mode 100644 arch/arm/mach-uniphier/bcu/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/bcu_init.c => bcu/bcu-ph1-ld4.c} (84%) rename arch/arm/mach-uniphier/{ph1-sld3/bcu_init.c => bcu/bcu-ph1-sld3.c} (84%) create mode 100644 arch/arm/mach-uniphier/boards.c create mode 100644 arch/arm/mach-uniphier/boot-mode/Makefile rename arch/arm/mach-uniphier/{ph1-pro4/boot-mode.c => boot-mode/boot-mode-ph1-ld4.c} (88%) create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c rename arch/arm/mach-uniphier/{ph1-sld3/boot-mode.c => boot-mode/boot-mode-ph1-sld3.c} (89%) create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode.c create mode 100644 arch/arm/mach-uniphier/clk/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/clkrst_init.c => clk/clk-ph1-ld4.c} (94%) rename arch/arm/mach-uniphier/{ph1-pro4/clkrst_init.c => clk/clk-ph1-pro4.c} (96%) create mode 100644 arch/arm/mach-uniphier/clk/clk-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/clk/clk-proxstream2.c create mode 100644 arch/arm/mach-uniphier/ddrphy/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/ddrphy_init.c => ddrphy/ddrphy-ph1-ld4.c} (95%) rename arch/arm/mach-uniphier/{ph1-pro4/ddrphy_init.c => ddrphy/ddrphy-ph1-pro4.c} (95%) rename arch/arm/mach-uniphier/{ph1-sld8/ddrphy_init.c => ddrphy/ddrphy-ph1-sld8.c} (95%) rename arch/arm/mach-uniphier/{ddrphy_training.c => ddrphy/ddrphy-training.c} (100%) create mode 100644 arch/arm/mach-uniphier/debug_ll.S create mode 100644 arch/arm/mach-uniphier/early-clk/Makefile rename arch/arm/mach-uniphier/{ph1-pro4/early_clkrst_init.c => early-clk/early-clk-ph1-ld4.c} (86%) create mode 100644 arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c create mode 100644 arch/arm/mach-uniphier/early-pinctrl/Makefile rename arch/arm/mach-uniphier/{ph1-sld3/early_pinctrl.c => early-pinctrl/early-pinctrl-ph1-sld3.c} (82%) delete mode 100644 arch/arm/mach-uniphier/include/mach/debug-uart.S create mode 100644 arch/arm/mach-uniphier/include/mach/init.h delete mode 100644 arch/arm/mach-uniphier/include/mach/led.h rename arch/arm/mach-uniphier/include/mach/{board.h => micro-support-card.h} (55%) delete mode 100644 arch/arm/mach-uniphier/include/mach/platdevice.h create mode 100644 arch/arm/mach-uniphier/include/mach/soc_info.h create mode 100644 arch/arm/mach-uniphier/init/Makefile create mode 100644 arch/arm/mach-uniphier/init/init-ph1-ld4.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-pro4.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-sld3.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-sld8.c create mode 100644 arch/arm/mach-uniphier/init/init-proxstream2.c create mode 100644 arch/arm/mach-uniphier/init/init.c delete mode 100644 arch/arm/mach-uniphier/memconf.c create mode 100644 arch/arm/mach-uniphier/memconf/Makefile create mode 100644 arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c create mode 100644 arch/arm/mach-uniphier/memconf/memconf-proxstream2.c create mode 100644 arch/arm/mach-uniphier/memconf/memconf.c rename arch/arm/mach-uniphier/{support_card.c => micro-support-card.c} (67%) delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/boot-mode.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/memconf.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/sg_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/umc_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/bcu_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/boot-mode.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c create mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/pinctrl.c => pinctrl/pinctrl-ph1-ld4.c} (97%) create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c rename arch/arm/mach-uniphier/{ph1-pro4/pinctrl.c => pinctrl/pinctrl-ph1-pro4.c} (97%) create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c rename arch/arm/mach-uniphier/{ph1-sld3/pinctrl.c => pinctrl/pinctrl-ph1-sld3.c} (91%) rename arch/arm/mach-uniphier/{ph1-sld8/pinctrl.c => pinctrl/pinctrl-ph1-sld8.c} (96%) create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-proxstream2.c create mode 100644 arch/arm/mach-uniphier/pll/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/pll_init.c => pll/pll-init-ph1-ld4.c} (90%) rename arch/arm/mach-uniphier/{ph1-pro4/pll_init.c => pll/pll-init-ph1-pro4.c} (88%) rename arch/arm/mach-uniphier/{ph1-sld3/pll_init.c => pll/pll-init-ph1-sld3.c} (62%) rename arch/arm/mach-uniphier/{ph1-sld8/pll_init.c => pll/pll-init-ph1-sld8.c} (97%) rename arch/arm/mach-uniphier/{ph1-sld3/pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c} (72%) rename arch/arm/mach-uniphier/{ph1-pro4/pll_spectrum.c => pll/pll-spectrum-ph1-sld3.c} (73%) create mode 100644 arch/arm/mach-uniphier/sbc/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/sbc_init.c => sbc/sbc-ph1-ld4.c} (92%) rename arch/arm/mach-uniphier/{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} (91%) rename arch/arm/mach-uniphier/{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} (92%) create mode 100644 arch/arm/mach-uniphier/sbc/sbc-proxstream2.c create mode 100644 arch/arm/mach-uniphier/soc_info.c delete mode 100644 arch/arm/mach-uniphier/spl.c create mode 100644 arch/arm/mach-uniphier/umc/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/umc_init.c => umc/umc-ph1-ld4.c} (88%) rename arch/arm/mach-uniphier/{ph1-pro4/umc_init.c => umc/umc-ph1-pro4.c} (85%) rename arch/arm/mach-uniphier/{ph1-sld8/umc_init.c => umc/umc-ph1-sld8.c} (87%) create mode 100644 configs/ph1_ld6b_defconfig create mode 100644 configs/ph1_pro5_defconfig -- 1.9.1

1 15

[U-Boot] [PATCH v2 00/18] ARM: uniphier: use pinctrl drivers and some cleanups
by Masahiro Yamada 23 Sep '15

23 Sep '15

Masahiro Yamada (18): pinctrl: uniphier: add UniPhier pinctrl core support pinctrl: uniphier: add UniPhier PH1-LD4 pinctrl driver pinctrl: uniphier: add UniPhier PH1-Pro4 pinctrl driver pinctrl: uniphier: add UniPhier PH1-sLD8 pinctrl driver pinctrl: uniphier: add UniPhier PH1-Pro5 pinctrl driver pinctrl: uniphier: add UniPhier ProXstream2 pinctrl driver pinctrl: uniphier: add UniPhier PH1-LD6b pinctrl driver ARM: uniphier: enable simple-bus driver for SPL ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN to bind all nodes ARM: dts: uniphier: prepare device trees to use pinctrl in SPL ARM: uniphier: enable PINCTRL and SPL_PINCTRL ARM: uniphier: drop ad-hoc early pin-muxing settings ARM: uniphier: drop ad-hoc input enable settings ARM: uniphier: drop DCC micro support card support ARM: uniphier: enable setexpr command ARM: uniphier: change the external bus address mapping ARM: uniphier: remove ifdef CONFIG_{SOC} conditionals from sg-regs.h ARM: uniphier: parse device tree to determine DRAM base and size arch/arm/dts/uniphier-ph1-ld4-ref.dts | 16 ++- arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 16 ++- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 16 ++- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 16 ++- arch/arm/mach-uniphier/Kconfig | 23 +--- arch/arm/mach-uniphier/Makefile | 3 +- arch/arm/mach-uniphier/board_common.c | 12 -- arch/arm/mach-uniphier/dram_init.c | 51 +++++++- arch/arm/mach-uniphier/include/mach/board.h | 6 +- arch/arm/mach-uniphier/include/mach/sg-regs.h | 40 +++--- arch/arm/mach-uniphier/ph1-ld4/Makefile | 7 +- arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c | 27 ---- arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S | 4 +- arch/arm/mach-uniphier/ph1-ld4/pinctrl.c | 46 +++---- arch/arm/mach-uniphier/ph1-ld4/sbc_init.c | 12 +- arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c | 49 -------- arch/arm/mach-uniphier/ph1-ld4/sg_init.c | 18 --- arch/arm/mach-uniphier/ph1-pro4/Makefile | 7 +- arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c | 26 ---- arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S | 4 +- arch/arm/mach-uniphier/ph1-pro4/pinctrl.c | 50 ++++---- arch/arm/mach-uniphier/ph1-pro4/sbc_init.c | 12 +- arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c | 42 ------- arch/arm/mach-uniphier/ph1-pro4/sg_init.c | 18 --- arch/arm/mach-uniphier/ph1-sld3/Makefile | 3 +- arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c | 12 +- arch/arm/mach-uniphier/ph1-sld3/lowlevel_debug.S | 4 +- arch/arm/mach-uniphier/ph1-sld3/pinctrl.c | 16 +-- arch/arm/mach-uniphier/ph1-sld3/sbc_init.c | 14 +-- arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.c | 37 ------ arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c | 27 ---- arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S | 4 +- arch/arm/mach-uniphier/ph1-sld8/pinctrl.c | 55 ++++---- arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c | 57 --------- arch/arm/mach-uniphier/ph1-sld8/sg_init.c | 1 - arch/arm/mach-uniphier/spl.c | 13 +- arch/arm/mach-uniphier/support_card.c | 89 ++----------- configs/ph1_ld4_defconfig | 7 +- configs/ph1_pro4_defconfig | 7 +- configs/ph1_sld3_defconfig | 3 +- configs/ph1_sld8_defconfig | 7 +- drivers/pinctrl/Kconfig | 2 + drivers/pinctrl/Makefile | 2 + drivers/pinctrl/uniphier/Kconfig | 42 +++++++ drivers/pinctrl/uniphier/Makefile | 8 ++ drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 133 ++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 133 ++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 129 +++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 144 +++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 141 +++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 140 +++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 154 +++++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 113 +++++++++++++++++ include/configs/uniphier.h | 35 ++---- 54 files changed, 1437 insertions(+), 616 deletions(-) delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/sg_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/sg_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sg_init.c create mode 100644 drivers/pinctrl/uniphier/Kconfig create mode 100644 drivers/pinctrl/uniphier/Makefile create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-proxstream2.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier.h -- 1.9.1

1 19

[U-Boot] Regression in usb-storage in u-boot 2015.04 ???
by Hans de Goede 23 Sep '15

23 Sep '15

Hi, First of all I'm not sure this is a regression, but I'm afraid I do not have time to dig deeper so I thought I should report it anyways and then others can try to reproduce it. I'm seeing the following happen when using a usb stick with a musb-new otg controller in host mode on an allwinner tablet: sunxi# usb reset resetting USB... USB0: scanning bus 0 for devices... 1 USB Device(s) found scanning usb for storage devices... error in inquiry 0 Storage Device(s) found The interesting thing is that, the first "usb start" works fine, this only happens on the second usb start (triggered through a usb reset). This may be specific to using musb on sunxi, or to the flashdrive I have but I thought I should report this anyways. Esp. since usb otherwise works fine after a usb reset, other devices (usb keyboards) continue to work, and the descriptors of the usb drive do get read correctly: sunxi# usb info 1: Mass Storage, USB Revision 2.0 - USB Flash Disk 4C0E960F - Class: (from Interface) Mass Storage - PacketSize: 64 Configurations: 1 - Vendor: 0x058f Product 0x6387 Version 1.3 Configuration: 1 - Interfaces: 1 Bus Powered 100mA Interface: 0 - Alternate Setting 0, Endpoints: 2 - Class Mass Storage, Transp. SCSI, Bulk only - Endpoint 1 Out Bulk MaxPacket 512 - Endpoint 2 In Bulk MaxPacket 512 Perhaps someone can test the reproducer on another board with usb: 1) plug in a usb drive 2) do "usb start" 3) should print that 1 storage device is found 4) do "usb reset" 5) should still print that 1 storage device is found, but for me gives the error I mentioned above. Regards, Hans

5 11

[U-Boot] [PATCH] imx-common: consider mux_ctrl_ofs when setting mux_mode
by Peng Fan 23 Sep '15

23 Sep '15

Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration. "c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings" Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode. In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Bhuvanchandra DV <bhuvanchandra.dv(a)toradex.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/imx-common/iomux-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 9b9cf58..81ec1d3 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -11,10 +11,8 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610) -#include <asm/arch/sys_proto.h> -#endif #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/sys_proto.h> static void *base = (void *)IOMUXC_BASE_ADDR; @@ -53,7 +51,11 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) } #endif - __raw_writel(mux_mode, base + mux_ctrl_ofs); + if (is_soc_type(MXC_SOC_MX7)) + __raw_writel(mux_mode, base + mux_ctrl_ofs); + else + if (mux_ctrl_ofs) + __raw_writel(mux_mode, base + mux_ctrl_ofs); if (sel_input_ofs) __raw_writel(sel_input, base + sel_input_ofs); -- 1.8.4

3 2

[U-Boot] [Patch v2 02/16] common/board_f.c: modify the macro to use get_clocks() more common
by Gong Qianyu 22 Sep '15

22 Sep '15

get_clocks() should not be limited by ESDHC. Signed-off-by: Gong Qianyu <Qianyu.Gong(a)freescale.com> --- common/board_f.c | 2 +- include/configs/BSC9132QDS.h | 1 + include/configs/MPC8308RDB.h | 1 + include/configs/MPC837XEMDS.h | 1 + include/configs/MPC837XERDB.h | 1 + include/configs/MPC8536DS.h | 1 + include/configs/MPC8569MDS.h | 1 + include/configs/P1010RDB.h | 1 + include/configs/P1022DS.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/T102xQDS.h | 1 + include/configs/T102xRDB.h | 1 + include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 1 + include/configs/T4240RDB.h | 1 + include/configs/UCP1020.h | 1 + include/configs/colibri_vf.h | 1 + include/configs/controlcenterd.h | 1 + include/configs/corenet_ds.h | 1 + include/configs/hrcon.h | 1 + include/configs/ima3-mx53.h | 1 + include/configs/ls1021aqds.h | 1 + include/configs/ls1021atwr.h | 1 + include/configs/ls2085aqds.h | 1 + include/configs/ls2085ardb.h | 1 + include/configs/m53evk.h | 1 + include/configs/mx25pdk.h | 1 + include/configs/mx35pdk.h | 1 + include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 1 + include/configs/mx53ard.h | 1 + include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 1 + include/configs/mx53smd.h | 1 + include/configs/mx6_common.h | 1 + include/configs/p1_p2_rdb_pc.h | 1 + include/configs/p1_twr.h | 1 + include/configs/usbarmory.h | 1 + include/configs/vf610twr.h | 1 + include/configs/vision2.h | 1 + include/configs/woodburn_common.h | 1 + 44 files changed, 44 insertions(+), 1 deletion(-) diff --git a/common/board_f.c b/common/board_f.c index 613332e..1bb84b3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -806,7 +806,7 @@ static init_fnc_t init_sequence_f[] = { #if defined(CONFIG_BOARD_POSTCLK_INIT) board_postclk_init, #endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_CLK get_clocks, #endif #ifdef CONFIG_M68K diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 804493e..1e42019 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -18,6 +18,7 @@ #define CONFIG_BSC9132 #endif +#define CONFIG_FSL_CLK #define CONFIG_MISC_INIT_R #ifdef CONFIG_SDCARD diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 4150d5a..f4040cd 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -11,6 +11,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK /* * High Level Configuration Options diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index cebd175..46ecada 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -10,6 +10,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK /* * High Level Configuration Options diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 5c6ad19..3216002 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -17,6 +17,7 @@ #define CONFIG_MPC837XERDB 1 #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0xFE000000 diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1312438..fe2f398 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -13,6 +13,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_36BIT diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 9e38724..fd8aa68 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -13,6 +13,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 8ac7000..bd2cd7f 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -16,6 +16,7 @@ #endif #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_P1010 #define CONFIG_E500 /* BOOKE e500 family */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 06b293f..5c8652c 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -13,6 +13,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 5468495..f86056b 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -16,6 +16,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_PPC_P2041 +#define CONFIG_FSL_CLK #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 92f51f6..94c8258 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -21,6 +21,7 @@ #define CONFIG_MP /* support multiple processors */ #define CONFIG_PHYS_64BIT #define CONFIG_ENABLE_36BIT_PHYS +#define CONFIG_FSL_CLK #ifdef CONFIG_PHYS_64BIT #define CONFIG_ADDR_MAP 1 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 324f710..640fb9f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -21,6 +21,7 @@ #define CONFIG_MP /* support multiple processors */ #define CONFIG_PHYS_64BIT #define CONFIG_ENABLE_36BIT_PHYS +#define CONFIG_FSL_CLK #ifdef CONFIG_PHYS_64BIT #define CONFIG_ADDR_MAP 1 diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 1f46160..1b190e3 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -30,6 +30,7 @@ #define CONFIG_PHYS_64BIT #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index cd5b3e2..71ea2ec 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -14,6 +14,7 @@ #define CONFIG_PHYS_64BIT #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_E500 /* BOOKE e500 family */ #include <asm/config_mpc85xx.h> diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 23ca0cf..292cbe9 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -14,6 +14,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CONFIG_FSL_CLK #define CONFIG_MMC #define CONFIG_USB_EHCI #if defined(CONFIG_PPC_T2080) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ef42b88..2cd7260 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -15,6 +15,7 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_T2080RDB #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CONFIG_FSL_CLK #define CONFIG_MMC #define CONFIG_USB_EHCI #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 4edb3cb..dd8dd73 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -12,6 +12,7 @@ #define CONFIG_T4240QDS #define CONFIG_PHYS_64BIT +#define CONFIG_FSL_CLK #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index d43f6b7..8be76f7 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -14,6 +14,7 @@ #define CONFIG_PHYS_64BIT #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 629be99..29c4ad5 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -16,6 +16,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_FSL_ELBC #define CONFIG_PCI diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 2583155..5bd742d 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -18,6 +18,7 @@ #define CONFIG_SYS_THUMB_BUILD #define CONFIG_USE_ARCH_MEMCPY #define CONFIG_USE_ARCH_MEMSET +#define CONFIG_FSL_CLK #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_ARCH_MISC_INIT diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9a1f6d0..0e3052d 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -44,6 +44,7 @@ #define CONFIG_P1022 #define CONFIG_CONTROLCENTERD #define CONFIG_MP /* support multiple processors */ +#define CONFIG_FSL_CLK #define CONFIG_SYS_GENERIC_BOARD diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 2919220..94184d7 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -12,6 +12,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #include "../board/freescale/common/ics307_clk.h" diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 558edfc..fc70d57 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -24,6 +24,7 @@ #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h index 2fa6c3d..c2a5ec3 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -17,6 +17,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 0234e32..c02cefa 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -12,6 +12,7 @@ #define CONFIG_ARMV7_PSCI #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index f561cbe..66f487d 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -12,6 +12,7 @@ #define CONFIG_ARMV7_PSCI #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h index f7f3870..4cfcf98 100644 --- a/include/configs/ls2085aqds.h +++ b/include/configs/ls2085aqds.h @@ -16,6 +16,7 @@ unsigned long get_board_sys_clk(void); unsigned long get_board_ddr_clk(void); #endif +#define CONFIG_FSL_CLK #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h index a190bc7..583fed5 100644 --- a/include/configs/ls2085ardb.h +++ b/include/configs/ls2085ardb.h @@ -18,6 +18,7 @@ unsigned long get_board_sys_clk(void); #endif +#define CONFIG_FSL_CLK #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_DDR_CLK_FREQ 133333333 #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 35058e2..4d37785 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -18,6 +18,7 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_REVISION_TAG #define CONFIG_SYS_NO_FLASH +#define CONFIG_FSL_CLK #define CONFIG_FIT diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index bd7216e..105ac6d 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -15,6 +15,7 @@ #define CONFIG_SYS_TEXT_BASE 0x81200000 #define CONFIG_MXC_GPIO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK #define CONFIG_SYS_TIMER_RATE 32768 #define CONFIG_SYS_TIMER_COUNTER \ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index c9983f3..97527b6 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -20,6 +20,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK /* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000 diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index 373cfcb..b1b83e6 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -25,6 +25,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000 #define CONFIG_SYS_ICACHE_OFF diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 2203c15..e3763c1 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -18,6 +18,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000 #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 0479195..d57e06d 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -24,6 +24,7 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 82c8af8..6cae6d5 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -24,6 +24,7 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK #define CONFIG_OF_LIBFDT diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index ad2629d..540f853 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -23,6 +23,7 @@ #define CONFIG_INITRD_TAG #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index bcdb054..0a5f50e 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -24,6 +24,7 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index ef4cb68..c157e81 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -46,6 +46,7 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK /* ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index af89e6b..9a387e1 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -12,6 +12,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e9cc274..190571a 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -12,6 +12,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #if defined(CONFIG_TWR_P1025) #define CONFIG_BOARDNAME "TWR-P1025" #define CONFIG_P1025 diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 4a7702c..6ba5086 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -14,6 +14,7 @@ #define CONFIG_MX53 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_OF_LIBFDT #define CONFIG_SYS_GENERIC_BOARD diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index c5131af..ba5bc29 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -16,6 +16,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_MACH_TYPE 4146 diff --git a/include/configs/vision2.h b/include/configs/vision2.h index b43373f..c11c2a9 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -14,6 +14,7 @@ #define CONFIG_MX51 /* in a mx51 */ #define CONFIG_SYS_TEXT_BASE 0x97800000 +#define CONFIG_FSL_CLK #include <asm/arch/imx-regs.h> diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 5d9f529..53f91c6 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -16,6 +16,7 @@ /* High Level Configuration Options */ #define CONFIG_MX35 #define CONFIG_MX35_HCLK_FREQ 24000000 +#define CONFIG_FSL_CLK #define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_CACHELINE_SIZE 32 -- 2.1.0.27.g96db324

4 6

[U-Boot] [PATCH] ubifs: Add missing macros for U-boot build
by Kevin Smith 22 Sep '15

22 Sep '15

A few debug function calls that should be macro'd out in the U-Boot build were still in. They are impossible to reach, as they are in an "if (0)" block. The optimizer figures this out, so the build succeeds with -O2. However, with -O0, the symbols remain and the link fails, because the definitions are macro'd out. This patch macros out the calls so that the build succeeds with -O0. Signed-off-by: Kevin Smith <kevin.smith(a)elecsyscorp.com> --- fs/ubifs/io.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index bdccdc4..eab3281 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -118,8 +118,10 @@ int ubifs_leb_write(struct ubifs_info *c, int lnum, const void *buf, int offs, return -EROFS; if (!dbg_is_tst_rcvry(c)) err = ubi_leb_write(c->ubi, lnum, buf, offs, len); +#ifndef __UBOOT__ else err = dbg_leb_write(c, lnum, buf, offs, len); +#endif if (err) { ubifs_err("writing %d bytes to LEB %d:%d failed, error %d", len, lnum, offs, err); @@ -138,8 +140,10 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len) return -EROFS; if (!dbg_is_tst_rcvry(c)) err = ubi_leb_change(c->ubi, lnum, buf, len); +#ifndef __UBOOT__ else err = dbg_leb_change(c, lnum, buf, len); +#endif if (err) { ubifs_err("changing %d bytes in LEB %d failed, error %d", len, lnum, err); @@ -158,8 +162,10 @@ int ubifs_leb_unmap(struct ubifs_info *c, int lnum) return -EROFS; if (!dbg_is_tst_rcvry(c)) err = ubi_leb_unmap(c->ubi, lnum); +#ifndef __UBOOT__ else err = dbg_leb_unmap(c, lnum); +#endif if (err) { ubifs_err("unmap LEB %d failed, error %d", lnum, err); ubifs_ro_mode(c, err); @@ -177,8 +183,10 @@ int ubifs_leb_map(struct ubifs_info *c, int lnum) return -EROFS; if (!dbg_is_tst_rcvry(c)) err = ubi_leb_map(c->ubi, lnum); +#ifndef __UBOOT__ else err = dbg_leb_map(c, lnum); +#endif if (err) { ubifs_err("mapping LEB %d failed, error %d", lnum, err); ubifs_ro_mode(c, err); -- 2.4.6

1 0

[U-Boot] [PATCH v3 00/16] Add more commands for VSC9953 L2 Switch
by Codrin Ciubotariu 22 Sep '15

22 Sep '15

This patch set adds several features for VSC9953 L2 Switch: - VLAN configuration; - port statistics; - FDB table operations; - enable/disable HW learning; - private/shared VLAN learning. Also, the parser needed to be changed to allow commands with optional parameters and to allow developers to easily add new commands. This set also creates a parser with generic commands for L2 Ethernet Switche drivers. Since new features are added, the default configuration had to be changed to: - HW learning enabled on all ports; (HW default) - All ports are in VLAN 1; - All ports are VLAN aware; - All ports have POP_COUNT 1; - All ports have PVID 1; - All ports have TPID 0x8100; (HW default) - All ports tag frames classified to all VLANs that are not PVID; If the user decides to compile the VSC9953 driver without the support for commands, the above default configuration should be sufficient to make the L2 Switch work in unmanaged mode. New supported commands: - show a port's statistics; - enable/disable/show learning configuration on a port; - add/delete a MAC entry in FDB; show the FDB table; - add/remove a VLAN to/from a port (VLAN members); - set/show PVID (ingress and egress VLAN tagging) for a port; - set egress tagging mod for a port; - configure VID source for egress tag; - make VLAN learning shared or private; - enable/disable VLAN ingress filtering on a port. Changes for v2: - removed Change-id field; - Added the patch that changes the License at the end of the patch set for an easier integration; Changes for v3: - added a patch that creates a parser with generic commands for Ethernet switch drivers - added a patch that adds new functions for working with bitfields; - added a patch that exports a function that verifies if a string has the format of a MAC address - added a patch to rename macros from vsc9953.h that started with "CONFIG_" - added a patch with a bug fix fdone in the Cleanup patch - all patches declare each variable on a line, without using tabs - in the parser, the MAC address is no longer remembered dynamically, but statically - the parser now returns CMD_RET_* macros instead of 1 and 0 - small code fixes Codrin Ciubotariu (16): drivers/net/vsc9953: Remove 'CONFIG_' from macros' name drivers/net/vsc9953: Cleanup patch drivers/net/vsc9953: Fix bug when enabling a port drivers/net/vsc9953: Fix missing reserved register include/bitfield: Add new bitfield operations drivers/net/vsc9953: Add default configuration for VSC9953 L2 Switch common/cmd_ethsw: Add generic commands for Ethernet Switches drivers/net/vsc9953: Use the generic Ethernet Switch parser drivers/net/vsc9953: Add command to show/clear port counters drivers/net/vsc9953: Add commands to enable/disable HW learning net/eth.c: Add function to validate a MAC address drivers/net/vsc9953: Add commands to manipulate the FDB for VSC9953 drivers/net/vsc9953: Add VLAN commands for VSC9953 drivers/net/vsc9953: Add command for shared/private VLAN learning drivers/net/vsc9953: Add commands for VLAN ingress filtering drivers/net/vsc9953: Add GPL-2.0+ SPDX-License-Identifier common/Makefile | 1 + common/cmd_ethsw.c | 1025 ++++++++++++++++++++ common/env_flags.c | 15 +- drivers/net/vsc9953.c | 2247 +++++++++++++++++++++++++++++++++++++++----- include/bitfield.h | 32 + include/configs/T104xRDB.h | 2 +- include/ethsw.h | 95 ++ include/net.h | 1 + include/vsc9953.h | 389 ++++++-- net/eth.c | 30 + 10 files changed, 3502 insertions(+), 335 deletions(-) create mode 100644 common/cmd_ethsw.c create mode 100644 include/ethsw.h -- 1.9.3

3 10

[U-Boot] [PATCH 0/5] device model bringup of hsmmc on am335x bone black and gp evm
by Mugunthan V N 22 Sep '15

22 Sep '15

This patch seires enables omap_hsmmc to adopt driver model. This has been tested on AM335x beagle bone black and GP EVM (logs [1]). Also pushed a branch for testing [2] [1]: http://pastebin.ubuntu.com/12417667/ [2]: git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git mmc-dm TODO: Gpio get is always returning zero, so I have dropped request GPIO for card detect. Even tried with non-dm gpio driver and it is broken. Also non of the TI platforms uses card detect GPIO for hsmmc in u-boot, so dropped parsing DT for card detect and write protect gpio. Card detect and write protect can be added after fixing the omap gpio driver. Mugunthan V N (5): omap_hsmmc: update struct hsmmc to accomodate base address from DT am335x_evm: mmc: do not define DM_MMC for spl drivers: mmc: omap_hsmmc: convert driver to adopt device driver model defconfig: am335x: bbb: enable ethernet driver model defconfig: am335x: gp_evm: enable ethernet driver model arch/arm/include/asm/omap_mmc.h | 3 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_gp_evm_defconfig | 1 + drivers/mmc/omap_hsmmc.c | 115 ++++++++++++++++++++++++++++++- include/configs/am335x_evm.h | 8 +++ 5 files changed, 127 insertions(+), 1 deletion(-) -- 2.6.0.rc2.10.gf4d9753

3 14

[U-Boot] Please pull u-boot-rockchip.git
by Simon Glass 22 Sep '15

22 Sep '15

Hi Tom. This doesn't break anything and makes the pinctrl behaviour correct, so it is good to get it into this release. The following changes since commit 1fb8d7933924aa5deb7e722d64c1d9fc7f0b2b82: Merge git://git.denx.de/u-boot-x86 (2015-09-17 17:00:08 -0400) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git for you to fetch changes up to 8a5f6129d1450f5ff92a55cfcfd7b96ee019e303: pinctrl: move dm_scan_fdt_node() out of pinctrl uclass (2015-09-19 15:42:15 -0600) ---------------------------------------------------------------- Masahiro Yamada (1): pinctrl: move dm_scan_fdt_node() out of pinctrl uclass drivers/pinctrl/pinctrl-uclass.c | 15 +++++++++------ drivers/pinctrl/rockchip/pinctrl_rk3288.c | 8 ++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) Regards, Simon

2 1

[U-Boot] [PATCH] arm: socfpga: dm: Fix DM initialization failure after warm reset
by Jian Luo 22 Sep '15

22 Sep '15

gd->dm_root is not cleared in SPL after warm reset. This might cause DM initilazation failure. Signed-off-by: Jian Luo <jian.luo4(a)boschrexroth.de> --- arch/arm/mach-socfpga/spl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index 13ec24b..59fe1f2 100644 --- a/arch/arm/mach-socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c @@ -181,5 +181,11 @@ void board_init_f(ulong dummy) /* Configure simple malloc base pointer into RAM. */ gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024); + /* + * gd->dm_root might contain non-zero value after warm reset. + * Clear it to avoid dm_init error + */ + gd->dm_root = NULL; + board_init_r(NULL, 0); } -- 1.9.1

3 32