diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-03-30 08:25:04 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-31 09:15:04 +0100 |
commit | 0a1d6213f7b5321762247b412e383720045aebd4 (patch) | |
tree | 3c4b52972f8e01f23a48b98b0e919f369dbb92e7 | |
parent | 6ce880241beebf1f7a8ff5e138e15514aa4d0251 (diff) | |
download | poky-0a1d6213f7b5321762247b412e383720045aebd4.tar.gz |
linux-yocto/4.1: Intel Broxton: pwm backports
Integrating the following mainline changes:
afaf425e796c pwm: Add the pwm_is_enabled() helper
023721c3d067 pwm: atmel: Fix incorrect CDTY value after disabling
cd9fe8adb313 pwm: atmel: Fix incorrect CDTY value after enabling
3f445ca6df1f pwm: lpss: Rework the sequence of programming PWM_SW_UPDATE
9a51f622bdc9 pwm: lpss: Select core part automatically
8ee11b6f80ba pwm: lpss: Update PWM setting for Broxton
148228a52c2d pwm: lpss: Remove ->free() callback
e20d95bcd0b3 pwm: lpss: Add support for runtime PM
b2248acf6f8b pwm: lpss: Add more Intel Broxton IDs
85e8566bd241 pwm: lpss: Support all four PWMs on Intel Broxton
1bcdcb6275bf pwm: lpss: Add support for multiple PWMs
(From OE-Core rev: e721858657b8641fda94f84866c37668580bd7a9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 2b52aa56f2..48f9f08957 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base" | |||
2 | 2 | ||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | SRCREV_machine ?= "6b39da48a67a738eca3024c86ff977d5b6ba02dd" | 5 | SRCREV_machine ?= "23325988c373852d75515cfa9582681a036d1bfd" |
6 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" | 6 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" |
7 | 7 | ||
8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 3361b1787a..13c30c70cb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "2b0cc0f0ca23ec54d66ea697fe929e99f219f9a4" | 12 | SRCREV_machine ?= "afaf425e796c6b72c10e869ea6ad20295033f956" |
13 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" | 13 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 72cca01e2a..2841aa211c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "6213179ad1ff33d166b57c080db39ec7f0f5caff" | 14 | SRCREV_machine_qemuarm ?= "4f8fe4c56eb352573a19b797d2c4d1b1f4e38831" |
15 | SRCREV_machine_qemuarm64 ?= "2b0cc0f0ca23ec54d66ea697fe929e99f219f9a4" | 15 | SRCREV_machine_qemuarm64 ?= "afaf425e796c6b72c10e869ea6ad20295033f956" |
16 | SRCREV_machine_qemumips ?= "31411f4bccac5574a1be7c3e34f9f7ca25306bb1" | 16 | SRCREV_machine_qemumips ?= "85f5c8b85364ea8e7f8d47a492c7047bfd9aa963" |
17 | SRCREV_machine_qemuppc ?= "2b0cc0f0ca23ec54d66ea697fe929e99f219f9a4" | 17 | SRCREV_machine_qemuppc ?= "afaf425e796c6b72c10e869ea6ad20295033f956" |
18 | SRCREV_machine_qemux86 ?= "2b0cc0f0ca23ec54d66ea697fe929e99f219f9a4" | 18 | SRCREV_machine_qemux86 ?= "afaf425e796c6b72c10e869ea6ad20295033f956" |
19 | SRCREV_machine_qemux86-64 ?= "2b0cc0f0ca23ec54d66ea697fe929e99f219f9a4" | 19 | SRCREV_machine_qemux86-64 ?= "afaf425e796c6b72c10e869ea6ad20295033f956" |
20 | SRCREV_machine_qemumips64 ?= "556291afe538f9d31d707661bea5054a9af2add9" | 20 | SRCREV_machine_qemumips64 ?= "8ac723e2fb023bd3b168d3fb914c09797bc20ed4" |
21 | SRCREV_machine ?= "2b0cc0f0ca23ec54d66ea697fe929e99f219f9a4" | 21 | SRCREV_machine ?= "afaf425e796c6b72c10e869ea6ad20295033f956" |
22 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" | 22 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |