core/linux-armv5 to 3.15.0-1

This commit is contained in:
Kevin Mihelich 2014-06-12 00:49:17 +00:00
parent b28082b428
commit afdca8b9f1
14 changed files with 1479 additions and 658 deletions

View file

@ -1,7 +1,7 @@
From 8ffdb635b9440b1cc33e2b916709aa4bdb3bdad5 Mon Sep 17 00:00:00 2001
From 7a8255d9442cb35ec6e7c3ed2b0a71d9a0711c1b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 1 Apr 2014 16:55:30 -0500
Subject: [PATCH 1/4] Revert "mmc: mxs: use mmc_of_parse to parse devicetree
Subject: [PATCH 1/9] Revert "mmc: mxs: use mmc_of_parse to parse devicetree
properties"
This reverts commit d1a1dfb2f5dad3fbcea71b95791d525f4775cff5.
@ -79,5 +79,5 @@ index 073e871..13016e2 100644
mmc->max_segs = 52;
--
1.9.1
1.9.0

View file

@ -1,7 +1,7 @@
From 3c423c1a7be6c502a07ce3dee4e7f7d49a49cd4d Mon Sep 17 00:00:00 2001
From 7e8d329fe09fc5ecf36d1a94463498d678de1c8f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 1 Apr 2014 16:55:42 -0500
Subject: [PATCH 2/4] Revert "mmc: mxs: use mmc_gpio_get_ro for detecting
Subject: [PATCH 2/9] Revert "mmc: mxs: use mmc_gpio_get_ro for detecting
read-only status"
This reverts commit abd37cccd47fe950e893578da12e7dc0604078de.
@ -85,5 +85,5 @@ index 13016e2..3dd2f4c 100644
if (of_property_read_bool(np, "cd-inverted"))
mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;
--
1.9.1
1.9.0

View file

@ -1,7 +1,7 @@
From 693ae32da4dd06e3f98bf1ff2595e1d461ad1402 Mon Sep 17 00:00:00 2001
From d1ef36a357b652575ca91b5b62e0e28bf87b0a63 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 1 Apr 2014 16:55:53 -0500
Subject: [PATCH 3/4] Revert "mmc: mxs: use standard flag for cd inverted"
Subject: [PATCH 3/9] Revert "mmc: mxs: use standard flag for cd inverted"
This reverts commit 6c3331d3ace7989688fa59f541f5e722e44ac373.
---
@ -49,5 +49,5 @@ index 3dd2f4c..02210ce 100644
mmc->f_min = 400000;
mmc->f_max = 288000000;
--
1.9.1
1.9.0

View file

@ -1,7 +1,7 @@
From 0e57cce7c9572286f421b8cbea899d5a917fdea8 Mon Sep 17 00:00:00 2001
From 7b0869c692c6b76084db9e6de96b63252041987b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 1 Apr 2014 16:56:05 -0500
Subject: [PATCH 4/4] Revert "mmc: mxs: use standard flag for broken card
Subject: [PATCH 4/9] Revert "mmc: mxs: use standard flag for broken card
detection"
This reverts commit a91fe279ae750d67d65039bb4ac2cc6ef51e7a2a.
@ -42,5 +42,5 @@ index 02210ce..374fca7 100644
mmc->caps |= MMC_CAP_NONREMOVABLE;
host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
--
1.9.1
1.9.0

View file

@ -0,0 +1,25 @@
From e3d5dd26a3e1057b6927d12bc88427eb13a8f3b1 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 15 Apr 2014 14:27:35 -0500
Subject: [PATCH 5/9] ARM: mxs: boot regression, select CLKSRC_OF
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/mach-mxs/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 8479413..b3eb28c 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -17,6 +17,7 @@ config ARCH_MXS
depends on ARCH_MULTI_V5
select ARCH_REQUIRE_GPIOLIB
select CLKSRC_MMIO
+ select CLKSRC_OF
select PINCTRL
select SOC_BUS
select SOC_IMX23
--
1.9.0

View file

