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

ARM: dts: imx6-tx6: add a .dtsi file for the MB7 baseboard

Move the MB7 specific settings to a separate .dtsi file to facilitate
supporting more module variants with this baseboard.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Lothar Waßmann and committed by
Shawn Guo
4649d838 1a9aae6f

+102 -48
+1 -8
arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
··· 43 43 #include "imx6dl.dtsi" 44 44 #include "imx6qdl-tx6.dtsi" 45 45 #include "imx6qdl-tx6-lvds.dtsi" 46 + #include "imx6qdl-tx6-mb7.dtsi" 46 47 47 48 / { 48 49 model = "Ka-Ro electronics TX6U-81xx Module on MB7 baseboard"; ··· 58 57 &backlight1 { 59 58 pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>; 60 59 turn-on-delay-ms = <35>; 61 - }; 62 - 63 - &can1 { 64 - status = "disabled"; 65 - }; 66 - 67 - &can2 { 68 - xceiver-supply = <&reg_3v3>; 69 60 };
+2 -40
arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
··· 40 40 */ 41 41 42 42 /dts-v1/; 43 - #include "imx6q.dtsi" 44 - #include "imx6qdl-tx6.dtsi" 45 - #include "imx6qdl-tx6-lvds.dtsi" 43 + #include "imx6q-tx6q-1110.dts" 44 + #include "imx6qdl-tx6-mb7.dtsi" 46 45 47 46 / { 48 47 model = "Ka-Ro electronics TX6Q-1110/-1130 Module on MB7 baseboard"; 49 - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; 50 - }; 51 - 52 - &backlight0 { 53 - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; 54 - turn-on-delay-ms = <35>; 55 - power-supply = <&reg_lcd1_pwr>; 56 - }; 57 - 58 - &backlight1 { 59 - pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>; 60 - turn-on-delay-ms = <35>; 61 - power-supply = <&reg_lcd1_pwr>; 62 - }; 63 - 64 - &can1 { 65 - status = "disabled"; 66 - }; 67 - 68 - &can2 { 69 - xceiver-supply = <&reg_3v3>; 70 - }; 71 - 72 - &ipu2 { 73 - status = "disabled"; 74 - }; 75 - 76 - &lvds0_panel { 77 - compatible = "edt,et057090dhu"; 78 - }; 79 - 80 - &lvds1_panel { 81 - compatible = "edt,et057090dhu"; 82 - }; 83 - 84 - &sata { 85 - status = "okay"; 86 48 };
+99
arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi
··· 1 + /* 2 + * Copyright 2017 Lothar Waßmann <LW@KARO-electronics.de> 3 + * 4 + * This file is dual-licensed: you can use it either under the terms 5 + * of the GPL or the X11 license, at your option. Note that this dual 6 + * licensing only applies to this file, and not this project as a 7 + * whole. 8 + * 9 + * a) This file is free software; you can redistribute it and/or 10 + * modify it under the terms of the GNU General Public License 11 + * version 2 as published by the Free Software Foundation. 12 + * 13 + * This file is distributed in the hope that it will be useful, 14 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 + * GNU General Public License for more details. 17 + * 18 + * Or, alternatively, 19 + * 20 + * b) Permission is hereby granted, free of charge, to any person 21 + * obtaining a copy of this software and associated documentation 22 + * files (the "Software"), to deal in the Software without 23 + * restriction, including without limitation the rights to use, 24 + * copy, modify, merge, publish, distribute, sublicense, and/or 25 + * sell copies of the Software, and to permit persons to whom the 26 + * Software is furnished to do so, subject to the following 27 + * conditions: 28 + * 29 + * The above copyright notice and this permission notice shall be 30 + * included in all copies or substantial portions of the Software. 31 + * 32 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 33 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 34 + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 35 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 36 + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 37 + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 38 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 39 + * OTHER DEALINGS IN THE SOFTWARE. 40 + */ 41 + 42 + / { 43 + backlight0 { 44 + pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>; 45 + turn-on-delay-ms = <35>; 46 + power-supply = <&reg_lcd1_pwr>; 47 + }; 48 + 49 + backlight1 { 50 + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; 51 + turn-on-delay-ms = <35>; 52 + power-supply = <&reg_lcd1_pwr>; 53 + }; 54 + 55 + lcd-panel { 56 + compatible = "edt,et057090dhu"; 57 + bus-format-override = "rgb24"; 58 + pixelclk-active = <0>; 59 + }; 60 + 61 + lvds0-panel { 62 + compatible = "edt,etml1010g0dka"; 63 + bus-format-override = "spwg-18"; 64 + pixelclk-active = <0>; 65 + }; 66 + 67 + lvds1-panel { 68 + compatible = "edt,etml1010g0dka"; 69 + bus-format-override = "spwg-18"; 70 + pixelclk-active = <0>; 71 + }; 72 + }; 73 + 74 + &can1 { 75 + status = "disabled"; 76 + }; 77 + 78 + &can2 { 79 + xceiver-supply = <&reg_3v3>; 80 + }; 81 + 82 + &ds1339 { 83 + /* 84 + * The backup voltage of the module internal RTC is not wired 85 + * by default on the MB7, so disable that RTC chip. 86 + */ 87 + status = "disabled"; 88 + }; 89 + 90 + &i2c3 { 91 + rtc: mcp7940x@6f { 92 + compatible = "microchip,mcp7940x"; 93 + reg = <0x6f>; 94 + }; 95 + }; 96 + 97 + &reg_lcd0_pwr { 98 + status = "disabled"; 99 + };