Hisilicon hip01 soc and development board updates for 3.20
Hi Arnd, Hi Olof, Hi Kevin,
Could you please help to merge the pull request of hisilicon hip01 soc for 3.20. Thanks!
Best Regards,
Wei
The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.git tags/hip01-for-3.20-v2
for you to fetch changes up to 27040189cb050cbe52a81c0e6aeb552872aa0736:
ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
----------------------------------------------------------------
ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20
- Add hip01 debug UART
- Add hip01 DT_MACHINE and ARCH_HIP01 configure item
- Add dts for Hisilicon hip01-ca9x2 board
- Enable ARCH_HIP01 in the hisi_defconfig
- Rename hix5hd2_smp_prepare_cpus to hisi_common_smp_prepare_cpus
- Rename hix5hd2_secondary_startup to hisi_secondary_startup
- Enable smp for hip01
----------------------------------------------------------------
Wang Long (7):
ARM: debug: add HiP01 debug uart
ARM: hisi: enable HiP01 SoC
ARM: dts: Add hip01-ca9x2 dts file
ARM: config: enable ARCH_HIP01
ARM: hisi: rename smp_prepares_cpus function
ARM: hisi: rename secondary_startup function
ARM: hisi: enable smp for HiP01
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt | 25 +++++++++++++++++++++++++ arch/arm/Kconfig.debug | 10 ++++++++++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/hip01-ca9x2.dts | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/hip01.dtsi | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/configs/hisi_defconfig | 1 + arch/arm/mach-hisi/Kconfig | 8 ++++++++ arch/arm/mach-hisi/core.h | 5 ++++- arch/arm/mach-hisi/headsmp.S | 2 +- arch/arm/mach-hisi/hisilicon.c | 10 ++++++++++ arch/arm/mach-hisi/hotplug.c | 31 +++++++++++++++++++++++++++++++ arch/arm/mach-hisi/platsmp.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 12 files changed, 305 insertions(+), 5 deletions(-) create mode 100644 arch/arm/boot/dts/hip01-ca9x2.dts create mode 100644 arch/arm/boot/dts/hip01.dtsi
Quoted 23 lines · Wei Xu
Hi Arnd, Hi Olof, Hi Kevin,
Could you please help to merge the pull request of hisilicon hip01 soc for 3.20. Thanks!
Best Regards,
WeiThe following changes since commit
97bf6af1f928216fd6c5a66e8a57bfa95a659672:Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hip01-for-3.20-v2for you to fetch changes up to
27040189cb050cbe52a81c0e6aeb552872aa0736:ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
----------------------------------------------------------------
ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20
Quoted 7 lines
- Add hip01 debug UART
- Add hip01DT_MACHINEandARCH_HIP01configure item
- Add dts for Hisilicon hip01-ca9x2 board
- EnableARCH_HIP01in thehisi_defconfig
- Renamehix5hd2_smp_prepare_cpustohisi_common_smp_prepare_cpus
- Renamehix5hd2_secondary_startuptohisi_secondary_startup
- Enable smp for hip01
Merged.
-Olof
Quoted 23 lines · Wei Xu
Hi Arnd, Hi Olof, Hi Kevin,
Could you please help to merge the pull request of hisilicon hip01 soc for 3.20. Thanks!
Best Regards,
WeiThe following changes since commit
97bf6af1f928216fd6c5a66e8a57bfa95a659672:Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hip01-for-3.20-v2for you to fetch changes up to
27040189cb050cbe52a81c0e6aeb552872aa0736:ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
----------------------------------------------------------------
ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20
Quoted 7 lines
- Add hip01 debug UART
- Add hip01DT_MACHINEandARCH_HIP01configure item
- Add dts for Hisilicon hip01-ca9x2 board
- EnableARCH_HIP01in thehisi_defconfig
- Renamehix5hd2_smp_prepare_cpustohisi_common_smp_prepare_cpus
- Renamehix5hd2_secondary_startuptohisi_secondary_startup
- Enable smp for hip01
Actually, you're adding a new dts file that's conflicting at the top level now, and we don't want that.
Please split your branches like other maintainers do into soc and dt branches.
dt
soc
defconfig
I don't know your workflow, if you have users of your branches. If not, and if your tree isn't in linux-next, I can cherry pick the branch apart as needed here. Just let me know.
Thanks.
-Olof
Quoted 24 lines · Olof Johansson
Quoted 23 lines · Wei Xu
Hi Arnd, Hi Olof, Hi Kevin,
Could you please help to merge the pull request of hisilicon hip01 soc for 3.20. Thanks!
Best Regards,
WeiThe following changes since commit
97bf6af1f928216fd6c5a66e8a57bfa95a659672:Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hip01-for-3.20-v2for you to fetch changes up to
27040189cb050cbe52a81c0e6aeb552872aa0736:ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
----------------------------------------------------------------
ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20
Quoted 7 lines
Quoted 7 lines
- Add hip01 debug UART
- Add hip01DT_MACHINEandARCH_HIP01configure item
- Add dts for Hisilicon hip01-ca9x2 board
- EnableARCH_HIP01in thehisi_defconfig
- Renamehix5hd2_smp_prepare_cpustohisi_common_smp_prepare_cpus
- Renamehix5hd2_secondary_startuptohisi_secondary_startup
- Enable smp for hip01
Hi Olof,
Quoted 8 lines
Actually, you're adding a new dts file that's conflicting at the top level now, and we don't want that.
Please split your branches like other maintainers do into soc and dt branches.
dt
soc
defconfig
Thanks for your patient education!
I will follow it next time.
Quoted 3 lines
I don't know your workflow, if you have users of your branches. If not, and if your tree isn't in linux-next, I can cherry pick the branch apart as needed here. Just let me know.
My tree is not in linux-next. I have checked the linux-next.git/tree/Next/Trees. Could you please help to cherry pick them this time?
Thanks!
Best Regards,
Wei
Quoted 7 lines
Thanks.
-Olof
.
Quoted 49 lines · Wei Xu
Quoted 24 lines · Olof Johansson
Quoted 23 lines · Wei Xu
Hi Arnd, Hi Olof, Hi Kevin,
Could you please help to merge the pull request of hisilicon hip01 soc for 3.20. Thanks!
Best Regards,
WeiThe following changes since commit
97bf6af1f928216fd6c5a66e8a57bfa95a659672:Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hip01-for-3.20-v2for you to fetch changes up to
27040189cb050cbe52a81c0e6aeb552872aa0736:ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
----------------------------------------------------------------
ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20Quoted 7 lines
Quoted 7 lines
- Add hip01 debug UART
- Add hip01DT_MACHINEandARCH_HIP01configure item
- Add dts for Hisilicon hip01-ca9x2 board
- EnableARCH_HIP01in thehisi_defconfig
- Renamehix5hd2_smp_prepare_cpustohisi_common_smp_prepare_cpus
- Renamehix5hd2_secondary_startuptohisi_secondary_startup
- Enable smp for hip01Hi Olof,
Quoted 8 lines
Actually, you're adding a new dts file that's conflicting at the top level now, and we don't want that.
Please split your branches like other maintainers do into soc and dt branches.
dt
soc
defconfigThanks for your patient education!
I will follow it next time.
Quoted 7 lines
Quoted 3 lines
I don't know your workflow, if you have users of your branches. If not, and if your tree isn't in linux-next, I can cherry pick the branch apart as needed here. Just let me know.
My tree is not in linux-next. I have checked the linux-next.git/tree/Next/Trees. Could you please help to cherry pick them this time?
Thanks!
Ok, done. The patch "ARM: hisi: enable smp for HiP01" had a change to both code and DT contents. I ended up folding the DT change into the patch that introduced the dts file instead.
The rest was split across next/dt, next/soc and next/defconfig.
Thanks,
-Olof
Quoted 50 lines · Olof Johansson
Quoted 49 lines · Wei Xu
Quoted 24 lines · Olof Johansson
Quoted 23 lines · Wei Xu
Hi Arnd, Hi Olof, Hi Kevin,
Could you please help to merge the pull request of hisilicon hip01 soc for 3.20. Thanks!
Best Regards,
WeiThe following changes since commit
97bf6af1f928216fd6c5a66e8a57bfa95a659672:Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hip01-for-3.20-v2for you to fetch changes up to
27040189cb050cbe52a81c0e6aeb552872aa0736:ARM: hisi: enable smp for HiP01 (2015-01-15 09:59:51 +0800)
----------------------------------------------------------------
ARM: mach-hisi: Hisilicon hip01 soc and development board updates for 3.20Quoted 7 lines
Quoted 7 lines
- Add hip01 debug UART
- Add hip01DT_MACHINEandARCH_HIP01configure item
- Add dts for Hisilicon hip01-ca9x2 board
- EnableARCH_HIP01in thehisi_defconfig
- Renamehix5hd2_smp_prepare_cpustohisi_common_smp_prepare_cpus
- Renamehix5hd2_secondary_startuptohisi_secondary_startup
- Enable smp for hip01Hi Olof,
Quoted 8 lines
Actually, you're adding a new dts file that's conflicting at the top level now, and we don't want that.
Please split your branches like other maintainers do into soc and dt branches.
dt
soc
defconfigThanks for your patient education!
I will follow it next time.
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
I don't know your workflow, if you have users of your branches. If not, and if your tree isn't in linux-next, I can cherry pick the branch apart as needed here. Just let me know.
My tree is not in linux-next. I have checked the linux-next.git/tree/Next/Trees. Could you please help to cherry pick them this time?
Thanks!
Hi Olof,
Quoted 5 lines
Ok, done. The patch "ARM: hisi: enable smp for HiP01" had a change to both code and DT contents. I ended up folding the DT change into the patch that introduced the dts file instead.
The rest was split across next/dt, next/soc and next/defconfig.
Thanks!
Best Regards,
Wei
Quoted 7 lines
Thanks,
-Olof
.