KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sunxi: change bananapro DTS to use the already published patch, clean up 3.18 config of generic symbols

Browse source 
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 43922
This commit is contained in:
Zoltan Herpai 2015-01-10 19:56:30 +00:00
parent 2513eb6c19
commit 741e0fd7a1
2 changed files with 86 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
target/linux/sunxi/config-3.18
View file

@ -129,12 +129,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_UART_8250 is not set
# CONFIG_DEBUG_UART_PL01X is not set # CONFIG_DEBUG_UART_PL01X is not set
# CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_USER is not set
CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_GZIP=y
CONFIG_DECOMPRESS_LZ4=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_IOSCHED="cfq"
@ -163,7 +157,6 @@ CONFIG_FRAME_WARN=2048
CONFIG_FREEZER=y CONFIG_FREEZER=y
CONFIG_FS_MBCACHE=y CONFIG_FS_MBCACHE=y
CONFIG_FS_POSIX_ACL=y CONFIG_FS_POSIX_ACL=y
CONFIG_GARP=y
CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ALLOCATOR=y
CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS=y
@ -250,7 +243,6 @@ CONFIG_I2C_MV64XXX=y
# CONFIG_I2C_SUN6I_P2WI is not set # CONFIG_I2C_SUN6I_P2WI is not set
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_INITRAMFS_SOURCE="" CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y CONFIG_INPUT=y
# CONFIG_INPUT_AXP20X_PEK is not set # CONFIG_INPUT_AXP20X_PEK is not set
@ -260,23 +252,15 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_INTEL_SOC_PMIC is not set
CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_HELPER=y
CONFIG_IOSCHED_CFQ=y CONFIG_IOSCHED_CFQ=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
CONFIG_IP_PNP_DHCP=y
# CONFIG_IP_PNP_RARP is not set
CONFIG_IRQCHIP=y CONFIG_IRQCHIP=y
CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_FORCED_THREADING=y
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
CONFIG_JBD2=y CONFIG_JBD2=y
CONFIG_KALLSYMS=y CONFIG_KALLSYMS=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_XZ is not set
CONFIG_KERNFS=y CONFIG_KERNFS=y
# CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_GPIO is not set
CONFIG_KEYBOARD_SUN4I_LRADC=y CONFIG_KEYBOARD_SUN4I_LRADC=y
@ -390,12 +374,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_RCU_BOOST is not set # CONFIG_RCU_BOOST is not set
CONFIG_RCU_CPU_STALL_VERBOSE=y CONFIG_RCU_CPU_STALL_VERBOSE=y
CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_STALL_COMMON=y
CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y
CONFIG_RD_LZ4=y
CONFIG_RD_LZMA=y
CONFIG_RD_LZO=y
CONFIG_RD_XZ=y
CONFIG_REGMAP=y CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_IRQ=y CONFIG_REGMAP_IRQ=y
@ -417,6 +395,7 @@ CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_SCHED_HRTICK=y CONFIG_SCHED_HRTICK=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SDIO_UART=y CONFIG_SDIO_UART=y
# CONFIG_SECCOMP is not set
CONFIG_SECURITYFS=y CONFIG_SECURITYFS=y
# CONFIG_SENSORS_PWM_FAN is not set # CONFIG_SENSORS_PWM_FAN is not set
CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_DW=y
@ -456,24 +435,10 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
# CONFIG_TCP_CONG_ADVANCED is not set
# CONFIG_THUMB2_KERNEL is not set # CONFIG_THUMB2_KERNEL is not set
CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
# CONFIG_TOUCHSCREEN_BU21013 is not set
# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
# CONFIG_TOUCHSCREEN_DYNAPRO is not set
# CONFIG_TOUCHSCREEN_EGALAX is not set
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_PIXCIR is not set
# CONFIG_TOUCHSCREEN_ST1232 is not set
CONFIG_TOUCHSCREEN_SUN4I=y CONFIG_TOUCHSCREEN_SUN4I=y
# CONFIG_TOUCHSCREEN_TSC2005 is not set
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
CONFIG_TREE_PREEMPT_RCU=y CONFIG_TREE_PREEMPT_RCU=y
CONFIG_UEVENT_HELPER_PATH="" CONFIG_UEVENT_HELPER_PATH=""
CONFIG_UID16=y CONFIG_UID16=y
@ -496,7 +461,6 @@ CONFIG_UTS_NS=y
CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VFP=y CONFIG_VFP=y
CONFIG_VFPv3=y CONFIG_VFPv3=y
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_VT=y CONFIG_VT=y
CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE=y
@ -509,10 +473,6 @@ CONFIG_XPS=y
CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARMTHUMB=y
CONFIG_XZ_DEC_BCJ=y CONFIG_XZ_DEC_BCJ=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_X86=y
CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_BSS=0
CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_INFLATE=y

