cosmetic: rockchip: sort socs according to numbers

Having some sort of ordering proofed helpful in a lot of other places
already. So for a larger number of rockchip socs it might be helpful
as well instead of an ever increasing unsorted list.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Acked-by: Simon Glass <sjg@chromium.org>
master
Heiko Stübner 8 years ago committed by Simon Glass
parent 23c3042b10
commit 041cdb5f3d
  1. 20
      arch/arm/mach-rockchip/Kconfig
  2. 4
      arch/arm/mach-rockchip/Makefile
  3. 16
      drivers/pinctrl/Kconfig
  4. 2
      drivers/pinctrl/rockchip/Makefile

@ -1,5 +1,14 @@
if ARCH_ROCKCHIP if ARCH_ROCKCHIP
config ROCKCHIP_RK3036
bool "Support Rockchip RK3036"
select CPU_V7
help
The Rockchip RK3036 is a ARM-based SoC with a dual-core Cortex-A7
including NEON and GPU, Mali-400 graphics, several DDR3 options
and video codec support. Peripherals include Gigabit Ethernet,
USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
config ROCKCHIP_RK3288 config ROCKCHIP_RK3288
bool "Support Rockchip RK3288" bool "Support Rockchip RK3288"
select CPU_V7 select CPU_V7
@ -10,15 +19,6 @@ config ROCKCHIP_RK3288
and video codec support. Peripherals include Gigabit Ethernet, and video codec support. Peripherals include Gigabit Ethernet,
USB2 host and OTG, SDIO, I2S, UART,s, SPI, I2C and PWMs. USB2 host and OTG, SDIO, I2S, UART,s, SPI, I2C and PWMs.
config ROCKCHIP_RK3036
bool "Support Rockchip RK3036"
select CPU_V7
help
The Rockchip RK3036 is a ARM-based SoC with a dual-core Cortex-A7
including NEON and GPU, Mali-400 graphics, several DDR3 options
and video codec support. Peripherals include Gigabit Ethernet,
USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
config ROCKCHIP_SPL_BACK_TO_BROM config ROCKCHIP_SPL_BACK_TO_BROM
bool "SPL returns to bootrom" bool "SPL returns to bootrom"
default y if ROCKCHIP_RK3036 default y if ROCKCHIP_RK3036
@ -27,6 +27,6 @@ config ROCKCHIP_SPL_BACK_TO_BROM
SPL will return to the boot rom, which will then load the U-Boot SPL will return to the boot rom, which will then load the U-Boot
binary to keep going on. binary to keep going on.
source "arch/arm/mach-rockchip/rk3288/Kconfig"
source "arch/arm/mach-rockchip/rk3036/Kconfig" source "arch/arm/mach-rockchip/rk3036/Kconfig"
source "arch/arm/mach-rockchip/rk3288/Kconfig"
endif endif

@ -5,8 +5,8 @@
# #
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o
else else
obj-$(CONFIG_ROCKCHIP_RK3288) += board.o obj-$(CONFIG_ROCKCHIP_RK3288) += board.o
@ -14,5 +14,5 @@ endif
ifndef CONFIG_ARM64 ifndef CONFIG_ARM64
obj-y += rk_timer.o obj-y += rk_timer.o
endif endif
obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288/
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288/

@ -123,21 +123,21 @@ config QCA953X_PINCTRL
both the GPIO definitions and pin control functions for each both the GPIO definitions and pin control functions for each
available multiplex function. available multiplex function.
config ROCKCHIP_RK3288_PINCTRL config ROCKCHIP_RK3036_PINCTRL
bool "Rockchip pin control driver" bool "Rockchip rk3036 pin control driver"
depends on DM depends on DM
help help
Support pin multiplexing control on Rockchip rk3288 SoCs. The driver Support pin multiplexing control on Rockchip rk3036 SoCs. The driver is
is controlled by a device tree node which contains both the GPIO controlled by a device tree node which contains both the GPIO
definitions and pin control functions for each available multiplex definitions and pin control functions for each available multiplex
function. function.
config ROCKCHIP_RK3036_PINCTRL config ROCKCHIP_RK3288_PINCTRL
bool "Rockchip rk3036 pin control driver" bool "Rockchip pin control driver"
depends on DM depends on DM
help help
Support pin multiplexing control on Rockchip rk3036 SoCs. The driver is Support pin multiplexing control on Rockchip rk3288 SoCs. The driver
controlled by a device tree node which contains both the GPIO is controlled by a device tree node which contains both the GPIO
definitions and pin control functions for each available multiplex definitions and pin control functions for each available multiplex
function. function.

@ -5,5 +5,5 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o
obj-$(CONFIG_ROCKCHIP_RK3036_PINCTRL) += pinctrl_rk3036.o obj-$(CONFIG_ROCKCHIP_RK3036_PINCTRL) += pinctrl_rk3036.o
obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o

Loading…
Cancel
Save