Skip to content

Commit a4855ad

Browse files
jnettletjnettlet
committed
ARM: dts: imxqdl: hummingboard2: add missing eMMC variants
Before the release of the 1.5 SOM the Hummingboard 2 had the option of on carrier eMMC. Add the device-tree variant that will cover hummingboard2 devices with onboard emmc and rev 1.3 soms with broadcom wifi and bluetooth. Signed-off-by: Jon Nettleton <jon@solid-run.com>
1 parent a435baa commit a4855ad

File tree

3 files changed

+126
-0
lines changed

3 files changed

+126
-0
lines changed

‎arch/arm/boot/dts/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
352352
imx6dl-hummingboard-emmc-som-v15.dtb \
353353
imx6dl-hummingboard-som-v15.dtb \
354354
imx6dl-hummingboard2.dtb \
355+
imx6dl-hummingboard2-emmc.dtb \
355356
imx6dl-hummingboard2-emmc-som-v15.dtb \
356357
imx6dl-hummingboard2-som-v15.dtb \
357358
imx6dl-hl.dtb \
@@ -449,6 +450,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
449450
imx6q-hummingboard-emmc-som-v15.dtb \
450451
imx6q-hummingboard-som-v15.dtb \
451452
imx6q-hummingboard2.dtb \
453+
imx6q-hummingboard2-emmc.dtb \
452454
imx6q-hummingboard2-emmc-som-v15.dtb \
453455
imx6q-hummingboard2-som-v15.dtb \
454456
imx6q-icore-rqs.dtb \

‎arch/arm/boot/dts/imx6dl-hummingboard2-emmc.dts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/*
2+
* Device Tree file for SolidRun HummingBoard2
3+
* Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
4+
* Based on work by Russell King
5+
*
6+
* This file is dual-licensed: you can use it either under the terms
7+
* of the GPL or the X11 license, at your option. Note that this dual
8+
* licensing only applies to this file, and not this project as a
9+
* whole.
10+
*
11+
* a) This file is free software; you can redistribute it and/or
12+
* modify it under the terms of the GNU General Public License as
13+
* published by the Free Software Foundation; either version 2 of the
14+
* License.
15+
*
16+
* This file is distributed in the hope that it will be useful
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU General Public License for more details.
20+
*
21+
* Or, alternatively
22+
*
23+
* b) Permission is hereby granted, free of charge, to any person
24+
* obtaining a copy of this software and associated documentation
25+
* files (the "Software"), to deal in the Software without
26+
* restriction, including without limitation the rights to use
27+
* copy, modify, merge, publish, distribute, sublicense, and/or
28+
* sell copies of the Software, and to permit persons to whom the
29+
* Software is furnished to do so, subject to the following
30+
* conditions:
31+
*
32+
* The above copyright notice and this permission notice shall be
33+
* included in all copies or substantial portions of the Software.
34+
*
35+
* THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
36+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
37+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
38+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
39+
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
40+
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
41+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
42+
* OTHER DEALINGS IN THE SOFTWARE.
43+
*/
44+
/dts-v1/;
45+
46+
#include "imx6dl.dtsi"
47+
#include "imx6qdl-sr-som.dtsi"
48+
#include "imx6qdl-sr-som-brcm.dtsi"
49+
#include "imx6qdl-hummingboard2.dtsi"
50+
#include "imx6qdl-hummingboard2-emmc.dtsi"
51+
#ifdef MXC_USE_VENDOR_DRIVERS
52+
#include "imx6qdl-hummingboard2-vendor.dtsi"
53+
#endif
54+
55+
/ {
56+
model = "SolidRun HummingBoard2 Solo/DualLite (1.5som+emmc)";
57+
compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
58+
};

‎arch/arm/boot/dts/imx6q-hummingboard2-emmc.dts

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Device Tree file for SolidRun HummingBoard2
3+
* Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
4+
* Based on work by Russell King
5+
*
6+
* This file is dual-licensed: you can use it either under the terms
7+
* of the GPL or the X11 license, at your option. Note that this dual
8+
* licensing only applies to this file, and not this project as a
9+
* whole.
10+
*
11+
* a) This file is free software; you can redistribute it and/or
12+
* modify it under the terms of the GNU General Public License as
13+
* published by the Free Software Foundation; either version 2 of the
14+
* License.
15+
*
16+
* This file is distributed in the hope that it will be useful
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU General Public License for more details.
20+
*
21+
* Or, alternatively
22+
*
23+
* b) Permission is hereby granted, free of charge, to any person
24+
* obtaining a copy of this software and associated documentation
25+
* files (the "Software"), to deal in the Software without
26+
* restriction, including without limitation the rights to use
27+
* copy, modify, merge, publish, distribute, sublicense, and/or
28+
* sell copies of the Software, and to permit persons to whom the
29+
* Software is furnished to do so, subject to the following
30+
* conditions:
31+
*
32+
* The above copyright notice and this permission notice shall be
33+
* included in all copies or substantial portions of the Software.
34+
*
35+
* THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
36+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
37+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
38+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
39+
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
40+
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
41+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
42+
* OTHER DEALINGS IN THE SOFTWARE.
43+
*/
44+
/dts-v1/;
45+
46+
#include "imx6q.dtsi"
47+
#include "imx6qdl-sr-som.dtsi"
48+
#include "imx6qdl-sr-som-brcm.dtsi"
49+
#include "imx6qdl-hummingboard2.dtsi"
50+
#include "imx6qdl-hummingboard2-emmc.dtsi"
51+
#ifdef MXC_USE_VENDOR_DRIVERS
52+
#include "imx6qdl-hummingboard2-vendor.dtsi"
53+
#endif
54+
55+
/ {
56+
model = "SolidRun HummingBoard2 Dual/Quad (1.5som+emmc)";
57+
compatible = "solidrun,hummingboard2/q", "fsl,imx6q";
58+
};
59+
60+
&sata {
61+
status = "okay";
62+
fsl,transmit-level-mV = <1104>;
63+
fsl,transmit-boost-mdB = <0>;
64+
fsl,transmit-atten-16ths = <9>;
65+
fsl,no-spread-spectrum;
66+
};

0 commit comments

Comments
 (0)