aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Fleming <afleming@gmail.com>2015-02-27 10:57:55 -0500
committerScott Wood <scottwood@freescale.com>2015-03-23 20:51:20 -0400
commita189243cb76217e44838fe11bad8af47ab81c722 (patch)
tree2c1ff1a012aad61ffb96af1c5b36d4dd82775599
parent1e8ed06d3446f354014fffc99ea0b9ac16dfadd5 (diff)
powerpc/corenet: Enable muxing MDIO buses via GPIO
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.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index ca7957b09a3c..44e53a4e2106 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -99,6 +99,7 @@ CONFIG_E1000E=y
99CONFIG_AT803X_PHY=y 99CONFIG_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
102# CONFIG_INPUT_MOUSEDEV is not set 103# CONFIG_INPUT_MOUSEDEV is not set
103# CONFIG_INPUT_KEYBOARD is not set 104# CONFIG_INPUT_KEYBOARD is not set
104# CONFIG_INPUT_MOUSE is not set 105# CONFIG_INPUT_MOUSE is not set
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index 066eb45afb0b..3bf794be5b81 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -93,6 +93,7 @@ CONFIG_FSL_XGMAC_MDIO=y
93CONFIG_E1000E=y 93CONFIG_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_INPUT_FF_MEMLESS=m 97CONFIG_INPUT_FF_MEMLESS=m
97# CONFIG_INPUT_MOUSEDEV is not set 98# CONFIG_INPUT_MOUSEDEV is not set
98# CONFIG_INPUT_KEYBOARD is not set 99# 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 902358d4c832..382058908910 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -88,6 +88,9 @@ static const struct of_device_id of_device_ids[] = {
88 .compatible = "simple-bus" 88 .compatible = "simple-bus"
89 }, 89 },
90 { 90 {
91 .compatible = "mdio-mux-gpio"
92 },
93 {
91 .compatible = "fsl,srio", 94 .compatible = "fsl,srio",
92 }, 95 },
93 { 96 {