@ -1,74 +0,0 @@
From 5d77ba2d26110c678b40fd723866a17d4036de12 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 18 Feb 2014 02:19:26 -0300
Subject: [PATCH 1/6] Bluetooth: allocate static minor for vhci
Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
driver) added the module alias to hci_vhci module so it's possible to
create the /dev/vhci node. However creating an alias without
specifying the minor doesn't allow us to create the node ahead,
triggerring module auto-load when it's first accessed.
Starting with depmod from kmod 16 we started to warn if there's a
devname alias without specifying the major and minor.
Let's do the same done for uhid, kvm, fuse and others, specifying a
fixed minor. In systems with systemd as the init the following will
happen: on early boot systemd will call "kmod static-nodes" to read
/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
first accessed these "dead" nodes will trigger the module loading.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
Documentation/devices.txt | 1 +
drivers/bluetooth/hci_vhci.c | 3 ++-
include/linux/miscdevice.h | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 10378cc..04356f5 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -353,6 +353,7 @@ Your cooperation is appreciated.
133 = /dev/exttrp External device trap
134 = /dev/apm_bios Advanced Power Management BIOS
135 = /dev/rtc Real Time Clock
+ 137 = /dev/vhci Bluetooth virtual HCI driver
139 = /dev/openprom SPARC OpenBoot PROM
140 = /dev/relay8 Berkshire Products Octal relay card
141 = /dev/relay16 Berkshire Products ISO-16 relay card
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 1ef6990..add1c6a 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = {
static struct miscdevice vhci_miscdev= {
.name = "vhci",
.fops = &vhci_fops,
- .minor = MISC_DYNAMIC_MINOR,
+ .minor = VHCI_MINOR,
};
static int __init vhci_init(void)
@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_ALIAS("devname:vhci");
+MODULE_ALIAS_MISCDEV(VHCI_MINOR);
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 3737f72..7bb6148 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -23,6 +23,7 @@
#define TEMP_MINOR 131 /* Temperature Sensor */
#define RTC_MINOR 135
#define EFI_RTC_MINOR 136 /* EFI Time services */
+#define VHCI_MINOR 137
#define SUN_OPENPROM_MINOR 139
#define DMAPI_MINOR 140 /* DMAPI */
#define NVRAM_MINOR 144
--
1.9.1

View file

@ -0,0 +1,54 @@
From 202ad4924a5c8d1f1509d7831ea37350d91a06f4 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 12 Aug 2013 11:27:22 -0500
Subject: [PATCH 6/9] ARM: dts: imx23-olinuxino: enable mxs-builtin-audio
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/imx23-olinuxino.dts | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index 7e6eef2..cf5058b 100644
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -88,6 +88,25 @@
usbphy0: usbphy@8007c000 {
status = "okay";
};
+
+ codec: mxs-builtin-codec {
+ compatible = "fsl,mxs-builtin-codec";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ clocks = <&clks 31>;
+ clock-names = "filt";
+ };
+
+ platform_dai: mxs-builtin-cpu-dai {
+ compatible = "fsl,mxs-builtin-cpu-dai";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ interrupts = <8 6 4>;
+ dmas = <&dma_apbx 0>, <&dma_apbx 1>;
+ dma-names = "rx", "tx";
+ };
};
};
@@ -125,4 +144,10 @@
gpios = <&gpio2 1 1>;
};
};
+
+ mxs-builtin-audio {
+ compatible = "fsl,mxs-builtin-audio";
+ audio-codec = <&codec>;
+ cpu-dai = <&platform_dai>;
+ };
};
--
1.9.0

View file

