summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnson Huang <b20788@freescale.com>2014-11-28 11:15:21 +0800
committerAnson Huang <b20788@freescale.com>2014-11-28 16:05:08 +0800
commit0851a103ac096462609a8a7701a34bae65c1a055 (patch)
tree4e9ca5bb13519d6a16e47c671f42517f8efbc1df /arch
parent56c6948b220a3b58b556226f781a7bfe36150f6c (diff)
MLK-9928-1 arm: dts: imx6sx-m4: remove m4 node from shared memory
As M4's clk switch MUX is NOT a glitchless one, when M4 try to switch its parent, it needs to be gated, so M4 can NOT switch its parent by itself, need A9 to help do it. Have to remove M4 from shared memory, it means M4's clk will be managed by A9 completely. Signed-off-by: Anson Huang <b20788@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6sx-sabreauto-m4.dts4
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb-m4.dts4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts b/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts
index 935a87046567..d6743cb71278 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts
@@ -65,12 +65,12 @@
};
&clks {
- fsl,shared-clks-number = <0x24>;
+ fsl,shared-clks-number = <0x23>;
fsl,shared-clks-index = <IMX6SX_CLK_PLL2_BUS IMX6SX_CLK_PLL2_PFD0
IMX6SX_CLK_PLL2_PFD2 IMX6SX_CLK_PLL3_USB_OTG
IMX6SX_CLK_PLL3_PFD1 IMX6SX_CLK_PLL3_PFD2
IMX6SX_CLK_PLL3_PFD3 IMX6SX_CLK_PLL4_AUDIO
- IMX6SX_CLK_PLL5_VIDEO IMX6SX_CLK_M4
+ IMX6SX_CLK_PLL5_VIDEO
IMX6SX_CLK_OCRAM IMX6SX_CLK_CAN1_SERIAL
IMX6SX_CLK_CAN1_IPG IMX6SX_CLK_CAN2_SERIAL
IMX6SX_CLK_CAN2_IPG IMX6SX_CLK_CANFD
diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
index 98a8f55eeb16..635802b7626e 100644
--- a/arch/arm/boot/dts/imx6sx-sdb-m4.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
@@ -69,12 +69,12 @@
};
&clks {
- fsl,shared-clks-number = <0x24>;
+ fsl,shared-clks-number = <0x23>;
fsl,shared-clks-index = <IMX6SX_CLK_PLL2_BUS IMX6SX_CLK_PLL2_PFD0
IMX6SX_CLK_PLL2_PFD2 IMX6SX_CLK_PLL3_USB_OTG
IMX6SX_CLK_PLL3_PFD1 IMX6SX_CLK_PLL3_PFD2
IMX6SX_CLK_PLL3_PFD3 IMX6SX_CLK_PLL4_AUDIO
- IMX6SX_CLK_PLL5_VIDEO IMX6SX_CLK_M4
+ IMX6SX_CLK_PLL5_VIDEO
IMX6SX_CLK_OCRAM IMX6SX_CLK_CAN1_SERIAL
IMX6SX_CLK_CAN1_IPG IMX6SX_CLK_CAN2_SERIAL
IMX6SX_CLK_CAN2_IPG IMX6SX_CLK_CANFD