rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Update ARM config

Browse Source
This commit is contained in:
Peter Robinson 2013-05-05 23:55:35 +01:00
parent ea69f4d8cc
commit c850cbb9fd
4 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
20-21-MFD-ab8500-export-ab8500_gpadc_sw_hw_convert-properly.patch Normal file
View File

@ -0,0 +1,52 @@
From patchwork Tue Apr 23 16:30:52 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [20/21] MFD: ab8500: export ab8500_gpadc_sw_hw_convert properly
Date: Tue, 23 Apr 2013 16:30:52 -0000
From: Arnd Bergmann <arnd@arndb.de>
X-Patchwork-Id: 2479831
Message-Id: <1366734653-488286-21-git-send-email-arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Samuel Ortiz <sameo@linux.intel.com>, Arnd Bergmann <arnd@arndb.de>,
Michel JAOUEN <michel.jaouen@stericsson.com>,
linux-kernel@vger.kernel.org,
M'boumba Cedric Madianga <cedric.madianga@stericsson.com>,
Mattias WALLIN <mattias.wallin@stericsson.com>,
Lee Jones <lee.jones@linaro.org>
Apparently the ab8500_gpadc_sw_hw_convert function got renamed
from ab8500_gpadc_convert to ab8500_gpadc_sw_hw_convert in
commit 734823462 "mfd: ab8500-gpadc: Add gpadc hw conversion",
but the export for this function did not get changed at the
same time, causing this allyesconfig error:
ERROR: "ab8500_gpadc_sw_hw_convert" [drivers/hwmon/ab8500.ko] undefined!
This patch fixes the export.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: M'boumba Cedric Madianga <cedric.madianga@stericsson.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Mattias WALLIN <mattias.wallin@stericsson.com>
Cc: Michel JAOUEN <michel.jaouen@stericsson.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/mfd/ab8500-gpadc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 5f341a5..184df96 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -269,7 +269,7 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 channel)
return voltage;
}
-EXPORT_SYMBOL(ab8500_gpadc_convert);
+EXPORT_SYMBOL(ab8500_gpadc_sw_hw_convert);
/**
* ab8500_gpadc_read_raw() - gpadc read

10
arm-tegra-sdhci-module-fix.patch
View File

@ -1,11 +1,11 @@
--- linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c.orig 2012-05-23 06:59:19.797302757 -0500
+++ linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c 2012-05-22 15:26:07.154823359 -0500
@@ -190,7 +190,7 @@
--- linux-3.10.0-0.rc0.git15.1.fc20.x86_64/drivers/mmc/host/sdhci-tegra.c.orig 2013-05-05 16:02:40.473147107 +0100
+++ linux-3.10.0-0.rc0.git15.1.fc20.x86_64/drivers/mmc/host/sdhci-tegra.c 2013-05-05 16:03:08.153399199 +0100
@@ -214,7 +214,7 @@
#endif
{}
};
-MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
+MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);
static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
struct platform_device *pdev)
static void sdhci_tegra_parse_dt(struct device *dev,
struct sdhci_tegra *tegra_host)

15
config-armv7
View File

@ -393,24 +393,34 @@ CONFIG_MACH_HREFV60=y
CONFIG_MACH_SNOWBALL=y
CONFIG_MACH_UX500_DT=y
CONFIG_ABX500_CORE=y
CONFIG_UX500_DEBUG_UART=2
CONFIG_AB8500_CORE=y
CONFIG_STE_DMA40=y
CONFIG_HSEM_U8500=m
CONFIG_PINCTRL_ABX500=y
CONFIG_PINCTRL_AB8500=y
CONFIG_I2C_NOMADIK=m
CONFIG_KEYBOARD_NOMADIK=m
CONFIG_DB8500_THERMAL=y
CONFIG_UX500_WATCHDOG=m
CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_REGULATOR_AB8500=y
CONFIG_AB8500_USB=m
CONFIG_RTC_DRV_AB8500=m
CONFIG_PWM_AB8500=m
CONFIG_SND_SOC_UX500=m
CONFIG_SND_SOC_UX500_PLAT_DMA=m
CONFIG_STE_DMA40=y
CONFIG_HSEM_U8500=m
CONFIG_SND_SOC_UX500_MACH_MOP500=m
CONFIG_CLKSRC_DBX500_PRCMU=y
CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
CONFIG_CRYPTO_DEV_UX500=m
CONFIG_CRYPTO_DEV_UX500_CRYP=m
CONFIG_CRYPTO_DEV_UX500_HASH=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_AB8500_BM=y
CONFIG_AB8500_GPADC=y
CONFIG_SENSORS_AB8500=m
# tegra
CONFIG_ARCH_TEGRA_2x_SOC=y
@ -578,3 +588,4 @@ CONFIG_REGULATOR_LP8755=m
# CONFIG_OMAP2_DSS_DEBUG is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
# CONFIG_AB8500_DEBUG is not set

7
kernel.spec
View File

@ -703,10 +703,12 @@ Patch21001: arm-of-dma.patch
Patch21002: arm-lpae-ax88796.patch
# ARM omap
Patch21003: 20-21-MFD-ab8500-export-ab8500_gpadc_sw_hw_convert-properly.patch
# ARM tegra
Patch21005: arm-tegra-usb-no-reset-linux33.patch
Patch21006: arm-tegra-fixclk.patch
Patch21007: arm-tegra-sdhci-module-fix.patch
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@ -1293,6 +1295,8 @@ ApplyPatch arm-of-dma.patch
ApplyPatch arm-lpae-ax88796.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
ApplyPatch arm-tegra-fixclk.patch
ApplyPatch arm-tegra-sdhci-module-fix.patch
ApplyPatch 20-21-MFD-ab8500-export-ab8500_gpadc_sw_hw_convert-properly.patch
#
# bugfixes to drivers and filesystems
@ -2249,6 +2253,9 @@ fi
# ||----w |
# || ||
%changelog
* Sun May 5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Update ARM config
* Sat May 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git16.1
- Linux v3.9-9472-g1db7722