@ -1,359 +1,32 @@
diff -urN a/arch/arm/boot/dts/imx23-audio.dts b/arch/arm/boot/dts/imx23-audio.dts
--- a/arch/arm/boot/dts/imx23-audio.dts 1969-12-31 17:00:00.000000000 -0700
+++ b/arch/arm/boot/dts/imx23-audio.dts 2014-04-03 21:01:23.800864540 -0600
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * DTS for testing mxs-builtin-audio.
+ */
+
+/dts-v1/;
+/include/ "imx23.dtsi"
+
+/ {
+ model = "i.MX23 Olinuxino Low Cost Board";
+ compatible = "olimex,imx23-olinuxino", "fsl,imx23";
+
+ memory {
+ reg = <0x40000000 0x04000000>;
+ };
+
+ apb@80000000 {
+ apbh@80000000 {
+ ssp0: ssp@80010000 {
+ compatible = "fsl,imx23-mmc";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+ bus-width = <4>;
+ broken-cd;
+ status = "okay";
+ };
+
+ pinctrl@80018000 {
+ pinctrl-names = "default";
+ // TODO Can gpio_keys use pinctrl?
+ pinctrl-0 = <&hog_pins_a &btns_pins_a>;
+
+ hog_pins_a: hog@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
+ >;
+ fsl,drive-strength = <0>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
+
+ led_pin_gpio2_1: led_gpio2_1@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
+ >;
+ fsl,drive-strength = <0>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
+
+ btns_pins_a: btns@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x0033 /* MX23_PAD_GPMI_D03__GPIO_0_3 */
+ 0x0043 /* MX23_PAD_GPMI_D04__GPIO_0_4 */
+ 0x0053 /* MX23_PAD_GPMI_D05__GPIO_0_5 */
+ 0x0063 /* MX23_PAD_GPMI_D06__GPIO_0_6 */
+ 0x0073 /* MX23_PAD_GPMI_D07__GPIO_0_7 */
+ >;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
+ };
+
+ ssp1: ssp@80034000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,imx23-spi";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi2_pins_a>;
+ status = "okay";
+ };
+ };
+
+ apbx@80040000 {
+ duart: serial@80070000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&duart_pins_a>;
+ status = "okay";
+ };
+
+ auart0: serial@8006c000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&auart0_2pins_a>;
+ status = "okay";
+ };
+
+ usbphy0: usbphy@8007c000 {
+ status = "okay";
+ };
+
+ codec: mxs-builtin-codec {
+ compatible = "fsl,mxs-builtin-codec";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ clocks = <&clks 31>;
+ clock-names = "filt";
+ };
+
+ platform_dai: mxs-builtin-cpu-dai {
+ compatible = "fsl,mxs-builtin-cpu-dai";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ interrupts = <8 6 4>;
+ dmas = <&dma_apbx 0>, <&dma_apbx 1>;
+ dma-names = "rx", "tx";
+ };
+ };
+ };
+
+ ahb@80080000 {
+ usb0: usb@80080000 {
+ vbus-supply = <&reg_usb0_vbus>;
+ status = "okay";
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+
+ reg_usb0_vbus: usb0_vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb0_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ startup-delay-us = <300>; /* LAN9215 requires a POR of 200us minimum */
+ gpio = <&gpio0 17 0>;
+ };
+ };
+
+ mxs-builtin-audio {
+ compatible = "fsl,mxs-builtin-audio";
+ audio-codec = <&codec>;
+ cpu-dai = <&platform_dai>;
+ };
+};
diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
--- a/arch/arm/boot/dts/imx23.dtsi 2014-03-30 21:40:15.000000000 -0600
+++ b/arch/arm/boot/dts/imx23.dtsi 2014-04-03 21:01:23.800864540 -0600
@@ -307,6 +307,39 @@
fsl,voltage = <MXS_VOLTAGE_HIGH>;
fsl,pull-up = <MXS_PULL_ENABLE>;
};
+
+ i2c0_pins_a: i2c0@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x01e0 /* MX23_PAD_I2C_SCL__I2C_SCL */
+ 0x01f0 /* MX23_PAD_I2C_SDA__I2C_SDA */
+ >;
+ fsl,drive-strength = <1>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
+
+ i2c1_pins_a: i2c1@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x1171 /* MX23_PAD_LCD_ENABLE__I2C_SCL */
+ 0x1181 /* MX23_PAD_LCD_HSYNC__I2C_SDA */
+ >;
+ fsl,drive-strength = <1>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
+
+ i2c2_pins_a: i2c2@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x2031 /* MX23_PAD_SSP1_DATA1__I2C_SCL */
+ 0x2041 /* MX23_PAD_SSP1_DATA2__I2C_SDA */
+ >;
+ fsl,drive-strength = <1>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
};
digctl@8001c000 {
@@ -380,7 +413,7 @@
reg = <0x80038000 0x2000>;
status = "disabled";
};
- };
+ };
apbx@80040000 {
compatible = "simple-bus";
@@ -443,8 +476,14 @@
status = "disabled";
};
- i2c@80058000 {
+ i2c0: i2c@80058000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,imx23-i2c";
reg = <0x80058000 0x2000>;
+ interrupts = <27 26>;
+ clock-frequency = <100000>;
+ fsl,i2c-dma-channel = <3>;
dmas = <&dma_apbx 3>;
dma-names = "rx-tx";
status = "disabled";
diff -urN a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
--- a/arch/arm/boot/dts/imx23-olinuxino.dts 2014-03-30 21:40:15.000000000 -0600
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts 2014-04-03 21:01:23.800864540 -0600
@@ -29,6 +29,7 @@
pinctrl-names = "default";
pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
bus-width = <4>;
+ non-removable;
broken-cd;
status = "okay";
};
@@ -73,6 +74,25 @@
status = "okay";
};
+ i2c0: i2c@80058000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins_a>;
+ status = "okay";
+
+ sgtl5000: codec@0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ VDDA-supply = <&reg_3p3v>;
+ VDDIO-supply = <&reg_3p3v>;
+ };
+
+ at24@51 {
+ compatible = "at24,24c32";
+ pagesize = <32>;
+ reg = <0x51>;
+ };
+ };
+
duart: serial@80070000 {
pinctrl-names = "default";
pinctrl-0 = <&duart_pins_a>;
@@ -88,6 +108,25 @@
usbphy0: usbphy@8007c000 {
status = "okay";
};
+
+ codec: mxs-builtin-codec {
+ compatible = "fsl,mxs-builtin-codec";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ clocks = <&clks 31>;
+ clock-names = "filt";
+ };
+
+ platform_dai: mxs-builtin-cpu-dai {
+ compatible = "fsl,mxs-builtin-cpu-dai";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ interrupts = <8 6 4>;
+ dmas = <&dma_apbx 0>, <&dma_apbx 1>;
+ dma-names = "rx", "tx";
+ };
};
};
@@ -101,6 +140,14 @@
regulators {
compatible = "simple-bus";
+ reg_3p3v: 3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
reg_usb0_vbus: usb0_vbus {
compatible = "regulator-fixed";
regulator-name = "usb0_vbus";
@@ -112,6 +159,14 @@
};
};
+ sound {
+ compatible = "fsl,imx28-evk-sgtl5000",
+ "fsl,mxs-audio-sgtl5000";
+ model = "imx28-evk-sgtl5000";
+ saif-controllers = <&saif0 &saif1>;
+ audio-codec = <&sgtl5000>;
+ };
+
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -122,4 +177,10 @@
gpios = <&gpio2 1 1>;
};
};
+
+ mxs-builtin-audio {
+ compatible = "fsl,mxs-builtin-audio";
+ audio-codec = <&codec>;
+ cpu-dai = <&platform_dai>;
+ };
};
diff -urN a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
--- a/drivers/mmc/host/mxs-mmc.c 2014-03-30 21:40:15.000000000 -0600
+++ b/drivers/mmc/host/mxs-mmc.c 2014-04-03 21:01:23.800864540 -0600
@@ -74,6 +74,9 @@
static int mxs_mmc_get_cd(struct mmc_host *mmc)
{
+ if (mmc->caps & MMC_CAP_NONREMOVABLE)
+ return 1;
+
struct mxs_mmc_host *host = mmc_priv(mmc);
struct mxs_ssp *ssp = &host->ssp;
int present, ret;
@@ -634,6 +637,9 @@
mmc->caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |
MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL;
+ if (of_find_property(np, "non-removable", NULL))
+ mmc->caps |= MMC_CAP_NONREMOVABLE;
+
mmc->f_min = 400000;
mmc->f_max = 288000000;
diff -urN a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Kconfig 2014-03-30 21:40:15.000000000 -0600
+++ b/sound/soc/codecs/Kconfig 2014-04-03 21:01:23.805864618 -0600
@@ -132,6 +132,7 @@
From da16e5f184a69076d73efdb025cc18f87ae43ba4 Mon Sep 17 00:00:00 2001
From: Michal Ulianko <info@itserve.cz>
Date: Mon, 29 Jul 2013 20:14:38 +0200
Subject: [PATCH 7/9] Added ASoC driver for i.MX233's builtin ADC/DAC codec.
---
sound/soc/codecs/Kconfig | 4 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/mxs-builtin-codec.c | 1128 ++++++++++++++++++++++++++++++++++
sound/soc/codecs/mxs-builtin-codec.h | 825 +++++++++++++++++++++++++
sound/soc/mxs/Kconfig | 10 +
sound/soc/mxs/Makefile | 9 +
sound/soc/mxs/mxs-builtin-audio.c | 120 ++++
sound/soc/mxs/mxs-builtin-dai.c | 588 ++++++++++++++++++
sound/soc/mxs/mxs-builtin-pcm.c | 69 +++
sound/soc/mxs/mxs-builtin-pcm.h | 25 +
10 files changed, 2780 insertions(+)
create mode 100644 sound/soc/codecs/mxs-builtin-codec.c
create mode 100644 sound/soc/codecs/mxs-builtin-codec.h
create mode 100644 sound/soc/mxs/mxs-builtin-audio.c
create mode 100644 sound/soc/mxs/mxs-builtin-dai.c
create mode 100644 sound/soc/mxs/mxs-builtin-pcm.c
create mode 100644 sound/soc/mxs/mxs-builtin-pcm.h
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f0e8401..4279f70 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -146,6 +146,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_WM9705 if SND_SOC_AC97_BUS
select SND_SOC_WM9712 if SND_SOC_AC97_BUS
select SND_SOC_WM9713 if SND_SOC_AC97_BUS
@ -361,7 +34,7 @@ diff -urN a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
help
Normally ASoC codec drivers are only built if a machine driver which
uses them is also built since they are only usable with a machine
@@ -536,6 +537,9 @@
@@ -654,6 +655,9 @@ config SND_SOC_WM9712
config SND_SOC_WM9713
tristate
@ -371,10 +44,11 @@ diff -urN a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
# Amp
config SND_SOC_LM4857
tristate
diff -urN a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/Makefile 2014-03-30 21:40:15.000000000 -0600
+++ b/sound/soc/codecs/Makefile 2014-04-03 21:01:23.805864618 -0600
@@ -124,6 +124,7 @@
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 3c4d275..f5684bd 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -142,6 +142,7 @@ snd-soc-wm9705-objs := wm9705.o
snd-soc-wm9712-objs := wm9712.o
snd-soc-wm9713-objs := wm9713.o
snd-soc-wm-hubs-objs := wm_hubs.o
@ -382,7 +56,7 @@ diff -urN a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
# Amp
snd-soc-max9877-objs := max9877.o
@@ -254,6 +255,7 @@
@@ -289,6 +290,7 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
obj-$(CONFIG_SND_SOC_WM_ADSP) += snd-soc-wm-adsp.o
obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
@ -390,9 +64,11 @@ diff -urN a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
# Amp
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
diff -urN a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-codec.c
--- a/sound/soc/codecs/mxs-builtin-codec.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/codecs/mxs-builtin-codec.c 2014-04-03 21:01:23.810864750 -0600
diff --git a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-codec.c
new file mode 100644
index 0000000..e5dcb4e
--- /dev/null
+++ b/sound/soc/codecs/mxs-builtin-codec.c
@@ -0,0 +1,1128 @@
+/*
+ * mxs-builtin-codec.c -- i.MX233 built-in codec ALSA Soc Audio driver
@ -1522,9 +1198,11 @@ diff -urN a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec Driver");
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-codec.h
--- a/sound/soc/codecs/mxs-builtin-codec.h 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/codecs/mxs-builtin-codec.h 2014-04-03 21:01:23.810864750 -0600
diff --git a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-codec.h
new file mode 100644
index 0000000..75dee0b
--- /dev/null
+++ b/sound/soc/codecs/mxs-builtin-codec.h
@@ -0,0 +1,825 @@
+#ifndef __MXS_ADC_CODEC_H
+
@ -2351,10 +2029,11 @@ diff -urN a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-
+#define BV_AUDIOIN_ADCVOL_SELECT__MIC 0x00
+
+#endif /* __MXS_ADC_CODEC_H */
diff -urN a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
--- a/sound/soc/mxs/Kconfig 2014-03-30 21:40:15.000000000 -0600
+++ b/sound/soc/mxs/Kconfig 2014-04-03 21:01:23.810864750 -0600
@@ -19,3 +19,13 @@
diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
index 219235c..7612ef8 100644
--- a/sound/soc/mxs/Kconfig
+++ b/sound/soc/mxs/Kconfig
@@ -19,3 +19,13 @@ config SND_SOC_MXS_SGTL5000
a sgtl5000 codec.
endif # SND_MXS_SOC
@ -2368,10 +2047,11 @@ diff -urN a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
+ help
+ Say Y or M if you want to add support for codecs attached to
+ the MXS SAIF interface.
diff -urN a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
--- a/sound/soc/mxs/Makefile 2014-03-30 21:40:15.000000000 -0600
+++ b/sound/soc/mxs/Makefile 2014-04-03 21:01:23.810864750 -0600
@@ -8,3 +8,12 @@
diff --git a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
index 565b5b5..cd0cf16 100644
--- a/sound/soc/mxs/Makefile
+++ b/sound/soc/mxs/Makefile
@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs.o snd-soc-mxs-pcm.o
snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o
obj-$(CONFIG_SND_SOC_MXS_SGTL5000) += snd-soc-mxs-sgtl5000.o
@ -2384,9 +2064,11 @@ diff -urN a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-pcm.o
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-dai.o
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-audio.o
diff -urN a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.c
--- a/sound/soc/mxs/mxs-builtin-audio.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-audio.c 2014-04-03 21:01:23.815864823 -0600
diff --git a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.c
new file mode 100644
index 0000000..7a27c63
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-audio.c
@@ -0,0 +1,120 @@
+/*
+ * mxs-builtin-audio.c -- i.MX233 built-in codec ALSA Soc Audio driver
@ -2508,9 +2190,11 @@ diff -urN a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Machine Driver");
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
--- a/sound/soc/mxs/mxs-builtin-dai.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-dai.c 2014-04-03 21:01:23.815864823 -0600
diff --git a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
new file mode 100644
index 0000000..cc81f9a
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-dai.c
@@ -0,0 +1,588 @@
+/*
+ * mxs-builtin-dai.c -- i.MX233 built-in codec ALSA Soc Audio driver
@ -3100,9 +2784,11 @@ diff -urN a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec DAI Driver");
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
--- a/sound/soc/mxs/mxs-builtin-pcm.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-pcm.c 2014-04-03 21:01:23.815864823 -0600
diff --git a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
new file mode 100644
index 0000000..9f155df
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-pcm.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@ -3173,9 +2859,11 @@ diff -urN a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
+EXPORT_SYMBOL_GPL(mxs_adc_pcm_platform_unregister);
+
+MODULE_LICENSE("GPL");
diff -urN a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
--- a/sound/soc/mxs/mxs-builtin-pcm.h 1969-12-31 17:00:00.000000000 -0700
+++ b/sound/soc/mxs/mxs-builtin-pcm.h 2014-04-03 21:01:23.815864823 -0600
diff --git a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
new file mode 100644
index 0000000..2fba109
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-pcm.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
@ -3202,3 +2890,6 @@ diff -urN a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
+void mxs_adc_pcm_platform_unregister(struct device *dev);
+
+#endif
--
1.9.0

View file

@ -0,0 +1,173 @@
From cff702a69bd4f12ffd379e0d6b74037de3086676 Mon Sep 17 00:00:00 2001
From: Michal Ulianko <info@itserve.cz>
Date: Tue, 30 Jul 2013 14:28:17 +0200
Subject: [PATCH 8/9] Added DTS with mxs-builtin-* entries for testing the
audio driver.
---
arch/arm/boot/dts/imx23-audio.dts | 153 ++++++++++++++++++++++++++++++++++++++
1 file changed, 153 insertions(+)
create mode 100644 arch/arm/boot/dts/imx23-audio.dts
diff --git a/arch/arm/boot/dts/imx23-audio.dts b/arch/arm/boot/dts/imx23-audio.dts
new file mode 100644
index 0000000..1555896
--- /dev/null
+++ b/arch/arm/boot/dts/imx23-audio.dts
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * DTS for testing mxs-builtin-audio.
+ */
+
+/dts-v1/;
+/include/ "imx23.dtsi"
+
+/ {
+ model = "i.MX23 Olinuxino Low Cost Board";
+ compatible = "olimex,imx23-olinuxino", "fsl,imx23";
+
+ memory {
+ reg = <0x40000000 0x04000000>;
+ };
+
+ apb@80000000 {
+ apbh@80000000 {
+ ssp0: ssp@80010000 {
+ compatible = "fsl,imx23-mmc";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+ bus-width = <4>;
+ broken-cd;
+ status = "okay";
+ };
+
+ pinctrl@80018000 {
+ pinctrl-names = "default";
+ // TODO Can gpio_keys use pinctrl?
+ pinctrl-0 = <&hog_pins_a &btns_pins_a>;
+
+ hog_pins_a: hog@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
+ >;
+ fsl,drive-strength = <0>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
+
+ led_pin_gpio2_1: led_gpio2_1@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
+ >;
+ fsl,drive-strength = <0>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
+
+ btns_pins_a: btns@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x0033 /* MX23_PAD_GPMI_D03__GPIO_0_3 */
+ 0x0043 /* MX23_PAD_GPMI_D04__GPIO_0_4 */
+ 0x0053 /* MX23_PAD_GPMI_D05__GPIO_0_5 */
+ 0x0063 /* MX23_PAD_GPMI_D06__GPIO_0_6 */
+ 0x0073 /* MX23_PAD_GPMI_D07__GPIO_0_7 */
+ >;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
+ };
+
+ ssp1: ssp@80034000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,imx23-spi";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi2_pins_a>;
+ status = "okay";
+ };
+ };
+
+ apbx@80040000 {
+ duart: serial@80070000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&duart_pins_a>;
+ status = "okay";
+ };
+
+ auart0: serial@8006c000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&auart0_2pins_a>;
+ status = "okay";
+ };
+
+ usbphy0: usbphy@8007c000 {
+ status = "okay";
+ };
+
+ codec: mxs-builtin-codec {
+ compatible = "fsl,mxs-builtin-codec";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ clocks = <&clks 31>;
+ clock-names = "filt";
+ };
+
+ platform_dai: mxs-builtin-cpu-dai {
+ compatible = "fsl,mxs-builtin-cpu-dai";
+ reg = <0x80048000 0x2000>, <0x8004c000 0x2000>,
+ <0x8005c000 0x2000>;
+ reg-names = "audioout", "audioin", "rtc";
+ interrupts = <8 6 4>;
+ dmas = <&dma_apbx 0>, <&dma_apbx 1>;
+ dma-names = "rx", "tx";
+ };
+ };
+ };
+
+ ahb@80080000 {
+ usb0: usb@80080000 {
+ vbus-supply = <&reg_usb0_vbus>;
+ status = "okay";
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
+
+ reg_usb0_vbus: usb0_vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb0_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ startup-delay-us = <300>; /* LAN9215 requires a POR of 200us minimum */
+ gpio = <&gpio0 17 0>;
+ };
+ };
+
+ mxs-builtin-audio {
+ compatible = "fsl,mxs-builtin-audio";
+ audio-codec = <&codec>;
+ cpu-dai = <&platform_dai>;
+ };
+};
--
1.9.0

