Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6qdl-hummingboard2: add v1.5 som without eMMC

Add support for the v1.5 SOM with TI Wi-Fi but without eMMC. As the
pinmux settings are different for the microsom, we need to use a
separate board-level dts for this as there is no support for overlays.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Russell King and committed by
Shawn Guo
b80ce831 0591a8cc

+118
+2
arch/arm/boot/dts/Makefile
··· 389 389 imx6dl-hummingboard-emmc-som-v15.dtb \ 390 390 imx6dl-hummingboard-som-v15.dtb \ 391 391 imx6dl-hummingboard2.dtb \ 392 + imx6dl-hummingboard2-som-v15.dtb \ 392 393 imx6dl-icore.dtb \ 393 394 imx6dl-icore-rqs.dtb \ 394 395 imx6dl-nit6xlite.dtb \ ··· 451 450 imx6q-hummingboard-emmc-som-v15.dtb \ 452 451 imx6q-hummingboard-som-v15.dtb \ 453 452 imx6q-hummingboard2.dtb \ 453 + imx6q-hummingboard2-som-v15.dtb \ 454 454 imx6q-icore.dtb \ 455 455 imx6q-icore-ofcap10.dtb \ 456 456 imx6q-icore-ofcap12.dtb \
+54
arch/arm/boot/dts/imx6dl-hummingboard2-som-v15.dts
··· 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-ti.dtsi" 49 + #include "imx6qdl-hummingboard2.dtsi" 50 + 51 + / { 52 + model = "SolidRun HummingBoard2 Solo/DualLite (1.5som)"; 53 + compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl"; 54 + };
+62
arch/arm/boot/dts/imx6q-hummingboard2-som-v15.dts
··· 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-ti.dtsi" 49 + #include "imx6qdl-hummingboard2.dtsi" 50 + 51 + / { 52 + model = "SolidRun HummingBoard2 Dual/Quad (1.5som)"; 53 + compatible = "solidrun,hummingboard2/q", "fsl,imx6q"; 54 + }; 55 + 56 + &sata { 57 + status = "okay"; 58 + fsl,transmit-level-mV = <1104>; 59 + fsl,transmit-boost-mdB = <0>; 60 + fsl,transmit-atten-16ths = <9>; 61 + fsl,no-spread-spectrum; 62 + };