summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-12-15 08:23:15 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-12-15 08:23:15 +0100
commitabad1451586d8e8b36f86ef2772cef81d4ce2651 (patch)
treeadcda19040f7e6069dd710eb999d6d54354cf7c1 /arch/arm
parent57dbf9dea12d3810aa0d9db1680c09cbe9ecc588 (diff)
parent5777d0e351433da7deaa8b39ebc1671dfe8645f0 (diff)
downloadbarebox-abad1451586d8e8b36f86ef2772cef81d4ce2651.tar.gz
barebox-abad1451586d8e8b36f86ef2772cef81d4ce2651.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063.h2
-rw-r--r--arch/arm/configs/imx_v7_defconfig4
-rw-r--r--arch/arm/dts/imx6qdl-phytec-pfla02.dtsi12
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063.h
index 9a8f5f18e1..8e0ab6f585 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063.h
@@ -3,6 +3,8 @@ loadaddr 0x80000000
soc imx6
ivtofs 0x400
+wm 32 0x020c8140 0x00580012
+
wm 32 0x020c4068 0xffffffff
wm 32 0x020c406c 0xffffffff
wm 32 0x020c4070 0xffffffff
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 624698ae3c..8e707b9602 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -133,6 +133,9 @@ CONFIG_CMD_WD=y
CONFIG_CMD_BAREBOX_UPDATE=y
CONFIG_CMD_OF_NODE=y
CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OF_FIXUP_STATUS=y
+CONFIG_CMD_OF_OVERLAY=y
CONFIG_CMD_OFTREE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_STATE=y
@@ -195,6 +198,7 @@ CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_IMX=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
+CONFIG_IMX_OCOTP_WRITE=y
CONFIG_MXS_APBH_DMA=y
CONFIG_GPIO_STMPE=y
CONFIG_REGULATOR=y
diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index 0653fcc3c3..ada1607688 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -81,15 +81,6 @@
};
};
-&fec {
- /*
- * barebox doesn't have a driver for the PMIC providing the phy-supply
- * (dlg,da9063). So remove the phy-supply property and rely on the
- * PMIC's reset default which has this supply enabled.
- */
- /delete-property/ phy-supply;
-};
-
&gpmi {
partitions {
compatible = "fixed-partitions";
@@ -162,5 +153,8 @@
watchdog-priority = <500>;
restart-priority = <500>;
reset-source-priority = <500>;
+ regulators {
+ barebox,allow-dummy-supply;
+ };
};
};