* [PATCH 1/4] ARM: rdu2: use the upstream accepted DT
@ 2017-07-18 13:18 Lucas Stach
2017-07-18 13:18 ` [PATCH 2/4] ARM: rdu2: remove USB VBUS GPIO init Lucas Stach
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Lucas Stach @ 2017-07-18 13:18 UTC (permalink / raw)
To: barebox
We now only need to carry the Barebox specific parts of the DT.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/dts/imx6qdl-zii-rdu2.dtsi | 518 +++++--------------------------------
1 file changed, 68 insertions(+), 450 deletions(-)
diff --git a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
index 5b255e9aaa57..7586afe2fef3 100644
--- a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Zodiac Inflight Innovations
+ * Copyright (C) 2016-2017 Zodiac Inflight Innovations
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
@@ -7,9 +7,8 @@
* whole.
*
* a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,7 +29,7 @@
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
@@ -40,502 +39,121 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include <arm/imx6qdl-zii-rdu2.dtsi>
/ {
chosen {
- linux,stdout-path = &uart1;
-
environment@0 {
compatible = "barebox,environment";
device-path = &nor_flash, "partname:barebox-environment";
};
};
- mdio {
- compatible = "virtual,mdio-gpio";
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_mdio1>;
- gpios = <&gpio6 5 GPIO_ACTIVE_HIGH
- &gpio6 4 GPIO_ACTIVE_HIGH>;
- };
-
- reg_28p0v: 28p0v {
- /* main power in */
- compatible = "regulator-fixed";
- regulator-name = "28P0V";
- regulator-min-microvolt = <28000000>;
- regulator-max-microvolt = <28000000>;
- regulator-always-on;
- };
-
- reg_12p0v: 12p0v {
- /* main internal power */
- compatible = "regulator-fixed";
- vin-supply = <®_28p0v>;
- regulator-name = "12P0V";
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
- regulator-always-on;
- };
-
- reg_12p0v_periph: 12p0vperiph {
- compatible = "regulator-fixed";
- vin-supply = <®_28p0v>;
- regulator-name = "12P0V-PERIPH";
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
- /* controlled via "environment processor" */
- regulator-always-on;
- };
-
- reg_5p0v_main: 5p0vmain {
- compatible = "regulator-fixed";
- vin-supply = <®_12p0v>;
- regulator-name = "5P0MAIN";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- /* controlled via "environment processor" */
- regulator-always-on;
- };
-
- reg_usb_otg_vbus: regulator@0 {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usb_otg_supply>;
- vin-supply = <®_5p0v_main>;
- regulator-name = "usb_otg_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio3 22 GPIO_ACTIVE_LOW>;
- startup-delay-us = <1000>;
- };
-
- reg_usb_h1_vbus: regulator@1 {
- compatible = "regulator-fixed";
- vin-supply = <®_5p0v_main>;
- regulator-name = "usb_h1_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
+ aliases {
+ ethernet0 = &fec;
+ ethernet1 = &i210;
};
};
-&iomuxc {
- pinctrl-names = "default";
-
- imx6qdl-sabresd {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- /* USB Charging Controller */
- MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x1b0b0 /*USB_ATT_DETn*/
- MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x1b0b0 /*USB_EMULATION*/
- MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x1b0b0 /*USB_MODE1*/
- MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x1b0b0 /*USB_ALERTn*/
- MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0 /*USB_PWR_CTRL_ENn*/
- MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x1b0b0 /*USB_MODE2*/
-
- MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13020 /*USB_OTG_ID*/
-
- MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x1b0b0 /*INT_TOUCH_N*/
-
- /* DAC */
- MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 /*DAC1_RESET*/
- MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 /*DAC2_RESET*/
-
- /* Need to Place */
- MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b0 /*RMII_INTRPT*/
- MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x1b8b0 /*SD_CARD_RESET - Open Drain Output*/
-
- /* Test Points */
- MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1b0b0 /*TP20*/
- MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /*TP21*/
- MX6QDL_PAD_SD3_DAT6__GPIO6_IO18 0x1b0b0 /*TP22*/
- MX6QDL_PAD_SD3_DAT7__GPIO6_IO17 0x1b0b0 /*TP23*/
- MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x1b0b0 /*TP19*/
- MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x1b0b0 /*TP26*/
- MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x1b0b0 /*TP27*/
- MX6QDL_PAD_NANDF_D5__GPIO2_IO05 0x1b0b0 /*TP28*/
- MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /*TP29*/
- MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x1b0b0 /*TP30*/
- MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x1b0b0 /*TP25*/
- MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x1b0b0 /*TP39*/
- MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x1b0b0 /*TP40*/
- MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x1b0b0 /*TP42*/
- MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x1b0b0 /*TP43*/
- MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00 0x1b0b0 /*TP44*/
- MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01 0x1b0b0 /*TP45*/
- MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x1b0b0 /*TP46*/
- MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x1b0b0 /*TP41*/
-
- /* System Type */
- MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x1b0b0 /*SYS_TYPE_3*/
- MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x1b0b0 /*SYS_TYPE_2*/
- MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x1b0b0 /*SYS_TYPE_1*/
- MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 /*SYS_TYPE_0*/
-
- /* Boot Mode Selection Pins */
- MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x1b0b0 /*BT_CFG1_0*/
- MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x1b0b0 /*BT_CFG1_1*/
- MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x1b0b0 /*BT_CFG1_2*/
- MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x1b0b0 /*BT_CFG1_3*/
- MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x1b0b0 /*BT_CFG1_4*/
- MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x1b0b0 /*BT_CFG1_5*/
- MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x1b0b0 /*BT_CFG1_6*/
- MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x1b0b0 /*BT_CFG1_7*/
-
- MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x1b0b0 /*BT_CFG2_0*/
- MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x1b0b0 /*BT_CFG2_1*/
- MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x1b0b0 /*BT_CFG2_2*/
- MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x1b0b0 /*BT_CFG2_3*/
- MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x1b0b0 /*BT_CFG2_4*/
- MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x1b0b0 /*BT_CFG2_5*/
- MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x1b0b0 /*BT_CFG2_6*/
- MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x1b0b0 /*BT_CFG2_7*/
-
- MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x1b0b0 /*BT_CFG3_0*/
- MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x1b0b0 /*BT_CFG3_1*/
- MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x1b0b0 /*BT_CFG3_2*/
- MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x1b0b0 /*BT_CFG3_3*/
- MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x1b0b0 /*BT_CFG3_4*/
- MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x1b0b0 /*BT_CFG3_5*/
- MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x1b0b0 /*BT_CFG3_6*/
- MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x1b0b0 /*BT_CFG3_7*/
-
- MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x1b0b0 /*BT_CFG4_0*/
- MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x1b0b0 /*BT_CFG4_1*/
- MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x1b0b0 /*BT_CFG4_2*/
- MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x1b0b0 /*BT_CFG4_3*/
- MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x1b0b0 /*BT_CFG4_4*/
- MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x1b0b0 /*BT_CFG4_5*/
- MX6QDL_PAD_EIM_EB3__GPIO2_IO31 0x1b0b0 /*BT_CFG4_7*/
-
- MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1b0b0 /* HPA1_SDn */
- MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x1b0b0 /* HPA2_SDn */
- MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x1b0b0 /* RST_TOUCH# */
- MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0 /* NFC_RESET */
- >;
- };
-
- pinctrl_usb_otg_supply: usbotggrp {
- fsl,pins = <
- MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x40000038
- >;
- };
-
- pinctrl_ecspi1: ecspi1grp {
- fsl,pins = <
- /*MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x1b0b0*/
- MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
- MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
- MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
- /*MX6QDL_PAD_EIM_EB2__ECSPI1_SS0 0x100b1*/
- MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x1b0b1
- /*MX6QDL_PAD_KEY_COL2__ECSPI1_SS1 0x1b0b1
- MX6QDL_PAD_KEY_COL2__GPIO4_IO10*/
- >;
- };
-
- pinctrl_enet: enetgrp {
- fsl,pins = <
- MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
- MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
- MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
- MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0
- MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0
- MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
- MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0
- MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0
- MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0
- MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0
-
- MX6QDL_PAD_ENET_REF_CLK__GPIO1_IO23 0x1b0b0
- >;
- };
-
- pinctrl_ssi2: ssi3grp {
- fsl,pins = <
- MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0
- MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x130b0
- MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0
- >;
- };
-
- pinctrl_i2c1: i2c1grp {
- fsl,pins = <
- MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
- MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
- >;
- };
-
- pinctrl_i2c2: i2c2grp {
- fsl,pins = <
- MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
- MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
- >;
- };
-
- pinctrl_i2c3: i2c3grp {
- fsl,pins = <
- MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
- MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
- >;
- };
-
- pinctrl_i2c3_gpio: i2c3grp_gpio {
- fsl,pins = <
- MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x1b0b1
- MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x1b0b1
- >;
- };
+&uart4 {
+ pic {
+ compatible = "zii,pic-rdu2";
+ current-speed = <1000000>;
+ status = "okay";
- pinctrl_pcie: pciegrp {
- fsl,pins = <
- MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0
- >;
- };
+ main_eeprom {
+ compatible = "zii,pic-main-eeprom";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ status = "okay";
- pinctrl_uart1: uart1grp {
- fsl,pins = <
- MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
- MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
- >;
+ boot_source: boot-source@83 {
+ reg = <0x83 1>;
+ };
+ max_failed_boots: max-failed-boots@8E {
+ reg = <0x8E 2>;
+ };
};
- pinctrl_uart3: uart3grp {
- fsl,pins = <
- MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
- MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
- >;
+ dds_eeprom {
+ compatible = "zii,pic-dds-eeprom";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ status = "okay";
};
- pinctrl_uart4: uart4grp {
- fsl,pins = <
- MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
- MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
- >;
+ watchdog {
+ compatible = "zii,pic-watchdog";
+ status = "okay";
};
- pinctrl_usdhc2: usdhc2grp {
- fsl,pins = <
- MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17069
- MX6QDL_PAD_SD2_CLK__SD2_CLK 0x17069
- MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17069
- MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17069
- MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17069
- MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17069
- >;
+ hwmon {
+ compatible = "zii,pic-hwmon";
+ sensors = "RMB_3V3_PMIC",
+ "RMB_3V3_MCU",
+ "RMB_5V_MAIN",
+ "RMB_12V_MAIN",
+ "RMB_28V_FIL",
+ "RMB_28V_HOTSWAP",
+ "DEB_1V8",
+ "DEB_3V3",
+ "DEB_28V_DEB",
+ "DEB_28V_RDU",
+ "TEMPERATURE",
+ "TEMPERATURE_2",
+ "RMB_28V_CURRENT";
+ status = "okay";
};
- pinctrl_usdhc3: usdhc3grp {
- fsl,pins = <
- MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17069
- MX6QDL_PAD_SD3_CLK__SD3_CLK 0x17069
- MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17069
- MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17069
- MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17069
- MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17069
- >;
+ backlight {
+ compatible = "zii,pic-backlight";
+ status = "okay";
};
- pinctrl_usdhc4: usdhc4grp {
- fsl,pins = <
- MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
- MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
- MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
- MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
- MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
- MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
- MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
- MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
- MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
- MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
- MX6QDL_PAD_NANDF_ALE__SD4_RESET 0x1b0b1
- >;
+ leds {
+ compatible = "zii,pic-leds";
+ status = "okay";
};
- pinctrl_mdio1: bitbangmdiogrp {
- fsl,pins = <
- /* Bitbang MDIO for DEB Switch */
- MX6QDL_PAD_CSI0_DAT19__GPIO6_IO05 0x1b030 /*SWITCH_MDC*/
- MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04 0x18830 /*SWITCH_MDIO*/
- >;
+ pwrbutton {
+ compatible = "zii,pic-pwrbutton";
+ status = "okay";
};
};
};
-&uart1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
-};
-
-&uart4 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart4>;
- status = "okay";
-};
-
&ecspi1 {
- fsl,spi-num-chipselects = <1>;
- cs-gpios = <&gpio2 30 0>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_ecspi1>;
- status = "okay";
-
- nor_flash: m25p128@0 {
+ nor_flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "m25p128";
- spi-max-frequency = <20000000>;
- reg = <0>;
partition@0 {
label = "barebox";
reg = <0x0 0xc0000>;
};
- partition@e0000 {
+ partition@c0000 {
label = "barebox-environment";
reg = <0xc0000 0x40000>;
};
};
};
-&i2c1 {
- clock-frequency = <100000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c1>;
- status = "okay";
-};
-
-&tempmon {
- barebox,sensor-name = "TEMPMON";
-};
-
&i2c2 {
- clock-frequency = <100000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c2>;
- status = "okay";
-
- lm75@48 {
- compatible = "national,lm75";
- reg = <0x48>;
+ temp-sense@48 {
barebox,sensor-name = "Temp Sensor 1";
};
-
- rtc: ds1341@68 {
- compatible = "dallas,ds1341";
- reg = <0x68>;
- };
-
- mx6_eeprom: at24@54 {
- compatible = "at,24c128";
- pagesize = <32>; /* TODO: VERIFY PAGE SIZE */
- reg = <0x54>;
- };
-};
-
-&i2c3 {
- clock-frequency = <100000>;
- pinctrl-names = "default", "gpio";
- pinctrl-0 = <&pinctrl_i2c3>;
- pinctrl-1 = <&pinctrl_i2c3_gpio>;
- scl-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
- sda-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
- status = "okay";
-};
-
-&ldb {
- status = "okay";
-
- lvds-channel@0 {
- fsl,data-mapping = "spwg";
- fsl,data-width = <24>;
- status = "okay";
-
- display-timings {
- native-mode = <&timing_innolux_10_1>;
- timing_innolux_10_1: innolux_10_1 {
- clock-frequency = <71100000>;
- hactive = <1280>;
- vactive = <800>;
- hback-porch = <40>;
- hfront-porch = <40>;
- vback-porch = <10>;
- vfront-porch = <3>;
- hsync-len = <80>;
- vsync-len = <10>;
- de-active = <1>;
- pixelclk-active = <1>;
- };
- };
- };
};
&pcie {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pcie>;
- reset-gpio = <&gpio7 12 0>;
- status = "okay";
-};
-
-
-&usdhc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc2>;
- bus-width = <4>;
- cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
- wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
- status = "okay";
-};
-
-&usdhc3 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc3>;
- bus-width = <4>;
- cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
- wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
- status = "okay";
-};
-
-&usdhc4 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc4>;
- bus-width = <8>;
- non-removable;
- no-1-8-v;
- status = "okay";
-};
+ host@0 {
+ #address-cells = <3>;
+ #size-cells = <2>;
+ reg = <0 0 0 0 0>;
+ device_type = "pci";
-&usbh1 {
- vbus-supply = <®_usb_h1_vbus>;
- status = "okay";
-};
-
-&usbotg {
- vbus-supply = <®_usb_otg_vbus>;
- disable-over-current;
- dr_mode = "otg";
- status = "okay";
-};
-
-&sata {
- status = "okay";
-};
-
-&fec {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_enet>;
- phy-mode = "rmii";
- phy-reset-gpios = <&gpio1 23 0>;
- status = "okay";
-
- fixed-link {
- speed = <100>;
- full-duplex;
+ i210: i210@0 {
+ reg = <0 0 0 0 0>;
+ };
};
};
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/4] ARM: rdu2: remove USB VBUS GPIO init
2017-07-18 13:18 [PATCH 1/4] ARM: rdu2: use the upstream accepted DT Lucas Stach
@ 2017-07-18 13:18 ` Lucas Stach
2017-07-18 13:18 ` [PATCH 3/4] ARM: rdu2: remove unecessary includes Lucas Stach
2017-07-18 13:18 ` [PATCH 4/4] ARM: rdu2: include defaultenv from board Lucas Stach
2 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2017-07-18 13:18 UTC (permalink / raw)
To: barebox
This is handled by a fixed regulator in the upstream DT.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/zii-imx6q-rdu2/board.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/boards/zii-imx6q-rdu2/board.c b/arch/arm/boards/zii-imx6q-rdu2/board.c
index ee04517d2985..4176ca79353d 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/board.c
+++ b/arch/arm/boards/zii-imx6q-rdu2/board.c
@@ -122,11 +122,6 @@ static const struct gpio rdu2_front_panel_usb_gpios[] = {
.label = "usb-mode1",
},
{
- .gpio = IMX_GPIO_NR(3, 22),
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "usb-pwr-ctrl-enn",
- },
- {
.gpio = IMX_GPIO_NR(3, 23),
.flags = GPIOF_OUT_INIT_HIGH,
.label = "usb-mode2",
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 3/4] ARM: rdu2: remove unecessary includes
2017-07-18 13:18 [PATCH 1/4] ARM: rdu2: use the upstream accepted DT Lucas Stach
2017-07-18 13:18 ` [PATCH 2/4] ARM: rdu2: remove USB VBUS GPIO init Lucas Stach
@ 2017-07-18 13:18 ` Lucas Stach
2017-07-18 13:18 ` [PATCH 4/4] ARM: rdu2: include defaultenv from board Lucas Stach
2 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2017-07-18 13:18 UTC (permalink / raw)
To: barebox
The board file has many more includes than what is really needed,
clean this up.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/zii-imx6q-rdu2/board.c | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boards/zii-imx6q-rdu2/board.c b/arch/arm/boards/zii-imx6q-rdu2/board.c
index 4176ca79353d..85140f8b5c61 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/board.c
+++ b/arch/arm/boards/zii-imx6q-rdu2/board.c
@@ -14,26 +14,10 @@
*/
#include <common.h>
-#include <init.h>
-#include <environment.h>
-#include <mach/imx6-regs.h>
#include <gpio.h>
-#include <asm/armlinux.h>
-#include <generated/mach-types.h>
-#include <partition.h>
-#include <linux/phy.h>
-#include <asm/io.h>
-#include <asm/mmu.h>
-#include <mach/generic.h>
-#include <linux/sizes.h>
-#include <net.h>
-#include <mach/imx6.h>
-#include <mach/devices-imx6.h>
-#include <mach/iomux-mx6.h>
-#include <spi/spi.h>
-#include <mach/spi.h>
-#include <mach/usb.h>
+#include <init.h>
#include <mach/bbu.h>
+#include <mach/imx6.h>
#define RDU2_DAC1_RESET IMX_GPIO_NR(1, 0)
#define RDU2_DAC2_RESET IMX_GPIO_NR(1, 2)
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] ARM: rdu2: include defaultenv from board
2017-07-18 13:18 [PATCH 1/4] ARM: rdu2: use the upstream accepted DT Lucas Stach
2017-07-18 13:18 ` [PATCH 2/4] ARM: rdu2: remove USB VBUS GPIO init Lucas Stach
2017-07-18 13:18 ` [PATCH 3/4] ARM: rdu2: remove unecessary includes Lucas Stach
@ 2017-07-18 13:18 ` Lucas Stach
2017-07-18 16:11 ` Sam Ravnborg
2 siblings, 1 reply; 5+ messages in thread
From: Lucas Stach @ 2017-07-18 13:18 UTC (permalink / raw)
To: barebox
Makes it available without the need for a spacial barebox config.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/zii-imx6q-rdu2/Makefile | 1 +
arch/arm/boards/zii-imx6q-rdu2/board.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/boards/zii-imx6q-rdu2/Makefile b/arch/arm/boards/zii-imx6q-rdu2/Makefile
index 01c7a259e9a5..c6285362f2ee 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/Makefile
+++ b/arch/arm/boards/zii-imx6q-rdu2/Makefile
@@ -1,2 +1,3 @@
obj-y += board.o
lwl-y += lowlevel.o
+bbenv-y += defaultenv-rdu2
diff --git a/arch/arm/boards/zii-imx6q-rdu2/board.c b/arch/arm/boards/zii-imx6q-rdu2/board.c
index 85140f8b5c61..265f97e2f464 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/board.c
+++ b/arch/arm/boards/zii-imx6q-rdu2/board.c
@@ -14,6 +14,7 @@
*/
#include <common.h>
+#include <envfs.h>
#include <gpio.h>
#include <init.h>
#include <mach/bbu.h>
@@ -145,6 +146,8 @@ static int rdu2_devices_init(void)
imx6_bbu_internal_mmc_register_handler("eMMC", "/dev/mmc3", 0);
+ defaultenv_append_directory(defaultenv_rdu2);
+
return 0;
}
device_initcall(rdu2_devices_init);
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-18 16:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-18 13:18 [PATCH 1/4] ARM: rdu2: use the upstream accepted DT Lucas Stach
2017-07-18 13:18 ` [PATCH 2/4] ARM: rdu2: remove USB VBUS GPIO init Lucas Stach
2017-07-18 13:18 ` [PATCH 3/4] ARM: rdu2: remove unecessary includes Lucas Stach
2017-07-18 13:18 ` [PATCH 4/4] ARM: rdu2: include defaultenv from board Lucas Stach
2017-07-18 16:11 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox