mxs: rename files to files-4.9
authorMichael Heimpold <mhei@heimpold.de>
Sat, 10 Feb 2018 13:04:34 +0000 (14:04 +0100)
committerJohn Crispin <john@phrozen.org>
Tue, 13 Feb 2018 09:01:52 +0000 (10:01 +0100)
The Device Tree file for I2SE Duckbill boards was updated upstream.
Let's use the upstream version for upcoming kernel 4.14 by keeping
our current version for v4.9 still around.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
target/linux/mxs/files-4.9/arch/arm/boot/dts/imx28-duckbill.dts [new file with mode: 0644]
target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts [deleted file]

diff --git a/target/linux/mxs/files-4.9/arch/arm/boot/dts/imx28-duckbill.dts b/target/linux/mxs/files-4.9/arch/arm/boot/dts/imx28-duckbill.dts
new file mode 100644 (file)
index 0000000..305b4d0
--- /dev/null
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2013-2014 Michael Heimpold <mhei@heimpold.de>
+ *
+ * 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 "imx28.dtsi"
+
+/ {
+       model = "I2SE Duckbill";
+       compatible = "i2se,duckbill", "fsl,imx28";
+
+       memory {
+               reg = <0x40000000 0x08000000>;
+       };
+
+       apb@80000000 {
+               apbh@80000000 {
+                       ssp0: ssp@80010000 {
+                               compatible = "fsl,imx28-mmc";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&mmc0_4bit_pins_a
+                                       &mmc0_cd_cfg &mmc0_sck_cfg>;
+                               bus-width = <4>;
+                               vmmc-supply = <&reg_3p3v>;
+                               status = "okay";
+                       };
+
+                       ssp2: ssp@80014000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "fsl,imx28-spi";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&spi2_pins_a>;
+                               status = "okay";
+
+                               spidev: spidev@0 {
+                                       compatible = "spidev";
+                                       reg = <0>;
+                                       spi-max-frequency = <1000000>;
+                               };
+                       };
+
+                       pinctrl@80018000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&hog_pins_a>;
+
+                               hog_pins_a: hog@0 {
+                                       reg = <0>;
+                                       fsl,pinmux-ids = <
+                                               MX28_PAD_SSP0_DATA7__GPIO_2_7 /* PHY Reset */
+                                       >;
+                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
+                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
+                                       fsl,pull-up = <MXS_PULL_DISABLE>;
+                               };
+
+                               led_pins_a: led_gpio@0 {
+                                       reg = <0>;
+                                       fsl,pinmux-ids = <
+                                               MX28_PAD_AUART1_RX__GPIO_3_4
+                                               MX28_PAD_AUART1_TX__GPIO_3_5
+                                       >;
+                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
+                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
+                                       fsl,pull-up = <MXS_PULL_DISABLE>;
+                               };
+                       };
+               };
+
+               apbx@80040000 {
+                       i2c0: i2c@80058000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&i2c0_pins_a>;
+                               status = "okay";
+                       };
+
+                       duart: serial@80074000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&duart_pins_a>;
+                               status = "okay";
+                       };
+
+                       usbphy0: usbphy@8007c000 {
+                               status = "okay";
+                       };
+               };
+       };
+
+       ahb@80080000 {
+               usb0: usb@80080000 {
+                       status = "okay";
+               };
+
+               mac0: ethernet@800f0000 {
+                       phy-mode = "rmii";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mac0_pins_a>;
+                       phy-supply = <&reg_3p3v>;
+                       phy-reset-gpios = <&gpio2 7 1>;
+                       phy-reset-duration = <100>;
+                       status = "okay";
+               };
+       };
+
+       regulators {
+               compatible = "simple-bus";
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&led_pins_a>;
+
+               status {
+                       label = "duckbill:green:status";
+                       gpios = <&gpio3 5 0>;
+               };
+
+               failure {
+                       label = "duckbill:red:status";
+                       gpios = <&gpio3 4 0>;
+               };
+       };
+};
diff --git a/target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts b/target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts
deleted file mode 100644 (file)
index 305b4d0..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Michael Heimpold <mhei@heimpold.de>
- *
- * 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 "imx28.dtsi"
-
-/ {
-       model = "I2SE Duckbill";
-       compatible = "i2se,duckbill", "fsl,imx28";
-
-       memory {
-               reg = <0x40000000 0x08000000>;
-       };
-
-       apb@80000000 {
-               apbh@80000000 {
-                       ssp0: ssp@80010000 {
-                               compatible = "fsl,imx28-mmc";
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&mmc0_4bit_pins_a
-                                       &mmc0_cd_cfg &mmc0_sck_cfg>;
-                               bus-width = <4>;
-                               vmmc-supply = <&reg_3p3v>;
-                               status = "okay";
-                       };
-
-                       ssp2: ssp@80014000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,imx28-spi";
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&spi2_pins_a>;
-                               status = "okay";
-
-                               spidev: spidev@0 {
-                                       compatible = "spidev";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       pinctrl@80018000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&hog_pins_a>;
-
-                               hog_pins_a: hog@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_SSP0_DATA7__GPIO_2_7 /* PHY Reset */
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-
-                               led_pins_a: led_gpio@0 {
-                                       reg = <0>;
-                                       fsl,pinmux-ids = <
-                                               MX28_PAD_AUART1_RX__GPIO_3_4
-                                               MX28_PAD_AUART1_TX__GPIO_3_5
-                                       >;
-                                       fsl,drive-strength = <MXS_DRIVE_4mA>;
-                                       fsl,voltage = <MXS_VOLTAGE_HIGH>;
-                                       fsl,pull-up = <MXS_PULL_DISABLE>;
-                               };
-                       };
-               };
-
-               apbx@80040000 {
-                       i2c0: i2c@80058000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&i2c0_pins_a>;
-                               status = "okay";
-                       };
-
-                       duart: serial@80074000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&duart_pins_a>;
-                               status = "okay";
-                       };
-
-                       usbphy0: usbphy@8007c000 {
-                               status = "okay";
-                       };
-               };
-       };
-
-       ahb@80080000 {
-               usb0: usb@80080000 {
-                       status = "okay";
-               };
-
-               mac0: ethernet@800f0000 {
-                       phy-mode = "rmii";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mac0_pins_a>;
-                       phy-supply = <&reg_3p3v>;
-                       phy-reset-gpios = <&gpio2 7 1>;
-                       phy-reset-duration = <100>;
-                       status = "okay";
-               };
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_a>;
-
-               status {
-                       label = "duckbill:green:status";
-                       gpios = <&gpio3 5 0>;
-               };
-
-               failure {
-                       label = "duckbill:red:status";
-                       gpios = <&gpio3 4 0>;
-               };
-       };
-};