From c66b0c67b42c7cca785fc39c93fcb52e07022ce3 Mon Sep 17 00:00:00 2001 From: Zhou Wang Date: Wed, 25 Mar 2015 14:57:44 +0800 Subject: [PATCH 1/2] ARM: hip04: add GPIO configure in hisi_defconfig The GPIO controller of Hisilicon hip04 Soc uses the IP from Sysnopsis, gpio-dwapb.c can be reused to support this GPIO controller. This patch adds related configure item in hisi_defconfig. Acked-by: Linus Walleij Signed-off-by: Zhou Wang Signed-off-by: Wei Xu --- arch/arm/configs/hisi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig index c34da5878b6c..e7bf486eaa9f 100644 --- a/arch/arm/configs/hisi_defconfig +++ b/arch/arm/configs/hisi_defconfig @@ -51,6 +51,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_REGULATOR_GPIO=y +CONFIG_GPIO_DWAPB=y CONFIG_MFD_SYSCON=y CONFIG_POWER_RESET_SYSCON=y CONFIG_DRM=y From ecda6547d7e4410c00168abae56d6fa4271d0a7e Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Fri, 10 Apr 2015 10:16:20 +0300 Subject: [PATCH 2/2] ARM: defconfig: hisi: enable HiSilicon hip04 ethernet controller Signed-off-by: Fathi Boudra Signed-off-by: Wei Xu --- arch/arm/configs/hisi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig index e7bf486eaa9f..5997dbc69822 100644 --- a/arch/arm/configs/hisi_defconfig +++ b/arch/arm/configs/hisi_defconfig @@ -33,6 +33,7 @@ CONFIG_ATA=y CONFIG_SATA_AHCI_PLATFORM=y CONFIG_NETDEVICES=y CONFIG_HIX5HD2_GMAC=y +CONFIG_HIP04_ETH=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y CONFIG_SERIAL_8250_CONSOLE=y