commit | 0f3a05cb43e731b8cf861dee30e7e4bddd6c5ccc | [log] [tgz] |
---|---|---|
author | Ralf Baechle <ralf@linux-mips.org> | Sat Dec 15 11:52:10 2012 +0100 |
committer | Ralf Baechle <ralf@linux-mips.org> | Fri Feb 01 10:00:22 2013 +0100 |
tree | e19550e56ab9cf95a99d6aa31502099950cdbce3 | |
parent | 7034228792cc561e79ff8600f02884bd4c80e287 [diff] |
MIPS: MSP71xx: Move code. Now that Yosemite's gone we can move the MSP71xx code one level up. Shane McDonald <mcdonald.shane@gmail.com>'s https://patchwork.linux-mips.org/patch/4736/ has been folded into this patch. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index c7ea3a0..5c08849 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms
@@ -18,7 +18,7 @@ platforms += mti-malta platforms += mti-sead3 platforms += netlogic -platforms += pmc-sierra +platforms += pmcs-msp71xx platforms += pnx833x platforms += powertv platforms += rb532
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6b1c33b..af4e04f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -835,7 +835,7 @@ source "arch/mips/jz4740/Kconfig" source "arch/mips/lantiq/Kconfig" source "arch/mips/lasat/Kconfig" -source "arch/mips/pmc-sierra/Kconfig" +source "arch/mips/pmcs-msp71xx/Kconfig" source "arch/mips/powertv/Kconfig" source "arch/mips/sgi-ip27/Kconfig" source "arch/mips/sibyte/Kconfig"
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h b/arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_gpio_macros.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_gpio_macros.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_usb.h b/arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/msp_usb.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/war.h b/arch/mips/include/asm/mach-pmcs-msp71xx/war.h similarity index 100% rename from arch/mips/include/asm/pmc-sierra/msp71xx/war.h rename to arch/mips/include/asm/mach-pmcs-msp71xx/war.h
diff --git a/arch/mips/pmc-sierra/Platform b/arch/mips/pmc-sierra/Platform deleted file mode 100644 index 387fda6..0000000 --- a/arch/mips/pmc-sierra/Platform +++ /dev/null
@@ -1,7 +0,0 @@ -# -# PMC-Sierra MSP SOCs -# -platform-$(CONFIG_PMC_MSP) += pmc-sierra/msp71xx/ -cflags-$(CONFIG_PMC_MSP) += -I$(srctree)/arch/mips/include/asm/pmc-sierra/msp71xx \ - -mno-branch-likely -load-$(CONFIG_PMC_MSP) += 0xffffffff80100000
diff --git a/arch/mips/pmc-sierra/Kconfig b/arch/mips/pmcs-msp71xx/Kconfig similarity index 100% rename from arch/mips/pmc-sierra/Kconfig rename to arch/mips/pmcs-msp71xx/Kconfig
diff --git a/arch/mips/pmc-sierra/msp71xx/Makefile b/arch/mips/pmcs-msp71xx/Makefile similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/Makefile rename to arch/mips/pmcs-msp71xx/Makefile
diff --git a/arch/mips/pmcs-msp71xx/Platform b/arch/mips/pmcs-msp71xx/Platform new file mode 100644 index 0000000..7af0734 --- /dev/null +++ b/arch/mips/pmcs-msp71xx/Platform
@@ -0,0 +1,7 @@ +# +# PMC-Sierra MSP SOCs +# +platform-$(CONFIG_PMC_MSP) += pmcs-msp71xx/ +cflags-$(CONFIG_PMC_MSP) += -I$(srctree)/arch/mips/include/asm/mach-pmcs-msp71xx \ + -mno-branch-likely +load-$(CONFIG_PMC_MSP) += 0xffffffff80100000
diff --git a/arch/mips/pmc-sierra/msp71xx/gpio.c b/arch/mips/pmcs-msp71xx/gpio.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/gpio.c rename to arch/mips/pmcs-msp71xx/gpio.c
diff --git a/arch/mips/pmc-sierra/msp71xx/gpio_extended.c b/arch/mips/pmcs-msp71xx/gpio_extended.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/gpio_extended.c rename to arch/mips/pmcs-msp71xx/gpio_extended.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_elb.c b/arch/mips/pmcs-msp71xx/msp_elb.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_elb.c rename to arch/mips/pmcs-msp71xx/msp_elb.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_eth.c b/arch/mips/pmcs-msp71xx/msp_eth.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_eth.c rename to arch/mips/pmcs-msp71xx/msp_eth.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmcs-msp71xx/msp_hwbutton.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c rename to arch/mips/pmcs-msp71xx/msp_hwbutton.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq.c b/arch/mips/pmcs-msp71xx/msp_irq.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_irq.c rename to arch/mips/pmcs-msp71xx/msp_irq.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c b/arch/mips/pmcs-msp71xx/msp_irq_cic.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c rename to arch/mips/pmcs-msp71xx/msp_irq_cic.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c b/arch/mips/pmcs-msp71xx/msp_irq_per.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_irq_per.c rename to arch/mips/pmcs-msp71xx/msp_irq_per.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmcs-msp71xx/msp_irq_slp.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c rename to arch/mips/pmcs-msp71xx/msp_irq_slp.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_pci.c b/arch/mips/pmcs-msp71xx/msp_pci.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_pci.c rename to arch/mips/pmcs-msp71xx/msp_pci.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_prom.c b/arch/mips/pmcs-msp71xx/msp_prom.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_prom.c rename to arch/mips/pmcs-msp71xx/msp_prom.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmcs-msp71xx/msp_serial.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_serial.c rename to arch/mips/pmcs-msp71xx/msp_serial.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmcs-msp71xx/msp_setup.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_setup.c rename to arch/mips/pmcs-msp71xx/msp_setup.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_smp.c b/arch/mips/pmcs-msp71xx/msp_smp.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_smp.c rename to arch/mips/pmcs-msp71xx/msp_smp.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_smtc.c b/arch/mips/pmcs-msp71xx/msp_smtc.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_smtc.c rename to arch/mips/pmcs-msp71xx/msp_smtc.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmcs-msp71xx/msp_time.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_time.c rename to arch/mips/pmcs-msp71xx/msp_time.c
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_usb.c b/arch/mips/pmcs-msp71xx/msp_usb.c similarity index 100% rename from arch/mips/pmc-sierra/msp71xx/msp_usb.c rename to arch/mips/pmcs-msp71xx/msp_usb.c