diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2016-05-06 23:13:55 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2016-05-06 23:13:55 +1000 |
| commit | 5bbdb5d025e86c12e66ae8fe046a44f479ef87f0 (patch) | |
| tree | a67d085ee3539437aeb8c972aa2b6c7a4ac7953a | |
| parent | 9b4e9ec0f3fb2c56b4f77e82b092be465c30eabe (diff) | |
| download | meta-xilinx-5bbdb5d025e86c12e66ae8fe046a44f479ef87f0.tar.gz | |
linux-yocto_4.1: Fix up "amba" node label for Zynq include
Partly backport a patch from v4.3+ kernels that adds the "amba" label to
the amba bus node of the zynq-7000.dtsi.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
| -rw-r--r-- | recipes-kernel/linux/linux-yocto_4.1.bbappend | 5 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux/ARM-dts-zynq-Add-label-for-amba-node.patch | 27 |
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-yocto_4.1.bbappend b/recipes-kernel/linux/linux-yocto_4.1.bbappend index 651e0d72..02904d7a 100644 --- a/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
| @@ -2,3 +2,8 @@ | |||
| 2 | require linux-xilinx-configs.inc | 2 | require linux-xilinx-configs.inc |
| 3 | require linux-xilinx-machines.inc | 3 | require linux-xilinx-machines.inc |
| 4 | 4 | ||
| 5 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" | ||
| 6 | SRC_URI_append = " \ | ||
| 7 | file://ARM-dts-zynq-Add-label-for-amba-node.patch \ | ||
| 8 | " | ||
| 9 | |||
diff --git a/recipes-kernel/linux/linux/ARM-dts-zynq-Add-label-for-amba-node.patch b/recipes-kernel/linux/linux/ARM-dts-zynq-Add-label-for-amba-node.patch new file mode 100644 index 00000000..6c8b8db6 --- /dev/null +++ b/recipes-kernel/linux/linux/ARM-dts-zynq-Add-label-for-amba-node.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From d50be0b34c21d763d2fa17998e7f236f69c850bc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nathan Rossi <nathan@nathanrossi.com> | ||
| 3 | Date: Fri, 6 May 2016 23:09:53 +1000 | ||
| 4 | Subject: [PATCH] ARM: dts: zynq: Add label for amba node | ||
| 5 | |||
| 6 | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | ||
| 7 | Upstream-Status: Backport [backport part of 6835fe484] | ||
| 8 | --- | ||
| 9 | arch/arm/boot/dts/zynq-7000.dtsi | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi | ||
| 13 | index 9ea54b3..8a4af9c 100644 | ||
| 14 | --- a/arch/arm/boot/dts/zynq-7000.dtsi | ||
| 15 | +++ b/arch/arm/boot/dts/zynq-7000.dtsi | ||
| 16 | @@ -57,7 +57,7 @@ | ||
| 17 | regulator-always-on; | ||
| 18 | }; | ||
| 19 | |||
| 20 | - amba { | ||
| 21 | + amba: amba { | ||
| 22 | compatible = "simple-bus"; | ||
| 23 | #address-cells = <1>; | ||
| 24 | #size-cells = <1>; | ||
| 25 | -- | ||
| 26 | 2.8.1 | ||
| 27 | |||
