ARM: dts: imx27-phytec-phycore-som: Rename file to .dtsi
authorAlexander Shiyan <shc_work@mail.ru>
Sat, 7 Dec 2013 08:26:36 +0000 (12:26 +0400)
committerShawn Guo <shawn.guo@linaro.org>
Sun, 9 Feb 2014 13:33:25 +0000 (21:33 +0800)
PCM-038 module cannot be used standalone. This patch renames
module file to .dtsi and excludes it from compilation.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
arch/arm/boot/dts/imx27-phytec-phycore-som.dts [deleted file]
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi [new file with mode: 0644]

index aec8aafd7d5f0cc971957785786d37b09b3b4fd4..cbdc7abf5519d6d833eb086fa6bdb985bdc0f4b9 100644 (file)
@@ -139,7 +139,6 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
        imx27-pdk.dtb \
-       imx27-phytec-phycore-som.dtb \
        imx27-phytec-phycore-rdk.dtb \
        imx27-phytec-phycard-s-som.dtb \
        imx27-phytec-phycard-s-rdk.dtb \
index 834fde84186e292dc16529be2e2dd6d38dac4213..fc2ed30eb008f8a6c99216d7deb0061af8ddad6d 100644 (file)
@@ -7,7 +7,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "imx27-phytec-phycore-som.dts"
+#include "imx27-phytec-phycore-som.dtsi"
 
 / {
        model = "Phytec pcm970";
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
deleted file mode 100644 (file)
index ab75b72..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2012 Sascha Hauer, Pengutronix
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "imx27.dtsi"
-
-/ {
-       model = "Phytec pcm038";
-       compatible = "phytec,imx27-pcm038", "fsl,imx27";
-
-       memory {
-               reg = <0xa0000000 0x08000000>;
-       };
-
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               reg_3v3: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "3V3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-               };
-       };
-};
-
-&audmux {
-       status = "okay";
-
-       /* SSI0 <=> PINS_4 (MC13783 Audio) */
-       ssi0 {
-               fsl,audmux-port = <0>;
-               fsl,port-config = <0xcb205000>;
-       };
-
-       pins4 {
-               fsl,audmux-port = <2>;
-               fsl,port-config = <0x00001000>;
-       };
-};
-
-&cspi1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_cspi1>;
-       fsl,spi-num-chipselects = <1>;
-       cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
-       status = "okay";
-
-       pmic: mc13783@0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "fsl,mc13783";
-               spi-max-frequency = <20000000>;
-               reg = <0>;
-               interrupt-parent = <&gpio2>;
-               interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
-               fsl,mc13xxx-uses-adc;
-               fsl,mc13xxx-uses-rtc;
-
-               regulators {
-                       /* SW1A and SW1B joined operation */
-                       sw1_reg: sw1a {
-                               regulator-min-microvolt = <1200000>;
-                               regulator-max-microvolt = <1520000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       /* SW2A and SW2B joined operation */
-                       sw2_reg: sw2a {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       sw3_reg: sw3 {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5000000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       vaudio_reg: vaudio {
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       violo_reg: violo {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       viohi_reg: viohi {
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       vgen_reg: vgen {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       vcam_reg: vcam {
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <2800000>;
-                       };
-
-                       vrf1_reg: vrf1 {
-                               regulator-min-microvolt = <2775000>;
-                               regulator-max-microvolt = <2775000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       vrf2_reg: vrf2 {
-                               regulator-min-microvolt = <2775000>;
-                               regulator-max-microvolt = <2775000>;
-                               regulator-always-on;
-                               regulator-boot-on;
-                       };
-
-                       vmmc1_reg: vmmc1 {
-                               regulator-min-microvolt = <1600000>;
-                               regulator-max-microvolt = <3000000>;
-                       };
-
-                       gpo1_reg: gpo1 { };
-
-                       pwgt1spi_reg: pwgt1spi {
-                               regulator-always-on;
-                       };
-               };
-       };
-};
-
-&fec {
-       phy-mode = "mii";
-       phy-reset-gpios = <&gpio3 30 GPIO_ACTIVE_HIGH>;
-       phy-supply = <&reg_3v3>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec1>;
-       status = "okay";
-};
-
-&i2c2 {
-       clock-frequency = <400000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-
-       at24@52 {
-               compatible = "at,24c32";
-               pagesize = <32>;
-               reg = <0x52>;
-       };
-
-       pcf8563@51 {
-               compatible = "nxp,pcf8563";
-               reg = <0x51>;
-       };
-
-       lm75@4a {
-               compatible = "national,lm75";
-               reg = <0x4a>;
-       };
-};
-
-&iomuxc {
-       imx27_phycore_som {
-               pinctrl_cspi1: cspi1grp {
-                       fsl,pins = <
-                               MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x0
-                               MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x0
-                               MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x0
-                               MX27_PAD_CSPI1_SS0__GPIO4_28    0x0 /* SPI1 CS0 */
-                               MX27_PAD_USB_PWR__GPIO2_23      0x0 /* PMIC IRQ */
-                       >;
-               };
-
-               pinctrl_fec1: fec1grp {
-                       fsl,pins = <
-                               MX27_PAD_SD3_CMD__FEC_TXD0 0x0
-                               MX27_PAD_SD3_CLK__FEC_TXD1 0x0
-                               MX27_PAD_ATA_DATA0__FEC_TXD2 0x0
-                               MX27_PAD_ATA_DATA1__FEC_TXD3 0x0
-                               MX27_PAD_ATA_DATA2__FEC_RX_ER 0x0
-                               MX27_PAD_ATA_DATA3__FEC_RXD1 0x0
-                               MX27_PAD_ATA_DATA4__FEC_RXD2 0x0
-                               MX27_PAD_ATA_DATA5__FEC_RXD3 0x0
-                               MX27_PAD_ATA_DATA6__FEC_MDIO 0x0
-                               MX27_PAD_ATA_DATA7__FEC_MDC 0x0
-                               MX27_PAD_ATA_DATA8__FEC_CRS 0x0
-                               MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x0
-                               MX27_PAD_ATA_DATA10__FEC_RXD0 0x0
-                               MX27_PAD_ATA_DATA11__FEC_RX_DV 0x0
-                               MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x0
-                               MX27_PAD_ATA_DATA13__FEC_COL 0x0
-                               MX27_PAD_ATA_DATA14__FEC_TX_ER 0x0
-                               MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
-                               MX27_PAD_SSI3_TXDAT__GPIO3_30   0x0 /* FEC RST */
-                       >;
-               };
-
-               pinctrl_i2c2: i2c2grp {
-                       fsl,pins = <
-                               MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
-                               MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
-                       >;
-               };
-       };
-};
-
-&nfc {
-       nand-bus-width = <8>;
-       nand-ecc-mode = "hw";
-       nand-on-flash-bbt;
-       status = "okay";
-};
-
-&weim {
-       status = "okay";
-
-       nor: nor@c0000000 {
-               compatible = "cfi-flash";
-               reg = <0 0x00000000 0x02000000>;
-               bank-width = <2>;
-               linux,mtd-name = "physmap-flash.0";
-               fsl,weim-cs-timing = <0x22c2cf00 0x75000d01 0x00000900>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-       };
-
-       sram: sram@c8000000 {
-               compatible = "mtd-ram";
-               reg = <1 0x00000000 0x00800000>;
-               bank-width = <2>;
-               linux,mtd-name = "mtd-ram.0";
-               fsl,weim-cs-timing = <0x0000d843 0x22252521 0x22220a00>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-       };
-};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
new file mode 100644 (file)
index 0000000..ab75b72
--- /dev/null
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2012 Sascha Hauer, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx27.dtsi"
+
+/ {
+       model = "Phytec pcm038";
+       compatible = "phytec,imx27-pcm038", "fsl,imx27";
+
+       memory {
+               reg = <0xa0000000 0x08000000>;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               reg_3v3: regulator@0 {
+                       compatible = "regulator-fixed";
+                       reg = <0>;
+                       regulator-name = "3V3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+       };
+};
+
+&audmux {
+       status = "okay";
+
+       /* SSI0 <=> PINS_4 (MC13783 Audio) */
+       ssi0 {
+               fsl,audmux-port = <0>;
+               fsl,port-config = <0xcb205000>;
+       };
+
+       pins4 {
+               fsl,audmux-port = <2>;
+               fsl,port-config = <0x00001000>;
+       };
+};
+
+&cspi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_cspi1>;
+       fsl,spi-num-chipselects = <1>;
+       cs-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
+       status = "okay";
+
+       pmic: mc13783@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "fsl,mc13783";
+               spi-max-frequency = <20000000>;
+               reg = <0>;
+               interrupt-parent = <&gpio2>;
+               interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
+               fsl,mc13xxx-uses-adc;
+               fsl,mc13xxx-uses-rtc;
+
+               regulators {
+                       /* SW1A and SW1B joined operation */
+                       sw1_reg: sw1a {
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1520000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       /* SW2A and SW2B joined operation */
+                       sw2_reg: sw2a {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       sw3_reg: sw3 {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5000000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       vaudio_reg: vaudio {
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       violo_reg: violo {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       viohi_reg: viohi {
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       vgen_reg: vgen {
+                               regulator-min-microvolt = <1500000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       vcam_reg: vcam {
+                               regulator-min-microvolt = <2800000>;
+                               regulator-max-microvolt = <2800000>;
+                       };
+
+                       vrf1_reg: vrf1 {
+                               regulator-min-microvolt = <2775000>;
+                               regulator-max-microvolt = <2775000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       vrf2_reg: vrf2 {
+                               regulator-min-microvolt = <2775000>;
+                               regulator-max-microvolt = <2775000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+
+                       vmmc1_reg: vmmc1 {
+                               regulator-min-microvolt = <1600000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+
+                       gpo1_reg: gpo1 { };
+
+                       pwgt1spi_reg: pwgt1spi {
+                               regulator-always-on;
+                       };
+               };
+       };
+};
+
+&fec {
+       phy-mode = "mii";
+       phy-reset-gpios = <&gpio3 30 GPIO_ACTIVE_HIGH>;
+       phy-supply = <&reg_3v3>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_fec1>;
+       status = "okay";
+};
+
+&i2c2 {
+       clock-frequency = <400000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
+
+       at24@52 {
+               compatible = "at,24c32";
+               pagesize = <32>;
+               reg = <0x52>;
+       };
+
+       pcf8563@51 {
+               compatible = "nxp,pcf8563";
+               reg = <0x51>;
+       };
+
+       lm75@4a {
+               compatible = "national,lm75";
+               reg = <0x4a>;
+       };
+};
+
+&iomuxc {
+       imx27_phycore_som {
+               pinctrl_cspi1: cspi1grp {
+                       fsl,pins = <
+                               MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x0
+                               MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x0
+                               MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x0
+                               MX27_PAD_CSPI1_SS0__GPIO4_28    0x0 /* SPI1 CS0 */
+                               MX27_PAD_USB_PWR__GPIO2_23      0x0 /* PMIC IRQ */
+                       >;
+               };
+
+               pinctrl_fec1: fec1grp {
+                       fsl,pins = <
+                               MX27_PAD_SD3_CMD__FEC_TXD0 0x0
+                               MX27_PAD_SD3_CLK__FEC_TXD1 0x0
+                               MX27_PAD_ATA_DATA0__FEC_TXD2 0x0
+                               MX27_PAD_ATA_DATA1__FEC_TXD3 0x0
+                               MX27_PAD_ATA_DATA2__FEC_RX_ER 0x0
+                               MX27_PAD_ATA_DATA3__FEC_RXD1 0x0
+                               MX27_PAD_ATA_DATA4__FEC_RXD2 0x0
+                               MX27_PAD_ATA_DATA5__FEC_RXD3 0x0
+                               MX27_PAD_ATA_DATA6__FEC_MDIO 0x0
+                               MX27_PAD_ATA_DATA7__FEC_MDC 0x0
+                               MX27_PAD_ATA_DATA8__FEC_CRS 0x0
+                               MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x0
+                               MX27_PAD_ATA_DATA10__FEC_RXD0 0x0
+                               MX27_PAD_ATA_DATA11__FEC_RX_DV 0x0
+                               MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x0
+                               MX27_PAD_ATA_DATA13__FEC_COL 0x0
+                               MX27_PAD_ATA_DATA14__FEC_TX_ER 0x0
+                               MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
+                               MX27_PAD_SSI3_TXDAT__GPIO3_30   0x0 /* FEC RST */
+                       >;
+               };
+
+               pinctrl_i2c2: i2c2grp {
+                       fsl,pins = <
+                               MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
+                               MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
+                       >;
+               };
+       };
+};
+
+&nfc {
+       nand-bus-width = <8>;
+       nand-ecc-mode = "hw";
+       nand-on-flash-bbt;
+       status = "okay";
+};
+
+&weim {
+       status = "okay";
+
+       nor: nor@c0000000 {
+               compatible = "cfi-flash";
+               reg = <0 0x00000000 0x02000000>;
+               bank-width = <2>;
+               linux,mtd-name = "physmap-flash.0";
+               fsl,weim-cs-timing = <0x22c2cf00 0x75000d01 0x00000900>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+       };
+
+       sram: sram@c8000000 {
+               compatible = "mtd-ram";
+               reg = <1 0x00000000 0x00800000>;
+               bank-width = <2>;
+               linux,mtd-name = "mtd-ram.0";
+               fsl,weim-cs-timing = <0x0000d843 0x22252521 0x22220a00>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+       };
+};
This page took 0.031531 seconds and 5 git commands to generate.