summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorZhao Qiang <qiang.zhao@freescale.com>2015-08-28 10:31:50 +0800
committerYork Sun <yorksun@freescale.com>2015-11-02 08:48:20 -0800
commitd4683776728b2442379b15b4d22318e223a5124e (patch)
tree6c89388bc9ba2a40f5f43c4d3fc9373727a00deb /arch/powerpc
parenta61047370d0b73ab886c5863e952695b5ee0d75b (diff)
downloadblackbird-obmc-uboot-d4683776728b2442379b15b4d22318e223a5124e.tar.gz
blackbird-obmc-uboot-d4683776728b2442379b15b4d22318e223a5124e.zip
t1040d4rdb: assign muxed pins to qe-tdm when set hwconfig qe-tdm
qe-tdm is muxed with diu, if hwconfig setted as qe-tdm, assign muxed pins to qe-tdm, then delete diu node from device tree. Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/mpc85xx/fdt.c11
-rw-r--r--arch/powerpc/include/asm/fsl_fdt.h11
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index d4c3d9df9b..7270be1b28 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -13,6 +13,7 @@
#include <asm/processor.h>
#include <linux/ctype.h>
#include <asm/io.h>
+#include <asm/fsl_fdt.h>
#include <asm/fsl_portals.h>
#include <hwconfig.h>
#ifdef CONFIG_FSL_ESDHC
@@ -943,3 +944,13 @@ int ft_verify_fdt(void *fdt)
return 1;
}
+
+void fdt_del_diu(void *blob)
+{
+ int nodeoff = 0;
+
+ while ((nodeoff = fdt_node_offset_by_compatible(blob, 0,
+ "fsl,diu")) >= 0) {
+ fdt_del_node(blob, nodeoff);
+ }
+}
diff --git a/arch/powerpc/include/asm/fsl_fdt.h b/arch/powerpc/include/asm/fsl_fdt.h
new file mode 100644
index 0000000000..82e8f45644
--- /dev/null
+++ b/arch/powerpc/include/asm/fsl_fdt.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#ifndef _FSL_FDT_H_
+#define _FSL_FDT_H_
+
+void fdt_del_diu(void *blob);
+
+#endif
OpenPOWER on IntegriCloud