[PATCH 2/5] ARM: dts: imx6ul-pico-hobbit: Move SoM related part to imx6ul-pico.dtsi
From: Fabio Estevam
imx6ul-pico-hobbit board contains:
- One SoM board (imx6ul pico)
- One base board (hobbit).
In order to make it easier for adding support for other board variants,
move the commom SoM part to the imx6ul-pico.dtsi file.
Signed-off-by: Fabio Estevam
Signed-off-by: Otavio Salvador
---
arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 479 +-
arch/arm/boot/dts/imx6ul-pico.dtsi | 493 +++
2 files changed, 511 insertions(+), 461 deletions(-)
create mode 100644 arch/arm/boot/dts/imx6ul-pico.dtsi
diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
index 1bc4fb4b4841..3cc04dd6f341 100644
--- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
@@ -7,80 +7,25 @@
//Tapani Utriainen
/dts-v1/;
-#include "imx6ul.dtsi"
-
+#include "imx6ul-pico.dtsi"
/ {
- model = "Technexion Pico i.MX6UL Board";
+ model = "TechNexion PICO-IMX6UL and HOBBIT baseboard";
compatible = "technexion,imx6ul-pico-hobbit", "fsl,imx6ul";
- /* Will be filled by the bootloader */
- memory@8000 {
- device_type = "memory";
- reg = <0x8000 0>;
- };
-
- chosen {
- stdout-path =
- };
-
- backlight {
- compatible = "pwm-backlight";
- pwms = < 0 500>;
- brightness-levels = <0 4 8 16 32 64 128 255>;
- default-brightness-level = <6>;
- status = "okay";
- };
-
- reg_2p5v: regulator-2p5v {
- compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <250>;
- regulator-max-microvolt = <250>;
- };
-
- reg_3p3v: regulator-3p3v {
- compatible = "regulator-fixed";
- regulator-name = "3P3V";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- };
-
- reg_sd1_vmmc: regulator-sd1-vmmc {
- compatible = "regulator-fixed";
- regulator-name = "VSD_3V3";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- gpio = < 9 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
- reg_usb_otg_vbus: regulator-usb-otg-vbus {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <_usb_otg1>;
- regulator-name = "usb_otg_vbus";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- gpio = < 6 0>;
- };
+ leds {
+ compatible = "gpio-leds";
- reg_brcm: regulator-brcm {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = < 8 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <_brcm_reg>;
- regulator-name = "brcm_reg";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- startup-delay-us = <20>;
+ hobbitled {
+ label = "hobbitled";
+ gpios = < 29 GPIO_ACTIVE_LOW>;
+ };
};
sound {
compatible = "fsl,imx-audio-sgtl5000";
model = "imx6ul-sgtl5000";
audio-cpu = <>;
- audio-codec = <>;
+ audio-codec = <>;
audio-routing =
"LINE_IN", "Line In Jack",
"MIC_IN", "Mic Jack",
@@ -93,92 +38,6 @@
#clock-cells = <0>;
clock-frequency = <24576000>;
};
-
- leds {
- compatible = "gpio-leds";
-
- hobbitled {
- label = "hobbitled";
- gpios = < 29 GPIO_ACTIVE_LOW>;
- };
- };
-};
-
- {
- pinctrl-names = "default";
- pinctrl-0 = <_flexcan1>;
- status = "okay";
-};
-
- {
- pinctrl-names = "default";
- pinctrl-0 = <_flexcan2>;
- status = "okay";
-};
-
- {
- assigned-clocks = < IMX6UL_CLK_PLL4_AUDIO_DIV>;
- assigned-clock-rates = <786432000>;
-};
-
- {
- pinctrl-names = "default";
- pinctrl-0 = <_enet2>;
- phy-mode = "rmii";
- phy-handle = <>;
- status = "okay";
- phy-reset-gpios = < 28 GPIO_ACTIVE_LOW>;
- phy-reset-duration = <1>;
-
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
-
- ethphy1: ethernet-phy@1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- max-speed = <100>;
- interrupt-parent = <>;
[PATCH 2/5] ARM: dts: imx6ul-pico-hobbit: Move SoM related part to imx6ul-pico.dtsi
From: Fabio Estevam
imx6ul-pico-hobbit board contains:
- One SoM board (imx6ul pico)
- One base board (hobbit).
In order to make it easier for adding support for other board variants,
move the commom SoM part to the imx6ul-pico.dtsi file.
Signed-off-by: Fabio Estevam
Signed-off-by: Otavio Salvador
---
arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 479 +-
arch/arm/boot/dts/imx6ul-pico.dtsi | 493 +++
2 files changed, 511 insertions(+), 461 deletions(-)
create mode 100644 arch/arm/boot/dts/imx6ul-pico.dtsi
diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
index 1bc4fb4b4841..3cc04dd6f341 100644
--- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
@@ -7,80 +7,25 @@
//Tapani Utriainen
/dts-v1/;
-#include "imx6ul.dtsi"
-
+#include "imx6ul-pico.dtsi"
/ {
- model = "Technexion Pico i.MX6UL Board";
+ model = "TechNexion PICO-IMX6UL and HOBBIT baseboard";
compatible = "technexion,imx6ul-pico-hobbit", "fsl,imx6ul";
- /* Will be filled by the bootloader */
- memory@8000 {
- device_type = "memory";
- reg = <0x8000 0>;
- };
-
- chosen {
- stdout-path =
- };
-
- backlight {
- compatible = "pwm-backlight";
- pwms = < 0 500>;
- brightness-levels = <0 4 8 16 32 64 128 255>;
- default-brightness-level = <6>;
- status = "okay";
- };
-
- reg_2p5v: regulator-2p5v {
- compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <250>;
- regulator-max-microvolt = <250>;
- };
-
- reg_3p3v: regulator-3p3v {
- compatible = "regulator-fixed";
- regulator-name = "3P3V";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- };
-
- reg_sd1_vmmc: regulator-sd1-vmmc {
- compatible = "regulator-fixed";
- regulator-name = "VSD_3V3";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- gpio = < 9 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
- reg_usb_otg_vbus: regulator-usb-otg-vbus {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <_usb_otg1>;
- regulator-name = "usb_otg_vbus";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- gpio = < 6 0>;
- };
+ leds {
+ compatible = "gpio-leds";
- reg_brcm: regulator-brcm {
- compatible = "regulator-fixed";
- enable-active-high;
- gpio = < 8 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <_brcm_reg>;
- regulator-name = "brcm_reg";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- startup-delay-us = <20>;
+ hobbitled {
+ label = "hobbitled";
+ gpios = < 29 GPIO_ACTIVE_LOW>;
+ };
};
sound {
compatible = "fsl,imx-audio-sgtl5000";
model = "imx6ul-sgtl5000";
audio-cpu = <>;
- audio-codec = <>;
+ audio-codec = <>;
audio-routing =
"LINE_IN", "Line In Jack",
"MIC_IN", "Mic Jack",
@@ -93,92 +38,6 @@
#clock-cells = <0>;
clock-frequency = <24576000>;
};
-
- leds {
- compatible = "gpio-leds";
-
- hobbitled {
- label = "hobbitled";
- gpios = < 29 GPIO_ACTIVE_LOW>;
- };
- };
-};
-
- {
- pinctrl-names = "default";
- pinctrl-0 = <_flexcan1>;
- status = "okay";
-};
-
- {
- pinctrl-names = "default";
- pinctrl-0 = <_flexcan2>;
- status = "okay";
-};
-
- {
- assigned-clocks = < IMX6UL_CLK_PLL4_AUDIO_DIV>;
- assigned-clock-rates = <786432000>;
-};
-
- {
- pinctrl-names = "default";
- pinctrl-0 = <_enet2>;
- phy-mode = "rmii";
- phy-handle = <>;
- status = "okay";
- phy-reset-gpios = < 28 GPIO_ACTIVE_LOW>;
- phy-reset-duration = <1>;
-
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
-
- ethphy1: ethernet-phy@1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- max-speed = <100>;
- interrupt-parent = <>;
