linux-imx (3.0.35): Remove wandboard from recipe

With the addition of the linux-wandboard recipe, we remove wandboard
support from the linux-imx recipes in order to prevent confusion and keep
all Wandboard effort focused on the 'official' Wandboard kernel.

Signed-off-by: John Weber <rjohnweber@gmail.com>
This commit is contained in:
John Weber 2013-04-04 03:32:03 +00:00 committed by Otavio Salvador
parent 4069eb0b45
commit 29ab3a55d7
7 changed files with 1 additions and 221310 deletions

View File

@ -1,52 +0,0 @@
From ea530483ad42e5b9a89934fbdfd57df81b3a90ab Mon Sep 17 00:00:00 2001
From: John Weber <rjohnweber@gmail.com>
Date: Fri, 15 Mar 2013 08:43:15 -0500
Subject: [PATCH] wandboard: fix sdhc platform data
Fixes sdhc platfrom data structure to solve a problem when loading
the firmware files for the on-board Wifi module on Wandboard-dual.
This problem only occured when udev is tasked with loading firmware
from the filesystem.
Upstream-Status: Pending
Signed-off-by: John Weber <rjohnweber@gmail.com>
---
arch/arm/mach-mx6/board-wand.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c
index 7f972eb..7be6726 100644
--- a/arch/arm/mach-mx6/board-wand.c
+++ b/arch/arm/mach-mx6/board-wand.c
@@ -184,13 +184,17 @@ static const struct esdhc_platform_data wand_sd_data[3] = {
.cd_gpio = WAND_SD1_CD,
.wp_gpio =-EINVAL,
.keep_power_at_suspend = 1,
.support_8bit = 0,
+ .delay_line = 0,
.platform_pad_change = plt_sd_pad_change,
+ .cd_type = ESDHC_CD_CONTROLLER,
}, {
- .cd_gpio =-EINVAL,
- .wp_gpio =-EINVAL,
.keep_power_at_suspend = 1,
.platform_pad_change = plt_sd_pad_change,
+ .always_present = 1,
+ .support_8bit = 0,
+ .delay_line = 0,
+ .cd_type = ESDHC_CD_PERMANENT,
}, {
.cd_gpio = WAND_SD3_CD,
.wp_gpio = WAND_SD3_WP,
@@ -198,6 +202,7 @@ static const struct esdhc_platform_data wand_sd_data[3] = {
.support_8bit = 0,
.delay_line = 0,
.platform_pad_change = plt_sd_pad_change,
+ .cd_type = ESDHC_CD_CONTROLLER,
}
};
--
1.7.9.5

View File

@ -1,86 +0,0 @@
From 725293d858a76d871b949f460b179a0fe4a8cc1c Mon Sep 17 00:00:00 2001
From: John Weber <rjohnweber@gmail.com>
Date: Mon, 25 Mar 2013 08:43:04 -0500
Subject: modifications for fsl 3.0.0 and add header
Freescale kernel 3.0.35, rev 3.0.0 requires that mx6_cpu_regulator_init()
be called within the board init function. Not doing so results in
unrecoverable kernel errors during kernel initialization in calls to
regulator_set_voltage(). Calls to this function seem to be removed
in rev 1.1.0 and later versions of the FSL kernel.
In addition, add the header to the file giving the original authors credit.
Include 'cpu_op-mx6.h' because this was commented out for some reason.
Upstream-Status: Pending
Signed-off-by: John Weber <rjohnweber@gmail.com>
---
arch/arm/mach-mx6/board-wand.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c
index 7d2d45b..8b3029e 100644
--- a/arch/arm/mach-mx6/board-wand.c
+++ b/arch/arm/mach-mx6/board-wand.c
@@ -1,3 +1,21 @@
+/*
+ Wandboard board file. Copyright (C) 2013 Tapani Utriainen
+ Authors: Tapani Utriainen, Edward Lin
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -22,7 +40,10 @@
#include "crm_regs.h"
#include "devices-imx6q.h"
#include "usb.h"
-//#include "cpu_op-mx6.h"
+#include "cpu_op-mx6.h"
+
+extern char *soc_reg_id;
+extern char *pu_reg_id;
#define WAND_BT_ON IMX_GPIO_NR(3, 13)
#define WAND_BT_WAKE IMX_GPIO_NR(3, 14)
@@ -752,6 +773,8 @@ static const struct pm_platform_data wand_pm_data = {
static const struct mxc_dvfs_platform_data wand_dvfscore_data = {
.reg_id = "cpu_vddgp",
+ .soc_id = "cpu_vddsoc",
+ .pu_id = "cpu_vddvpu",
.clk1_id = "cpu_clk",
.clk2_id = "gpc_dvfs_clk",
.gpc_cntr_offset = MXC_GPC_CNTR_OFFSET,
@@ -780,6 +803,13 @@ static __init void wand_init_pm(void) {
imx6q_add_anatop_thermal_imx(1, &wand_thermal);
imx6q_add_pm_imx(0, &wand_pm_data);
imx6q_add_dvfs_core(&wand_dvfscore_data);
+
+ /* Required for 3.0.0 kernel */
+ gp_reg_id = wand_dvfscore_data.reg_id;
+ soc_reg_id = wand_dvfscore_data.soc_id;
+ pu_reg_id = wand_dvfscore_data.pu_id;
+ mx6_cpu_regulator_init();
+
imx6q_add_busfreq();
}
--
1.7.9.5

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
PRINC := "${@int(PRINC) + 4}"
PRINC := "${@int(PRINC) + 5}"
# Wandboard-specific patches
SRC_URI_append_wandboard-dual = " \
file://wandboard-dual/0001-Linux-3.0.35-Add-wandboard-dual-support.patch \
file://wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch \
file://wandboard-dual/0003-linux-imx-3.0.35-Add-brcm80211-driver-backported-fro.patch \
file://wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch \
file://wandboard-dual/0004-modifications-for-fsl-3.0.0-and-add-header.patch \
"
# Add support for the Congatec qmx6 board
SRC_URI_append_cgtqmx6 = " file://cgtqmx6/cgtqmx6.patch"