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

ARM: dts: mxs: Split M28EVK into SoM and EVK parts

This patch splits the M28EVK device tree file into a common SoM
part and an EVK part. This is needed to make it easier for users
of the SoM to put it into different, non-reference baseboard.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

authored by

Marek Vasut and committed by
Shawn Guo
acb7ea5e 5363dcab

+88 -61
+87
arch/arm/boot/dts/imx28-m28.dtsi
··· 1 + /* 2 + * Copyright (C) 2014 Marek Vasut <marex@denx.de> 3 + * 4 + * The code contained herein is licensed under the GNU General Public 5 + * License. You may obtain a copy of the GNU General Public License 6 + * Version 2 or later at the following locations: 7 + * 8 + * http://www.opensource.org/licenses/gpl-license.html 9 + * http://www.gnu.org/copyleft/gpl.html 10 + */ 11 + 12 + #include "imx28.dtsi" 13 + 14 + / { 15 + model = "DENX M28"; 16 + compatible = "denx,m28", "fsl,imx28"; 17 + 18 + memory { 19 + reg = <0x40000000 0x08000000>; 20 + }; 21 + 22 + apb@80000000 { 23 + apbh@80000000 { 24 + gpmi-nand@8000c000 { 25 + #address-cells = <1>; 26 + #size-cells = <1>; 27 + pinctrl-names = "default"; 28 + pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; 29 + status = "okay"; 30 + 31 + partition@0 { 32 + label = "bootloader"; 33 + reg = <0x00000000 0x00300000>; 34 + read-only; 35 + }; 36 + 37 + partition@1 { 38 + label = "environment"; 39 + reg = <0x00300000 0x00080000>; 40 + }; 41 + 42 + partition@2 { 43 + label = "redundant-environment"; 44 + reg = <0x00380000 0x00080000>; 45 + }; 46 + 47 + partition@3 { 48 + label = "kernel"; 49 + reg = <0x00400000 0x00400000>; 50 + }; 51 + 52 + partition@4 { 53 + label = "filesystem"; 54 + reg = <0x00800000 0x0f800000>; 55 + }; 56 + }; 57 + }; 58 + 59 + apbx@80040000 { 60 + i2c0: i2c@80058000 { 61 + pinctrl-names = "default"; 62 + pinctrl-0 = <&i2c0_pins_a>; 63 + status = "okay"; 64 + 65 + rtc: rtc@68 { 66 + compatible = "stm,m41t62"; 67 + reg = <0x68>; 68 + }; 69 + }; 70 + }; 71 + }; 72 + 73 + regulators { 74 + compatible = "simple-bus"; 75 + #address-cells = <1>; 76 + #size-cells = <0>; 77 + 78 + reg_3p3v: regulator@0 { 79 + compatible = "regulator-fixed"; 80 + reg = <0>; 81 + regulator-name = "3P3V"; 82 + regulator-min-microvolt = <3300000>; 83 + regulator-max-microvolt = <3300000>; 84 + regulator-always-on; 85 + }; 86 + }; 87 + };
+1 -61
arch/arm/boot/dts/imx28-m28evk.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - #include "imx28.dtsi" 13 + #include "imx28-m28.dtsi" 14 14 15 15 / { 16 16 model = "DENX M28EVK"; 17 17 compatible = "denx,m28evk", "fsl,imx28"; 18 18 19 - memory { 20 - reg = <0x40000000 0x08000000>; 21 - }; 22 - 23 19 apb@80000000 { 24 20 apbh@80000000 { 25 - gpmi-nand@8000c000 { 26 - #address-cells = <1>; 27 - #size-cells = <1>; 28 - pinctrl-names = "default"; 29 - pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; 30 - status = "okay"; 31 - 32 - partition@0 { 33 - label = "bootloader"; 34 - reg = <0x00000000 0x00300000>; 35 - read-only; 36 - }; 37 - 38 - partition@1 { 39 - label = "environment"; 40 - reg = <0x00300000 0x00080000>; 41 - }; 42 - 43 - partition@2 { 44 - label = "redundant-environment"; 45 - reg = <0x00380000 0x00080000>; 46 - }; 47 - 48 - partition@3 { 49 - label = "kernel"; 50 - reg = <0x00400000 0x00400000>; 51 - }; 52 - 53 - partition@4 { 54 - label = "filesystem"; 55 - reg = <0x00800000 0x0f800000>; 56 - }; 57 - }; 58 - 59 21 ssp0: ssp@80010000 { 60 22 compatible = "fsl,imx28-mmc"; 61 23 pinctrl-names = "default"; ··· 137 175 }; 138 176 139 177 i2c0: i2c@80058000 { 140 - pinctrl-names = "default"; 141 - pinctrl-0 = <&i2c0_pins_a>; 142 - status = "okay"; 143 - 144 178 sgtl5000: codec@0a { 145 179 compatible = "fsl,sgtl5000"; 146 180 reg = <0x0a>; ··· 149 191 compatible = "atmel,24c128"; 150 192 reg = <0x51>; 151 193 pagesize = <32>; 152 - }; 153 - 154 - rtc: rtc@68 { 155 - compatible = "stm,m41t62"; 156 - reg = <0x68>; 157 194 }; 158 195 }; 159 196 ··· 237 284 }; 238 285 239 286 regulators { 240 - compatible = "simple-bus"; 241 - #address-cells = <1>; 242 - #size-cells = <0>; 243 - 244 - reg_3p3v: regulator@0 { 245 - compatible = "regulator-fixed"; 246 - reg = <0>; 247 - regulator-name = "3P3V"; 248 - regulator-min-microvolt = <3300000>; 249 - regulator-max-microvolt = <3300000>; 250 - regulator-always-on; 251 - }; 252 - 253 287 reg_vddio_sd0: regulator@1 { 254 288 compatible = "regulator-fixed"; 255 289 reg = <1>;