121
target/linux/sunxi/patches-3.18/301-add-bananapro.diff → target/linux/sunxi/patches-3.18/301-dt-sun7i-add-bananapro.patch
View file

@ -1,38 +1,58 @@
diff -ruN old/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile From 3613d535a77270eaf15a5f988a48434c7d1530f2 Mon Sep 17 00:00:00 2001
--- old/arch/arm/boot/dts/Makefile 2015-01-06 09:29:23.612462619 +0100 From: Hans de Goede <hdegoede@redhat.com>
+++ new/arch/arm/boot/dts/Makefile 2015-01-06 09:29:36.316254352 +0100 Date: Wed, 7 Jan 2015 20:44:52 +0100
@@ -436,6 +436,7 @@ Subject: [PATCH] ARM: dts: sun7i: Add dts file for Bananapro board
sun6i-a31-m9.dtb
Add support for the new Bananapro A20 development board from lemaker.org.
This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
3.5 mm jack for a/v out, on board microphone, 40 gpio pins and sdio wifi.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 261 ++++++++++++++++++++++++++++++
2 files changed, 262 insertions(+)
create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapro.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 40d2901..b3dcf3f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -466,6 +466,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
sun6i-a31s-cs908.dtb
dtb-$(CONFIG_MACH_SUN7I) += \ dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi.dtb \
+ sun7i-a20-bananapro.dtb \ + sun7i-a20-bananapro.dtb \
sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubieboard2.dtb \
sun7i-a20-cubietruck.dtb \ sun7i-a20-cubietruck.dtb \
sun7i-a20-hummingbird.dtb \ sun7i-a20-hummingbird.dtb \
diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/sun7i-a20-bananapro.dts diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
--- old/arch/arm/boot/dts/sun7i-a20-bananapro.dts 1970-01-01 01:00:00.000000000 +0100 new file mode 100644
+++ new/arch/arm/boot/dts/sun7i-a20-bananapro.dts 2015-01-06 09:31:18.290582574 +0100 index 0000000..3b4764d
@@ -0,0 +1,232 @@ --- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -0,0 +1,261 @@
+/* +/*
+ * Copyright 2014 Zoltan HERPAI <wigyori@uid0.hu> + * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
+ * + *
+ * This file is dual-licensed: you can use it either under the terms + * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual + * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a + * licensing only applies to this file, and not this project as a
+ * whole. + * whole.
+ * + *
+ * a) This library is free software; you can redistribute it and/or + * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as + * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the + * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version. + * License, or (at your option) any later version.
+ * + *
+ * This library is distributed in the hope that it will be useful, + * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details. + * GNU General Public License for more details.
+ * + *
+ * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free + * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA + * MA 02110-1301 USA
+ * + *
@ -77,7 +97,7 @@ diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/su
+ +
+ mmc0: mmc@01c0f000 { + mmc0: mmc@01c0f000 {
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
+ vmmc-supply = <&reg_vcc3v3>; + vmmc-supply = <&reg_vcc3v3>;
+ bus-width = <4>; + bus-width = <4>;
+ cd-gpios = <&pio 7 10 0>; /* PH10 */ + cd-gpios = <&pio 7 10 0>; /* PH10 */
@ -86,23 +106,12 @@ diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/su
+ }; + };
+ +
+ mmc3: mmc@01c12000 { + mmc3: mmc@01c12000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&mmc3_pins_a> + pinctrl-0 = <&mmc3_pins_a>;
+ vmmc-supply = <&reg_vmmc3>; + vmmc-supply = <&reg_vmmc3>;
+ bus-width = <4>; + bus-width = <4>;
+ non-removable; + non-removable;
+ status = "okay"; + status = "okay";
+
+ brcmf: bcrmf@1 {
+ reg = <1>;
+ ccompatible = "brcm,bcm4329-fmac";
+ interrupt-parent = <&pio>;
+ interrupts = <10 8>; /* PH10 / EINT10 * taken from https://github.com/Bananian/fex/blob/master/BananaPro/BananaPro.fex.otg-off */
+ interrupt-names = "host-wake";
+ };
+ }; + };
+ +
+ usbphy: phy@01c13400 { + usbphy: phy@01c13400 {
@ -132,22 +141,43 @@ diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/su
+ }; + };
+ +
+ pinctrl@01c20800 { + pinctrl@01c20800 {
+ mmc0_cd_pin_bananapro: mmc0_cd_pin@0 { + usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
+ allwinner,pins = "PH0";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
+ usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
+ allwinner,pins = "PH1";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
+ mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
+ allwinner,pins = "PH10"; + allwinner,pins = "PH10";
+ allwinner,function = "gpio_in"; + allwinner,function = "gpio_in";
+ allwinner,drive = <0>; + allwinner,drive = <0>;
+ allwinner,pull = <1>; + allwinner,pull = <1>;
+ }; + };
+ +
+ gmac_power_pin_bananapro: gmac_power_pin@0 { + vmmc3_pin_bananapro: vmmc3_pin@0 {
+ allwinner,pins = "PH22";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
+ gmac_power_pin_bananapi: gmac_power_pin@0 {
+ allwinner,pins = "PH23"; + allwinner,pins = "PH23";
+ allwinner,function = "gpio_out"; + allwinner,function = "gpio_out";
+ allwinner,drive = <0>; + allwinner,drive = <0>;
+ allwinner,pull = <0>; + allwinner,pull = <0>;
+ }; + };
+ +
+ led_pins_bananapro: led_pins@0 { + led_pins_bananapi: led_pins@0 {
+ allwinner,pins = "PH24"; + allwinner,pins = "PH24", "PG2";
+ allwinner,function = "gpio_out"; + allwinner,function = "gpio_out";
+ allwinner,drive = <0>; + allwinner,drive = <0>;
+ allwinner,pull = <0>; + allwinner,pull = <0>;
@ -166,9 +196,9 @@ diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/su
+ status = "okay"; + status = "okay";
+ }; + };
+ +
+ uart3: serial@01c28c00 { + uart2: serial@01c28800 {
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&uart3_pins_b>; + pinctrl-0 = <&uart2_pins_a>;
+ status = "okay"; + status = "okay";
+ }; + };
+ +
@ -217,31 +247,50 @@ diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/su
+ leds { + leds {
+ compatible = "gpio-leds"; + compatible = "gpio-leds";
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&led_pins_bananapro>; + pinctrl-0 = <&led_pins_bananapi>;
+ +
+ green { + green {
+ label = "bananapro:green:usr"; + label = "bananapi:green:usr";
+ gpios = <&pio 7 24 0>; + gpios = <&pio 7 24 0>;
+ }; + };
+ blue {
+ label = "bananapi:blue:usr";
+ gpios = <&pio 6 2 0>;
+ };
+ }; + };
+ +
+ reg_usb1_vbus: usb1-vbus { + reg_usb1_vbus: usb1-vbus {
+ pinctrl-0 = <&usb1_vbus_pin_bananapro>;
+ gpio = <&pio 7 0 0>; /* PH0 */
+ status = "okay"; + status = "okay";
+ }; + };
+ +
+ reg_usb2_vbus: usb2-vbus { + reg_usb2_vbus: usb2-vbus {
+ pinctrl-0 = <&usb2_vbus_pin_bananapro>;
+ gpio = <&pio 7 1 0>; /* PH1 */
+ status = "okay"; + status = "okay";
+ }; + };
+ +
+ reg_gmac_3v3: gmac-3v3 { + reg_gmac_3v3: gmac-3v3 {
+ compatible = "regulator-fixed"; + compatible = "regulator-fixed";
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&gmac_power_pin_bananapro>; + pinctrl-0 = <&gmac_power_pin_bananapi>;
+ regulator-name = "gmac-3v3"; + regulator-name = "gmac-3v3";
+ regulator-min-microvolt = <3300000>; + regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <3300000>;
+ startup-delay-us = <50000>; + startup-delay-us = <100000>;
+ enable-active-high; + enable-active-high;
+ gpio = <&pio 7 23 0>; + gpio = <&pio 7 23 0>;
+ }; + };
+
+ reg_vmmc3: vmmc3 {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&vmmc3_pin_bananapro>;
+ regulator-name = "vmmc3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ enable-active-high;
+ gpio = <&pio 7 22 0>;
+ };
+}; +};