From 0f3a05cb43e731b8cf861dee30e7e4bddd6c5ccc Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 15 Dec 2012 11:52:10 +0100 Subject: [PATCH] MIPS: MSP71xx: Move code. Now that Yosemite's gone we can move the MSP71xx code one level up. Shane McDonald 's https://patchwork.linux-mips.org/patch/4736/ has been folded into this patch. Signed-off-by: Ralf Baechle --- arch/mips/Kbuild.platforms | 2 +- arch/mips/Kconfig | 2 +- .../msp71xx => mach-pmcs-msp71xx}/cpu-feature-overrides.h | 0 .../asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/gpio.h | 0 .../msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h | 0 .../msp71xx => mach-pmcs-msp71xx}/msp_gpio_macros.h | 0 .../{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_int.h | 0 .../{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_pci.h | 0 .../{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_prom.h | 0 .../{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regops.h | 0 .../{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regs.h | 0 .../msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h | 0 .../{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_usb.h | 0 .../asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/war.h | 0 arch/mips/pmc-sierra/Platform | 7 ------- arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile | 0 arch/mips/pmcs-msp71xx/Platform | 7 +++++++ arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c | 0 .../{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio_extended.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c | 0 .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_hwbutton.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c | 0 .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_cic.c | 0 .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_per.c | 0 .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_slp.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_prom.c | 0 .../mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_serial.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_setup.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smtc.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_time.c | 0 arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c | 0 35 files changed, 9 insertions(+), 9 deletions(-) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/cpu-feature-overrides.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/gpio.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_gpio_macros.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_int.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_pci.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_prom.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regops.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regs.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_usb.h (100%) rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/war.h (100%) delete mode 100644 arch/mips/pmc-sierra/Platform rename arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile (100%) create mode 100644 arch/mips/pmcs-msp71xx/Platform rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio_extended.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_hwbutton.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_cic.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_per.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_slp.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_prom.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_serial.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_setup.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smtc.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_time.c (100%) rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c (100%) diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index c7ea3a08c729..5c088494e046 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms @@ -18,7 +18,7 @@ platforms += loongson1 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 6b1c33b65d15..af4e04fde0b4 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -835,7 +835,7 @@ source "arch/mips/jazz/Kconfig" 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 387fda6c28c6..000000000000 --- 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 000000000000..7af0734a5007 --- /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 -- 2.20.1