diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-10 18:42:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-10 18:42:02 +0200 |
commit | b7e2a7c96a3a2a02101d613947069c3a7aef0848 (patch) | |
tree | d111b607d526642e526fdf62540d50a366b359c9 /arm-imx6-hummingboard2.patch | |
parent | 13d4fee010db62909b0a09e39e93b9afa0af7cd9 (diff) | |
parent | 48953e19ba24578846ec4aebbbbc0b89ff539b4c (diff) | |
download | kernel-b7e2a7c96a3a2a02101d613947069c3a7aef0848.tar.gz kernel-b7e2a7c96a3a2a02101d613947069c3a7aef0848.tar.xz kernel-b7e2a7c96a3a2a02101d613947069c3a7aef0848.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git7.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git7.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git7.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git7.1.vanilla.knurd.1.fc24
Diffstat (limited to 'arm-imx6-hummingboard2.patch')
-rw-r--r-- | arm-imx6-hummingboard2.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm-imx6-hummingboard2.patch b/arm-imx6-hummingboard2.patch index bcb93214e..9c55a7b81 100644 --- a/arm-imx6-hummingboard2.patch +++ b/arm-imx6-hummingboard2.patch @@ -26,21 +26,21 @@ index 011808490fed..ccdff6650541 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -353,6 +353,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ - imx6dl-gw552x.dtb \ - imx6dl-gw553x.dtb \ + imx6dl-gw5903.dtb \ + imx6dl-gw5904.dtb \ imx6dl-hummingboard.dtb \ + imx6dl-hummingboard2.dtb \ imx6dl-icore.dtb \ imx6dl-icore-rqs.dtb \ imx6dl-nit6xlite.dtb \ @@ -397,6 +398,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ - imx6q-gw553x.dtb \ + imx6q-gw5904.dtb \ imx6q-h100.dtb \ imx6q-hummingboard.dtb \ + imx6q-hummingboard2.dtb \ imx6q-icore.dtb \ - imx6q-icore-rqs.dtb \ - imx6q-marsboard.dtb \ + imx6q-icore-ofcap10.dtb \ + imx6q-icore-ofcap12.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts new file mode 100644 index 000000000000..990b5050de5b |