* [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20
@ 2015-01-15 2:19 Wei Xu
2015-01-19 19:17 ` Olof Johansson
2015-01-19 19:19 ` Olof Johansson
0 siblings, 2 replies; 6+ messages in thread
From: Wei Xu @ 2015-01-15 2:19 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 2015-01-15 2:19 [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 Wei Xu @ 2015-01-19 19:17 ` Olof Johansson 2015-01-19 19:19 ` Olof Johansson 1 sibling, 0 replies; 6+ messages in thread From: Olof Johansson @ 2015-01-19 19:17 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 15, 2015 at 10:19:23AM +0800, Wei Xu wrote: > 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 Merged. -Olof ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 2015-01-15 2:19 [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 Wei Xu 2015-01-19 19:17 ` Olof Johansson @ 2015-01-19 19:19 ` Olof Johansson 2015-01-20 5:39 ` Wei Xu 1 sibling, 1 reply; 6+ messages in thread From: Olof Johansson @ 2015-01-19 19:19 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 15, 2015 at 10:19:23AM +0800, Wei Xu wrote: > 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 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 2015-01-19 19:19 ` Olof Johansson @ 2015-01-20 5:39 ` Wei Xu 2015-01-21 22:36 ` Olof Johansson 0 siblings, 1 reply; 6+ messages in thread From: Wei Xu @ 2015-01-20 5:39 UTC (permalink / raw) To: linux-arm-kernel On 2015/1/20 3:19, Olof Johansson wrote: > On Thu, Jan 15, 2015 at 10:19:23AM +0800, Wei Xu wrote: >> 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 Hi Olof, > 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. > 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 > > Thanks. > > -Olof > > . > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 2015-01-20 5:39 ` Wei Xu @ 2015-01-21 22:36 ` Olof Johansson 2015-01-22 0:31 ` Wei Xu 0 siblings, 1 reply; 6+ messages in thread From: Olof Johansson @ 2015-01-21 22:36 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 20, 2015 at 01:39:38PM +0800, Wei Xu wrote: > > > On 2015/1/20 3:19, Olof Johansson wrote: > > On Thu, Jan 15, 2015 at 10:19:23AM +0800, Wei Xu wrote: > >> 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 > > Hi Olof, > > > 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. > > > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 2015-01-21 22:36 ` Olof Johansson @ 2015-01-22 0:31 ` Wei Xu 0 siblings, 0 replies; 6+ messages in thread From: Wei Xu @ 2015-01-22 0:31 UTC (permalink / raw) To: linux-arm-kernel On 2015/1/22 6:36, Olof Johansson wrote: > On Tue, Jan 20, 2015 at 01:39:38PM +0800, Wei Xu wrote: >> >> >> On 2015/1/20 3:19, Olof Johansson wrote: >>> On Thu, Jan 15, 2015 at 10:19:23AM +0800, Wei Xu wrote: >>>> 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 >> >> Hi Olof, >> >>> 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. >> >>> 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, > 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 > > Thanks, > > -Olof > > . > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-22 0:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-01-15 2:19 [GIT PULL v2]Hisilicon hip01 soc and development board updates for 3.20 Wei Xu 2015-01-19 19:17 ` Olof Johansson 2015-01-19 19:19 ` Olof Johansson 2015-01-20 5:39 ` Wei Xu 2015-01-21 22:36 ` Olof Johansson 2015-01-22 0:31 ` Wei Xu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.