openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: HIP04: configure updates for 4.2 

- Enable ethernet on hip04 SoC
 - Enable Sysnopsis GPIO controller on hip04 SoC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVTT/8AAoJEAvIV27ZiWZckBAP+weYL2i9+d/cbWJboP85elEj
 LaJmoPFWtsLuH+Bmw+J5tx0KIAQhDdY+I/PgJFulT2oY+stroDmAyRtty2kNkbGk
 RG5ZYkJwDIq7eUleDb8Gahog+gvLvFaCL8lU2jKM1HRCauNS25pvx/Q8yaesW6FO
 bbRnHQGm366kJ2gK7MBw3tcVHJzOc2Jv3vznsbRnwFEv/IItEy1n6yJdCbZqbcy0
 VR2ywc0WLN1KIMLx5S57lLiYoQTD74ZVKb9nNVIFtTSULoFLI+CMggEvasNTYare
 cnmesgzQqALl4MlefeN/U8mU+eDbAvml2ti2jOmp+n4by+DjdSkasBfbpqwfJ88J
 I0sOEaOMBIzJRFG2rbOWKpyquQWIXdVHfunBNxWRc0F/ZaavK2RnodOhMJc9/0hm
 LMixxNg2/p81nPT31FqNugTiz4vL7sabstGoGNS3VpfowVj4m0F9A6ZI4tQT8qFz
 idtc+SyBt20iaNwBE01LfWrWyXw43likZQZ7ViMFRQ9GcURxUCQxzV045hzpoz71
 B97CvswCv9a+HKZTKGCG/a7tW0K3GqSECsHr/hYAsnsoZwNdzHARFZTzWntLk6MA
 if/We2lINRDhBoUISFzzUCXVtFtrFKnwEsjVwPWXJF2Vh9iBiiY3FnGpqPNZPLCt
 MALfkwiUpQvqF1BUCLx9
 =llJG
 -----END PGP SIGNATURE-----

Merge tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi into next/defconfig

Merge "ARM: HIP04: configure updates for 4.2" from Wei Xu:

- Enable ethernet on hip04 SoC
- Enable Sysnopsis GPIO controller on hip04 SoC

* tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi:
  ARM: defconfig: hisi: enable HiSilicon hip04 ethernet controller
  ARM: hip04: add GPIO configure in hisi_defconfig
This commit is contained in:
Arnd Bergmann 2015-05-12 17:03:34 +02:00
parent 1a7f4473dd ecda6547d7
commit 3ef9866f2d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/hisi_defconfig
View File

@ -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
@ -51,6 +52,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