summaryrefslogtreecommitdiff
path: root/target/arm/solidrun-imx6
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-09 12:06:46 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-09 12:06:46 +0200
commit86a2eb56549502f21ff753f6bce0ea32bb7a2cb7 (patch)
treeb43cada1ccc1cf0e25670e0d11d202365a18ed7e /target/arm/solidrun-imx6
parent59061e05cd5bab14700e91aac6711aaa20af1d49 (diff)
fix audio module compile
Diffstat (limited to 'target/arm/solidrun-imx6')
-rw-r--r--target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch281
1 files changed, 2 insertions, 279 deletions
diff --git a/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
index f1851a7b3..509e58943 100644
--- a/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
+++ b/target/arm/solidrun-imx6/patches/3.14.17/solidrun.patch
@@ -13103,62 +13103,6 @@ diff -Nur linux-3.14.17/arch/arm/boot/dts/imx6sl-evk.dts linux-imx6-3.14/arch/ar
+&gpu {
+ pu-supply = <&pu_dummy>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
+};
-diff -Nur linux-3.14.17/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.14.17/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/arm/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-09-09 10:13:51.908979081 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2013 Freescale Semiconductor, Inc.
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
-@@ -71,8 +71,8 @@
- #define IMX6SL_CLK_PERIPH 58
- #define IMX6SL_CLK_PERIPH2 59
- #define IMX6SL_CLK_OCRAM_PODF 60
--#define IMX6SL_CLK_PERIPH_CLK2_PODF 61
--#define IMX6SL_CLK_PERIPH2_CLK2_PODF 62
-+#define IMX6SL_CLK_PERIPH_CLK2 61
-+#define IMX6SL_CLK_PERIPH2_CLK2 62
- #define IMX6SL_CLK_IPG 63
- #define IMX6SL_CLK_CSI_PODF 64
- #define IMX6SL_CLK_LCDIF_AXI_PODF 65
-@@ -145,6 +145,7 @@
- #define IMX6SL_CLK_USDHC4 132
- #define IMX6SL_CLK_PLL4_AUDIO_DIV 133
- #define IMX6SL_CLK_SPBA 134
--#define IMX6SL_CLK_END 135
-+#define IMX6SL_CLK_UART_OSC_4M 135
-+#define IMX6SL_CLK_END 136
-
- #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.14.17/arch/arm/boot/dts/include/dt-bindings/pinctrl/dra.h linux-imx6-3.14/arch/arm/boot/dts/include/dt-bindings/pinctrl/dra.h
---- linux-3.14.17/arch/arm/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/arm/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-09-09 10:13:51.912979115 +0200
-@@ -30,8 +30,7 @@
- #define MUX_MODE14 0xe
- #define MUX_MODE15 0xf
-
--#define PULL_ENA (0 << 16)
--#define PULL_DIS (1 << 16)
-+#define PULL_ENA (1 << 16)
- #define PULL_UP (1 << 17)
- #define INPUT_EN (1 << 18)
- #define SLEWCONTROL (1 << 19)
-@@ -39,10 +38,10 @@
- #define WAKEUP_EVENT (1 << 25)
-
- /* Active pin states */
--#define PIN_OUTPUT (0 | PULL_DIS)
-+#define PIN_OUTPUT 0
- #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
- #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
--#define PIN_INPUT (INPUT_EN | PULL_DIS)
-+#define PIN_INPUT INPUT_EN
- #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
- #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
- #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
diff -Nur linux-3.14.17/arch/arm/boot/dts/Makefile linux-imx6-3.14/arch/arm/boot/dts/Makefile
--- linux-3.14.17/arch/arm/boot/dts/Makefile 2014-08-14 03:38:34.000000000 +0200
+++ linux-imx6-3.14/arch/arm/boot/dts/Makefile 2014-09-09 10:13:47.192940626 +0200
@@ -42298,118 +42242,6 @@ diff -Nur linux-3.14.17/arch/hexagon/include/asm/elf.h linux-imx6-3.14/arch/hexa
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
-diff -Nur linux-3.14.17/arch/metag/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14/arch/metag/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.14.17/arch/metag/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/metag/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-09-09 10:13:51.908979081 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2013 Freescale Semiconductor, Inc.
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
-@@ -71,8 +71,8 @@
- #define IMX6SL_CLK_PERIPH 58
- #define IMX6SL_CLK_PERIPH2 59
- #define IMX6SL_CLK_OCRAM_PODF 60
--#define IMX6SL_CLK_PERIPH_CLK2_PODF 61
--#define IMX6SL_CLK_PERIPH2_CLK2_PODF 62
-+#define IMX6SL_CLK_PERIPH_CLK2 61
-+#define IMX6SL_CLK_PERIPH2_CLK2 62
- #define IMX6SL_CLK_IPG 63
- #define IMX6SL_CLK_CSI_PODF 64
- #define IMX6SL_CLK_LCDIF_AXI_PODF 65
-@@ -145,6 +145,7 @@
- #define IMX6SL_CLK_USDHC4 132
- #define IMX6SL_CLK_PLL4_AUDIO_DIV 133
- #define IMX6SL_CLK_SPBA 134
--#define IMX6SL_CLK_END 135
-+#define IMX6SL_CLK_UART_OSC_4M 135
-+#define IMX6SL_CLK_END 136
-
- #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.14.17/arch/metag/boot/dts/include/dt-bindings/pinctrl/dra.h linux-imx6-3.14/arch/metag/boot/dts/include/dt-bindings/pinctrl/dra.h
---- linux-3.14.17/arch/metag/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/metag/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-09-09 10:13:51.912979115 +0200
-@@ -30,8 +30,7 @@
- #define MUX_MODE14 0xe
- #define MUX_MODE15 0xf
-
--#define PULL_ENA (0 << 16)
--#define PULL_DIS (1 << 16)
-+#define PULL_ENA (1 << 16)
- #define PULL_UP (1 << 17)
- #define INPUT_EN (1 << 18)
- #define SLEWCONTROL (1 << 19)
-@@ -39,10 +38,10 @@
- #define WAKEUP_EVENT (1 << 25)
-
- /* Active pin states */
--#define PIN_OUTPUT (0 | PULL_DIS)
-+#define PIN_OUTPUT 0
- #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
- #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
--#define PIN_INPUT (INPUT_EN | PULL_DIS)
-+#define PIN_INPUT INPUT_EN
- #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
- #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
- #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
-diff -Nur linux-3.14.17/arch/mips/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14/arch/mips/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.14.17/arch/mips/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/mips/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-09-09 10:13:51.908979081 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2013 Freescale Semiconductor, Inc.
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
-@@ -71,8 +71,8 @@
- #define IMX6SL_CLK_PERIPH 58
- #define IMX6SL_CLK_PERIPH2 59
- #define IMX6SL_CLK_OCRAM_PODF 60
--#define IMX6SL_CLK_PERIPH_CLK2_PODF 61
--#define IMX6SL_CLK_PERIPH2_CLK2_PODF 62
-+#define IMX6SL_CLK_PERIPH_CLK2 61
-+#define IMX6SL_CLK_PERIPH2_CLK2 62
- #define IMX6SL_CLK_IPG 63
- #define IMX6SL_CLK_CSI_PODF 64
- #define IMX6SL_CLK_LCDIF_AXI_PODF 65
-@@ -145,6 +145,7 @@
- #define IMX6SL_CLK_USDHC4 132
- #define IMX6SL_CLK_PLL4_AUDIO_DIV 133
- #define IMX6SL_CLK_SPBA 134
--#define IMX6SL_CLK_END 135
-+#define IMX6SL_CLK_UART_OSC_4M 135
-+#define IMX6SL_CLK_END 136
-
- #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.14.17/arch/mips/boot/dts/include/dt-bindings/pinctrl/dra.h linux-imx6-3.14/arch/mips/boot/dts/include/dt-bindings/pinctrl/dra.h
---- linux-3.14.17/arch/mips/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/mips/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-09-09 10:13:51.912979115 +0200
-@@ -30,8 +30,7 @@
- #define MUX_MODE14 0xe
- #define MUX_MODE15 0xf
-
--#define PULL_ENA (0 << 16)
--#define PULL_DIS (1 << 16)
-+#define PULL_ENA (1 << 16)
- #define PULL_UP (1 << 17)
- #define INPUT_EN (1 << 18)
- #define SLEWCONTROL (1 << 19)
-@@ -39,10 +38,10 @@
- #define WAKEUP_EVENT (1 << 25)
-
- /* Active pin states */
--#define PIN_OUTPUT (0 | PULL_DIS)
-+#define PIN_OUTPUT 0
- #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
- #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
--#define PIN_INPUT (INPUT_EN | PULL_DIS)
-+#define PIN_INPUT INPUT_EN
- #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
- #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
- #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
diff -Nur linux-3.14.17/arch/parisc/include/asm/ftrace.h linux-imx6-3.14/arch/parisc/include/asm/ftrace.h
--- linux-3.14.17/arch/parisc/include/asm/ftrace.h 2014-08-14 03:38:34.000000000 +0200
+++ linux-imx6-3.14/arch/parisc/include/asm/ftrace.h 2014-09-09 10:13:48.088947937 +0200
@@ -42442,62 +42274,6 @@ diff -Nur linux-3.14.17/arch/parisc/include/uapi/asm/signal.h linux-imx6-3.14/ar
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
-diff -Nur linux-3.14.17/arch/powerpc/boot/dts/include/dt-bindings/clock/imx6sl-clock.h linux-imx6-3.14/arch/powerpc/boot/dts/include/dt-bindings/clock/imx6sl-clock.h
---- linux-3.14.17/arch/powerpc/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/powerpc/boot/dts/include/dt-bindings/clock/imx6sl-clock.h 2014-09-09 10:13:51.908979081 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2013 Freescale Semiconductor, Inc.
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
-@@ -71,8 +71,8 @@
- #define IMX6SL_CLK_PERIPH 58
- #define IMX6SL_CLK_PERIPH2 59
- #define IMX6SL_CLK_OCRAM_PODF 60
--#define IMX6SL_CLK_PERIPH_CLK2_PODF 61
--#define IMX6SL_CLK_PERIPH2_CLK2_PODF 62
-+#define IMX6SL_CLK_PERIPH_CLK2 61
-+#define IMX6SL_CLK_PERIPH2_CLK2 62
- #define IMX6SL_CLK_IPG 63
- #define IMX6SL_CLK_CSI_PODF 64
- #define IMX6SL_CLK_LCDIF_AXI_PODF 65
-@@ -145,6 +145,7 @@
- #define IMX6SL_CLK_USDHC4 132
- #define IMX6SL_CLK_PLL4_AUDIO_DIV 133
- #define IMX6SL_CLK_SPBA 134
--#define IMX6SL_CLK_END 135
-+#define IMX6SL_CLK_UART_OSC_4M 135
-+#define IMX6SL_CLK_END 136
-
- #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
-diff -Nur linux-3.14.17/arch/powerpc/boot/dts/include/dt-bindings/pinctrl/dra.h linux-imx6-3.14/arch/powerpc/boot/dts/include/dt-bindings/pinctrl/dra.h
---- linux-3.14.17/arch/powerpc/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/arch/powerpc/boot/dts/include/dt-bindings/pinctrl/dra.h 2014-09-09 10:13:51.912979115 +0200
-@@ -30,8 +30,7 @@
- #define MUX_MODE14 0xe
- #define MUX_MODE15 0xf
-
--#define PULL_ENA (0 << 16)
--#define PULL_DIS (1 << 16)
-+#define PULL_ENA (1 << 16)
- #define PULL_UP (1 << 17)
- #define INPUT_EN (1 << 18)
- #define SLEWCONTROL (1 << 19)
-@@ -39,10 +38,10 @@
- #define WAKEUP_EVENT (1 << 25)
-
- /* Active pin states */
--#define PIN_OUTPUT (0 | PULL_DIS)
-+#define PIN_OUTPUT 0
- #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
- #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
--#define PIN_INPUT (INPUT_EN | PULL_DIS)
-+#define PIN_INPUT INPUT_EN
- #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
- #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
- #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
diff -Nur linux-3.14.17/arch/s390/include/asm/cio.h linux-imx6-3.14/arch/s390/include/asm/cio.h
--- linux-3.14.17/arch/s390/include/asm/cio.h 2014-08-14 03:38:34.000000000 +0200
+++ linux-imx6-3.14/arch/s390/include/asm/cio.h 2014-09-09 10:13:48.264949374 +0200
@@ -232252,59 +232028,6 @@ diff -Nur linux-3.14.17/linaro/configs/preempt-rt.conf linux-imx6-3.14/linaro/co
+CONFIG_PREEMPT_RT_FULL=y
+CONFIG_SLUB=y
+# CONFIG_CPU_FREQ is not set
-diff -Nur linux-3.14.17/linaro/configs/ubuntu-minimal.conf linux-imx6-3.14/linaro/configs/ubuntu-minimal.conf
---- linux-3.14.17/linaro/configs/ubuntu-minimal.conf 1970-01-01 01:00:00.000000000 +0100
-+++ linux-imx6-3.14/linaro/configs/ubuntu-minimal.conf 2014-09-09 10:13:52.344982633 +0200
-@@ -0,0 +1,49 @@
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_CGROUPS=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-+CONFIG_SECCOMP=y
-+CONFIG_CC_STACKPROTECTOR=y
-+CONFIG_SYN_COOKIES=y
-+CONFIG_IPV6=y
-+CONFIG_NETLABEL=y
-+CONFIG_BRIDGE_NETFILTER=y
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NETFILTER_XT_CONNMARK=m
-+CONFIG_NETFILTER_XT_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_NAT_IPV4=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_NF_CONNTRACK_IPV6=m
-+CONFIG_NF_NAT_IPV6=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE=m
-+CONFIG_TUN=y
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_SIZE=65536
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_UINPUT=y
-+# CONFIG_DEVKMEM is not set
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+CONFIG_STRICT_DEVMEM=y
-+CONFIG_SECURITY=y
-+CONFIG_LSM_MMAP_MIN_ADDR=0
-+CONFIG_SECURITY_SELINUX=y
-+CONFIG_SECURITY_SMACK=y
-+CONFIG_SECURITY_APPARMOR=y
-+CONFIG_DEFAULT_SECURITY_APPARMOR=y
-+CONFIG_HUGETLBFS=y
-+CONFIG_HUGETLB_PAGE=y
-+CONFIG_TRANSPARENT_HUGEPAGE=y
-+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
diff -Nur linux-3.14.17/linaro/configs/vexpress64.conf linux-imx6-3.14/linaro/configs/vexpress64.conf
--- linux-3.14.17/linaro/configs/vexpress64.conf 1970-01-01 01:00:00.000000000 +0100
+++ linux-imx6-3.14/linaro/configs/vexpress64.conf 2014-09-09 10:13:52.344982633 +0200
@@ -240042,7 +239765,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/imx-wm8962.c linux-imx6-3.14/sound/soc/fsl
}
diff -Nur linux-3.14.17/sound/soc/fsl/Kconfig linux-imx6-3.14/sound/soc/fsl/Kconfig
--- linux-3.14.17/sound/soc/fsl/Kconfig 2014-08-14 03:38:34.000000000 +0200
-+++ linux-imx6-3.14/sound/soc/fsl/Kconfig 2014-09-09 10:13:52.784986217 +0200
++++ linux-imx6-3.14/sound/soc/fsl/Kconfig 2014-09-09 11:49:34.388606557 +0200
@@ -11,6 +11,12 @@
config SND_SOC_FSL_ESAI
tristate
@@ -240061,7 +239784,7 @@ diff -Nur linux-3.14.17/sound/soc/fsl/Kconfig linux-imx6-3.14/sound/soc/fsl/Kcon
select SND_SOC_GENERIC_DMAENGINE_PCM
+config SND_SOC_IMX_HDMI_DMA
-+ bool
++ tristate
+ select SND_SOC_GENERIC_DMAENGINE_PCM
+ select SND_SOC_IMX_PCM_DMA
+