View file

@ -0,0 +1,126 @@
From 83965298da686088190be8d2278f49f4fc59f5c6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 16 May 2014 11:33:17 -0600
Subject: [PATCH 9/9] I2C fixes
---
arch/arm/boot/dts/imx23-olinuxino.dts | 35 ++++++++++++++++++++++++++++++
arch/arm/boot/dts/imx23.dtsi | 41 ++++++++++++++++++++++++++++++++++-
2 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index cf5058b..2ecee35 100644
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -73,6 +73,25 @@
status = "okay";
};
+ i2c0: i2c@80058000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins_a>;
+ status = "okay";
+
+ sgtl5000: codec@0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ VDDA-supply = <&reg_3p3v>;
+ VDDIO-supply = <&reg_3p3v>;
+ };
+
+ at24@51 {
+ compatible = "at24,24c32";
+ pagesize = <32>;
+ reg = <0x51>;
+ };
+ };
+
duart: serial@80070000 {
pinctrl-names = "default";
pinctrl-0 = <&duart_pins_a>;
@@ -132,6 +151,22 @@
startup-delay-us = <300>; /* LAN9215 requires a POR of 200us minimum */
gpio = <&gpio0 17 0>;
};
+
+ reg_3p3v: 3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
+
+ sound {
+ compatible = "fsl,imx28-evk-sgtl5000",
+ "fsl,mxs-audio-sgtl5000";
+ model = "imx28-evk-sgtl5000";
+ saif-controllers = <&saif0 &saif1>;
+ audio-codec = <&sgtl5000>;
};
leds {
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index bbcfb5a..54b6a83 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -308,6 +308,39 @@
fsl,voltage = <MXS_VOLTAGE_HIGH>;
fsl,pull-up = <MXS_PULL_ENABLE>;
};
+
+ i2c0_pins_a: i2c0@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x01e0 /* MX23_PAD_I2C_SCL__I2C_SCL */
+ 0x01f0 /* MX23_PAD_I2C_SDA__I2C_SDA */
+ >;
+ fsl,drive-strength = <1>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
+
+ i2c1_pins_a: i2c1@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x1171 /* MX23_PAD_LCD_ENABLE__I2C_SCL */
+ 0x1181 /* MX23_PAD_LCD_HSYNC__I2C_SDA */
+ >;
+ fsl,drive-strength = <1>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
+
+ i2c2_pins_a: i2c2@0 {
+ reg = <0>;
+ fsl,pinmux-ids = <
+ 0x2031 /* MX23_PAD_SSP1_DATA1__I2C_SCL */
+ 0x2041 /* MX23_PAD_SSP1_DATA2__I2C_SDA */
+ >;
+ fsl,drive-strength = <1>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <1>;
+ };
};
digctl@8001c000 {
@@ -444,8 +477,14 @@
status = "disabled";
};
- i2c@80058000 {
+ i2c0: i2c@80058000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,imx23-i2c";
reg = <0x80058000 0x2000>;
+ interrupts = <27 26>;
+ clock-frequency = <100000>;
+ fsl,i2c-dma-channel = <3>;
dmas = <&dma_apbx 3>;
dma-names = "rx-tx";
status = "disabled";
--
1.9.0

View file

@ -4,53 +4,59 @@
buildarch=2
pkgbase=linux-armv5
_srcname=linux-3.14
_srcname=linux-3.15
_kernelname=${pkgbase#linux}
_desc="ARMv5 based platforms"
pkgver=3.14.4
pkgver=3.15.0
pkgrel=1
arch=('armv7h')
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
#"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
#"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
'0001-Revert-mmc-mxs-use-mmc_of_parse-to-parse-devicetree-.patch'
'0002-Revert-mmc-mxs-use-mmc_gpio_get_ro-for-detecting-rea.patch'
'0003-Revert-mmc-mxs-use-standard-flag-for-cd-inverted.patch'
'0004-Revert-mmc-mxs-use-standard-flag-for-broken-card-det.patch'
'0005-Bluetooth-allocate-static-minor-for-vhci.patch'
'imx23-olinuxino.patch'
'gpio-clamp.patch'
'0005-ARM-mxs-boot-regression-select-CLKSRC_OF.patch'
'0006-ARM-dts-imx23-olinuxino-enable-mxs-builtin-audio.patch'
'0007-Added-ASoC-driver-for-i.MX233-s-builtin-ADC-DAC-code.patch'
'0008-Added-DTS-with-mxs-builtin-entries-for-testing-the-a.patch'
'0009-I2C-fixes.patch'
'config')
md5sums=('b621207b3f6ecbb67db18b13258f8ea8'
'116f27cf17c3522716b6678b17516067'
md5sums=('97ca1625bb40368dc41b9a7971549071'
'SKIP'
'58ba9b8d74609d5256ed87ed4d53fd93'
'c819b56b5d6ebe32b9ef44a0ae8fc4c2'
'2233ffb1d01de896a74e5b08a7a19152'
'49a3db56af64668f9d0eddc5020cdc87'
'1b276abe16d14e133f3f28d9c9e6bd68'
'ef1497399f2d214eff4c40d36482120a'
'eb02814c2c46d5a8cf81361bbab9abbd'
'86f483af896a10938dc92b296d4b7f03')
'537d3b1821b5685036138621308148d2'
'eb663234804d647a64cea20b949f3afd'
'5fdfb6fe8c30934f38fb6315aa9d9912'
'bc9c1dbb9b5df11621ef750a919c546c'
'fb0f2d798b826e9b935b77dfe9422eff'
'02c58ebac58a3eeeaf709e1d8b98ca5f'
'14570ba571b001b1f42070e2066232d7'
'ad4eb847c301bc3d5a66de3ee2369da8'
'ef607cd7a01d7c287b107f677f6a7808'
'3c631306b4dbffeb6d813a640f50f400')
prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
git apply "${srcdir}/patch-${pkgver}"
#git apply "${srcdir}/patch-${pkgver}"
# ALARM patches
patch -Np1 -i ../imx23-olinuxino.patch
patch -Np1 -i ../gpio-clamp.patch
patch -Np1 -i ../0001-Revert-mmc-mxs-use-mmc_of_parse-to-parse-devicetree-.patch
patch -Np1 -i ../0002-Revert-mmc-mxs-use-mmc_gpio_get_ro-for-detecting-rea.patch
patch -Np1 -i ../0003-Revert-mmc-mxs-use-standard-flag-for-cd-inverted.patch
patch -Np1 -i ../0004-Revert-mmc-mxs-use-standard-flag-for-broken-card-det.patch
patch -Np1 -i ../0005-Bluetooth-allocate-static-minor-for-vhci.patch
git apply ../0001-Revert-mmc-mxs-use-mmc_of_parse-to-parse-devicetree-.patch
git apply ../0002-Revert-mmc-mxs-use-mmc_gpio_get_ro-for-detecting-rea.patch
git apply ../0003-Revert-mmc-mxs-use-standard-flag-for-cd-inverted.patch
git apply ../0004-Revert-mmc-mxs-use-standard-flag-for-broken-card-det.patch
git apply ../0005-ARM-mxs-boot-regression-select-CLKSRC_OF.patch
git apply ../0006-ARM-dts-imx23-olinuxino-enable-mxs-builtin-audio.patch
git apply ../0007-Added-ASoC-driver-for-i.MX233-s-builtin-ADC-DAC-code.patch
git apply ../0008-Added-DTS-with-mxs-builtin-entries-for-testing-the-a.patch
git apply ../0009-I2C-fixes.patch
# AUFS patches
cp -ru "${srcdir}/aufs3-standalone/Documentation" .
@ -58,10 +64,10 @@ prepare() {
cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux
cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch
patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
git apply ../aufs3-standalone/aufs3-kbuild.patch
git apply ../aufs3-standalone/aufs3-base.patch
git apply ../aufs3-standalone/aufs3-mmap.patch
git apply ../aufs3-standalone/aufs3-standalone.patch
cat "${srcdir}/config" > ./.config

File diff suppressed because it is too large Load diff

View file

@ -1,30 +0,0 @@
From 25b35da7f4cce82271859f1b6eabd9f3bd41a2bb Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 05 Feb 2014 13:08:02 +0000
Subject: gpio: generic: clamp retured value to [0,1]
The generic GPIO would return 0 for low generic GPIO, and
something != 0 for high GPIO. Let's make this sane by clamping
the returned value to [0,1].
Reported-by: Evgeny Boger <boger@contactless.ru>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
(limited to 'drivers/gpio/gpio-generic.c')
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index 8c778af..d815dd2 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -139,7 +139,7 @@ static int bgpio_get(struct gpio_chip *gc, unsigned int gpio)
{
struct bgpio_chip *bgc = to_bgpio_chip(gc);
- return bgc->read_reg(bgc->reg_dat) & bgc->pin2mask(bgc, gpio);
+ return !!(bgc->read_reg(bgc->reg_dat) & bgc->pin2mask(bgc, gpio));
}
static void bgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
--
cgit v0.9.2

View file

@ -1,5 +1,5 @@
KERNEL_NAME=-mvebu
KERNEL_VERSION=3.11.0-rc1-1-ARCH
KERNEL_NAME=-armv5
KERNEL_VERSION=3.15.0-1-ARCH
post_install () {
# updating module dependencies