aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShruti Kanetkar <Kanetkar.Shruti@gmail.com>2015-02-27 10:59:22 -0500
committerScott Wood <scottwood@freescale.com>2015-03-23 20:51:20 -0400
commit2e6e99666de1005fb2d201320082bd89442b7b14 (patch)
tree34421ed59f3f8de8112ceb4fbab5463ee0cb7164
parenta189243cb76217e44838fe11bad8af47ab81c722 (diff)
powerpc/corenet: Enable muxing MDIO buses via FPGA
Signed-off-by: Andy Fleming <afleming@gmail.com> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Shruti Kanetkar <Kanetkar.Shruti@gmail.com> Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig1
-rw-r--r--arch/powerpc/configs/corenet64_smp_defconfig1
-rw-r--r--arch/powerpc/platforms/85xx/corenet_generic.c6
3 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 44e53a4e2106..5242355eaf00 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -100,6 +100,7 @@ CONFIG_AT803X_PHY=y
100CONFIG_VITESSE_PHY=y 100CONFIG_VITESSE_PHY=y
101CONFIG_FIXED_PHY=y 101CONFIG_FIXED_PHY=y
102CONFIG_MDIO_BUS_MUX_GPIO=y 102CONFIG_MDIO_BUS_MUX_GPIO=y
103CONFIG_MDIO_BUS_MUX_MMIOREG=y
103# CONFIG_INPUT_MOUSEDEV is not set 104# CONFIG_INPUT_MOUSEDEV is not set
104# CONFIG_INPUT_KEYBOARD is not set 105# CONFIG_INPUT_KEYBOARD is not set
105# CONFIG_INPUT_MOUSE is not set 106# CONFIG_INPUT_MOUSE is not set
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index 3bf794be5b81..3d694d233de4 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -94,6 +94,7 @@ CONFIG_E1000E=y
94CONFIG_VITESSE_PHY=y 94CONFIG_VITESSE_PHY=y
95CONFIG_FIXED_PHY=y 95CONFIG_FIXED_PHY=y
96CONFIG_MDIO_BUS_MUX_GPIO=y 96CONFIG_MDIO_BUS_MUX_GPIO=y
97CONFIG_MDIO_BUS_MUX_MMIOREG=y
97CONFIG_INPUT_FF_MEMLESS=m 98CONFIG_INPUT_FF_MEMLESS=m
98# CONFIG_INPUT_MOUSEDEV is not set 99# CONFIG_INPUT_MOUSEDEV is not set
99# CONFIG_INPUT_KEYBOARD is not set 100# CONFIG_INPUT_KEYBOARD is not set
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 382058908910..9824d2cf79bd 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -91,6 +91,12 @@ static const struct of_device_id of_device_ids[] = {
91 .compatible = "mdio-mux-gpio" 91 .compatible = "mdio-mux-gpio"
92 }, 92 },
93 { 93 {
94 .compatible = "fsl,fpga-ngpixis"
95 },
96 {
97 .compatible = "fsl,fpga-qixis"
98 },
99 {
94 .compatible = "fsl,srio", 100 .compatible = "fsl,srio",
95 }, 101 },
96 { 102 {