
The following changes since commit b06c46de632c55f4c39d404c6f0f65e414b31050:
Merge tag 'xilinx-for-v2018.01' of git://www.denx.de/git/u-boot-microblaze (2017-11-29 08:26:07 -0500)
are available in the Git repository at:
git://git.denx.de/u-boot-sh.git rmobile-mx
for you to fetch changes up to ab61e175713a0400c6ece6348e8f655998cf574d:
ARM: rmobile: Rework the ULCB CPLD driver (2017-11-30 08:54:18 +0100)
---------------------------------------------------------------- Marek Vasut (34): MAINTAINERS: Add myself as RCar/RMobile comaintainer fdtdec: Support parsing multiple /memory nodes clk: rmobile: Move preboot clock shutdown to the driver clk: rmobile: Add R8A7796 xHCI clock serial: sh: Unify R8A7795 and R8A7796 as Gen3 i2c: rcar_iic: Add RCar IIC driver net: ravb: Fix reset GPIO handling ARM: rmobile: Fix eMMC signal voltage on ULCB ARM: rmobile: Enable Micrel KSZ90x1 PHY driver on ULCB ARM: rmobile: Drop CONFIG_USB_MAX_CONTROLLER_COUNT on Gen3 boards ARM: rmobile: Drop SDHI address macros from Gen3 ARM: rmobile: Remove CONFIG_CMD_SDRAM from Salvator-X ARM: rmobile: Clean up GIC macros ARM: rmobile: Enable xHCI on RCar Gen3 boards ARM: rmobile: Zap Gen3 PFC tables ARM: rmobile: Stop using rcar-common/common.c on Gen3 ARM: rmobile: Dispose of r8a779x.h for Gen3 ARM: rmobile: Add PRR CPU ID macros ARM: rmobile: Unify memory map for RCar Gen3 ARM: rmobile: Unify R8A7795 and R8A7796 in rmobile Makefile ARM: rmobile: Drop CPU type ifdef from salvator-x ARM: rmobile: Zap checkboard on Gen3 ARM: rmobile: Zap rmobile_sysinfo on Gen3 ARM: rmobile: Configure DRAM sizes from DT ARM: rmobile: Zap ad-hoc DRAM configuration macros
ARM: rmobile: Clean up ad-hoc clock macros
ARM: rmobile: Remove SCIF configs
ARM: rmobile: Convert PRR to DM and OF control
ARM: rmobile: Use PRR driver on all Gen3 boards
ARM: rmobile: Migrate boards to RCar IIC drivers
pinctrl: rmobile: Add support for setting single pins
pfc: rmobile: Add hook to configure pin as GPIO
gpio: rmobile: Set GPIO mode in GPSR when requested
ARM: rmobile: Rework the ULCB CPLD driver
MAINTAINERS | 1 +
arch/arm/dts/r8a7795.dtsi | 1 +
arch/arm/dts/r8a7796.dtsi | 1 +
arch/arm/dts/ulcb.dtsi | 15 +-
arch/arm/mach-rmobile/Makefile | 3 +- arch/arm/mach-rmobile/board.c | 2 + arch/arm/mach-rmobile/cpu_info-rcar.c | 61 +- arch/arm/mach-rmobile/cpu_info.c | 21 +- arch/arm/mach-rmobile/include/mach/gpio.h | 6 - arch/arm/mach-rmobile/include/mach/r8a7795-gpio.h | 1016 -------------------------- arch/arm/mach-rmobile/include/mach/r8a7795.h | 36 - arch/arm/mach-rmobile/include/mach/r8a7796-gpio.h | 1084 ---------------------------- arch/arm/mach-rmobile/include/mach/r8a7796.h | 36 - arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h | 6 - arch/arm/mach-rmobile/include/mach/rmobile.h | 18 +- arch/arm/mach-rmobile/memmap-gen3.c | 66 ++ arch/arm/mach-rmobile/memmap-r8a7795.c | 30 - arch/arm/mach-rmobile/memmap-r8a7796.c | 30 - arch/arm/mach-rmobile/pfc-r8a7795.c | 5005 ------------------------------------------------------------------------------------------------------------------------------- arch/arm/mach-rmobile/pfc-r8a7796.c | 5253 -------------------------------------------------------------------------------------------------------------------------------------- board/renesas/salvator-x/Makefile | 2 +- board/renesas/salvator-x/salvator-x.c | 48 +- board/renesas/ulcb/Makefile | 2 +- board/renesas/ulcb/cpld.c | 212 +++--- board/renesas/ulcb/ulcb.c | 32 +- configs/r8a7795_salvator-x_defconfig | 7 +- configs/r8a7795_ulcb_defconfig | 9 + configs/r8a7796_salvator-x_defconfig | 7 +- configs/r8a7796_ulcb_defconfig | 9 + drivers/clk/renesas/clk-rcar-gen3.c | 60 ++ drivers/gpio/gpio-rcar.c | 20 +- drivers/i2c/Kconfig | 6 + drivers/i2c/Makefile | 1 + drivers/i2c/rcar_iic.c | 271 +++++++ drivers/net/ravb.c | 7 +- drivers/pinctrl/renesas/pfc.c | 60 ++ drivers/pinctrl/renesas/sh_pfc.h | 1 + drivers/serial/serial_sh.h | 3 +- include/configs/rcar-gen3-common.h | 29 +- include/configs/salvator-x.h | 54 +- include/configs/ulcb.h | 76 +- lib/fdtdec.c | 24 +- scripts/config_whitelist.txt | 3 - 43 files changed, 787 insertions(+), 12847 deletions(-) delete mode 100644 arch/arm/mach-rmobile/include/mach/r8a7795-gpio.h delete mode 100644 arch/arm/mach-rmobile/include/mach/r8a7795.h delete mode 100644 arch/arm/mach-rmobile/include/mach/r8a7796-gpio.h delete mode 100644 arch/arm/mach-rmobile/include/mach/r8a7796.h create mode 100644 arch/arm/mach-rmobile/memmap-gen3.c delete mode 100644 arch/arm/mach-rmobile/memmap-r8a7795.c delete mode 100644 arch/arm/mach-rmobile/memmap-r8a7796.c delete mode 100644 arch/arm/mach-rmobile/pfc-r8a7795.c delete mode 100644 arch/arm/mach-rmobile/pfc-r8a7796.c create mode 100644 drivers/i2c/rcar_iic.c