From patchwork Wed Jul 12 19:44:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 787413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x78Y80MvRz9s06 for ; Thu, 13 Jul 2017 05:44:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="Ta/CsnMc"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 315FF89C91; Wed, 12 Jul 2017 19:44:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WlakC0wWSoSN; Wed, 12 Jul 2017 19:44:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 42FD889CD6; Wed, 12 Jul 2017 19:44:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2252F1C121F for ; Wed, 12 Jul 2017 19:44:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1D07526519 for ; Wed, 12 Jul 2017 19:44:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NKoKBYjjcYkO for ; Wed, 12 Jul 2017 19:44:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by silver.osuosl.org (Postfix) with ESMTPS id 4174226129 for ; Wed, 12 Jul 2017 19:44:38 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3x78Xz4lMLz104L for ; Wed, 12 Jul 2017 21:44:35 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1499888674; x=1500493475; bh=chPJpargN9KYMDZATVQAYeXZ/ZmubK6nA14o451h2hI=; b=Ta/CsnMcsyZp eoTrwQmkI1k2qGSrBANDD/+Mfpv62pNTpWIpTS65AHpMvihd/rCf8EbKBSaIOgBS qjffVhQWKmJGb8PPk1xyWENHI2YRD4eqvXf+l5BdeLVqTzok8ZHW0TpszGmF2fK/ hZkvAGr76TnM0mkEDpD/Qad/oD5ZyV6os0oF0xEXJb4YrgRL9B2t/22pM2MEFgx8 Ud3HyDRHcj8hfIsFdt/g5aVvg3Mo1RCs9rrYAIbz+yV2DJHlqh9pO1aY5DaP0ncI BW4EZ91uR1r7pjxztJsvk9rY2HENiZNmZOwUiYE83sF51/vOtI3fXkKd3gliOAZO tccEQ/xSMA== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QcfiLdCv9ugY; Wed, 12 Jul 2017 21:44:34 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-87-60.dynamic.qsc.de [92.195.87.60]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 12 Jul 2017 21:44:34 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Wed, 12 Jul 2017 21:44:31 +0200 Message-Id: <20170712194432.21975-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.13.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] configs/bananapro: bump Linux kernel to 4.12.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop the board specific patches which has been applied upstream. Signed-off-by: Jörg Krause --- ...ts-sun7i-Enable-audio-codec-on-Banana-Pro.patch | 35 --------- ...-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch | 85 ---------------------- configs/bananapro_defconfig | 6 +- 3 files changed, 3 insertions(+), 123 deletions(-) delete mode 100644 board/lemaker/bananapro/patches/linux/0001-ARM-dts-sun7i-Enable-audio-codec-on-Banana-Pro.patch delete mode 100644 board/lemaker/bananapro/patches/linux/0002-ARM-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch diff --git a/board/lemaker/bananapro/patches/linux/0001-ARM-dts-sun7i-Enable-audio-codec-on-Banana-Pro.patch b/board/lemaker/bananapro/patches/linux/0001-ARM-dts-sun7i-Enable-audio-codec-on-Banana-Pro.patch deleted file mode 100644 index 8552daafc4..0000000000 --- a/board/lemaker/bananapro/patches/linux/0001-ARM-dts-sun7i-Enable-audio-codec-on-Banana-Pro.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1647fe31882a105cef4c99770e4ec8ea47c5c653 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 4 Jan 2017 15:22:50 +0100 -Subject: [PATCH 1/1] ARM: dts: sun7i: Enable audio codec on Banana Pro -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This commit enables the on-chip audio codec present on the A20 SoC -on the Banana Pro board. - -Signed-off-by: Jörg Krause -Signed-off-by: Maxime Ripard ---- - arch/arm/boot/dts/sun7i-a20-bananapro.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts -index 19d63d4049de..03799c647e13 100644 ---- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts -+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts -@@ -104,6 +104,10 @@ - status = "okay"; - }; - -+&codec { -+ status = "okay"; -+}; -+ - &ehci0 { - status = "okay"; - }; --- -2.11.0 - diff --git a/board/lemaker/bananapro/patches/linux/0002-ARM-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch b/board/lemaker/bananapro/patches/linux/0002-ARM-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch deleted file mode 100644 index 7d514a808c..0000000000 --- a/board/lemaker/bananapro/patches/linux/0002-ARM-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch +++ /dev/null @@ -1,85 +0,0 @@ -From f2cb904f074bc7e90be475488872a82270e9bae7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 9 Jan 2017 21:36:38 +0100 -Subject: [PATCH 2/2] ARM: dts: sun7i: Add wifi dt node on Banana Pro -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The Banana Pro has an AMPAK AP6181 WiFi+Bluetooth module. The WiFi part -is a BCM43362 IC connected to MMC3 of the A20 SoC via SDIO. The IC also -takes a power enable signal via GPIO. - -This commit adds a device-tree node to power it up, so the mmc subsys -can scan it, and enables the mmc controller which is connected to it. - -As the wifi enable pin of the AP6181 module is not really a regulator, -switch the mmc3 node to the mmc-pwrseq framework for controlling it. -This more accurately reflectes how the hardware actually works. - -Signed-off-by: Jörg Krause -Signed-off-by: Maxime Ripard ---- - arch/arm/boot/dts/sun7i-a20-bananapro.dts | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) - -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts -index 03799c647e13..83516bc81225 100644 ---- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts -+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts -@@ -76,6 +76,13 @@ - }; - }; - -+ wifi_pwrseq: wifi-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vmmc3_pin_bananapro>; -+ reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; -+ }; -+ - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; -@@ -87,17 +94,6 @@ - enable-active-high; - gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; - }; -- -- 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 GPIO_ACTIVE_HIGH>; -- }; - }; - - &ahci { -@@ -170,10 +166,19 @@ - &mmc3 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc3_pins_a>; -- vmmc-supply = <®_vmmc3>; -+ vmmc-supply = <®_vcc3v3>; -+ mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; -+ -+ brcmf: bcrmf@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&pio>; -+ interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -+ interrupt-names = "host-wake"; -+ }; - }; - - &ohci0 { --- -2.11.0 - diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig index 0e6e230df0..5b93823af5 100644 --- a/configs/bananapro_defconfig +++ b/configs/bananapro_defconfig @@ -4,8 +4,8 @@ BR2_cortex_a7=y BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y +# Linux headers same as kernel, a 4.12 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y # Toolchain BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -25,7 +25,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.1" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment"