Skip to content

Conversation

@vchong
Copy link

@vchong vchong commented Aug 3, 2017

Signed-off-by: Victor Chong victor.chong@linaro.org

Guodong Xu added 19 commits July 31, 2017 10:15
…-hikey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-cpufeature-v4.9:
  arm64: cpufeature: Fix CPU_OUT_OF_SPEC taint for uniform systems
  arm64: cpufeature: Don't dump useless backtrace on CPU_OUT_OF_SPEC
…60-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-dts-v4.9: (52 commits)
  arm64: dt: hikey960: Add optee node
  dt/bindings: add bindings for optee
  arm64: dts: hi3660: Reset the mmc hosts
  arm64: dts: hi3660-hikey960: set ldo3 always-on
  arm64: dts: hi3660: add gpu lowpower feature for Mali
  TEMP: dts: arm64: hi3660: disable spi2, xloader update pending
  dts: hi3660: Add EAS energy model provide big.LITTLE info
  arm64: dts: hi3660-hikey960: add kim and btwilink nodes for bluetooth obsolete
  arm64: dts: hi3660-hikey960: add entries to reserved-memory
  arm64: dts: hi3660: add ION dts entries
  arm64: dts: hi3660: Add hdmi audio support
  arm64: dts: hi3660: add hisilicon DRM and adv7533 node
  DOUBLECHECK: arm64: dts: hi3660: adb reboot node
  dts: arm64: add thermal zone for Hi3660
  dts: arm64: bind CPUs OPP table for Hi3660
  dts: arm64: bind stub clock driver for Hi3660
  dts: arm64: add mailbox binding for hi3660
  arm64: dts: hikey960: Add pstore support
  arm64: dts: hikey960: Add support for syscon-reboot-mode
  arm64: dts: enable gpu
  ...
…60-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-clk-v4.9:
  clk: hisilicon: add stub clock driver for Hi3660
  clk: Hi3660: register fixed_rate_clks with CLK_OF_DECLARE_DRIVER
  clk: hi3660: Set PPLL2 to 2880M
  clk: hi3660: add clocks for video encoder, decoder and ISP
  clk: hi3660: fix wrong parent name of clk_mux_sysbus
  clk: hisilicon: Add clock driver for hi3660 SoC
  dt-bindings: Document the hi3660 clock bindings
  clk: hisilicon: fix lock assignment
…60-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-usb-v4.9:
  HACK: Revert dwc3 code to android-hikey-linaro-4.4 era code
  usb: add dwc3 driver for hikey960
  usb: add pd support for hikey960
  usb: add hub_usb5734 driver for hikey960
  usb: separate out sysdev pointer from usb_bus
  usb: xhci: use bus->sysdev for DMA configuration
…y960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-reset-v4.9:
  DOUBLECHECK: reset: hisi-reboot: adb reboot bootloader
  i2c: designware: add reset interface
  reset: hisilicon: add reset-hi3660
  dt-bindings: Document the hi3660 reset bindings
…ing-hikey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-mfd-regulator-v4.9:
  regulator: hi6421v530: Describe consumed platform device
  regulator: hi6421v530: add driver for hi6421v530 voltage regulator
  regulator: hi6421: Describe consumed platform device
  mfd: hi6421-pmic: add support for HiSilicon Hi6421v530
  mfd: hi6421-pmic: cleanup: update dev_err messages
  mfd: hi6421-pmic: cleanup: change license text to shorter form
…60-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-ufs-v4.9:
  scsi:ufs:add hi3660 ufs driver code
  scsi:ufs:add AHIT for hi3660 ufs
…0-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-sd-v4.9:
  mmc: dw_mmc-k3: remove reset assertion from probe
  mmc: dw_mmc: move controller reset before driver init op
  mmc: dw_mmc-k3: add sd support for hi3660
…960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-mali-v4.9: (21 commits)
  MALI: Fixup config time warning
  MALI: Fix 32bit apps w/ legacy r4p0 userspace libraries
  MALI: Update hikey960 platform bits to r7p0
  MALI: Update to r7p0 bifrost driver
  MALI: Re-add the hikey960 platform code to work w/ bifrost r6p0 driver.
  MALI: Build fixup for r6p0 update
  MALI: Update bifrost driver to r6p0
  mali: Remove unused platform code
  mali: Fix devfreq issues
  drivers: gpu: add gpu part11
  drivers: gpu: add gpu part10
  drivers: gpu: add gpu part9
  drivers: gpu: add gpu part8
  drivers: gpu: add gpu part7
  drivers: gpu: add gpu part6
  drivers: gpu: add gpu part5
  drivers: gpu: add gpu part4
  drivers: gpu: add gpu part3
  drivers: gpu: add gpu part2
  drivers: gpu: add gpu part1
  ...
…960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-pcie-v4.9:
  PCI: kirin: add PCIe drivers for hisilicon Kirin SoC
…0-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-pm-v4.9:
  thermal: hisilicon: add thermal sensor driver for Hi3660
  mailbox: handle empty message in tx_tick
  mailbox: skip complete wait event if timer expired
  mailbox: always wait in mbox_send_message for blocking Tx mode
  mailbox: Hi3660: add support for async mode
  cpufreq: hisi-acpu: add support for hi3660
  driver: mailbox: add support for hi3660
  cpuidle: hisi-cpuidle: add hisilicon cpuidle driver
…hikey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-bluetooth-v4.9:
  ti-st: Build fixup for 4.9
  ti-st: tty_hci: fix user space access
  Bluetooth: Add LED triggers for bluetooth packet receive and transmit
  misc: ti-st: Fix build warnings
  Revert "Revert "ti-st: add device tree support""
  Bluetooth: Add tty HCI driver
  btwilink: add minimal device tree support
…ey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-binder-v4.9:
  binder: Add support for file-descriptor arrays
  binder: Add support for scatter-gather
  binder: Add extra size to allocator
  binder: Refactor binder_transact()
  binder: Support multiple /dev instances
  binder: Deal with contexts in debugfs
  binder: Support multiple context managers
  binder: Split flat_binder_object
…hikey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-hack-aosp-v4.9:
  HACK: ion: Revert all ion code back to android-hikey-linaro-4.4
  HACK: Use CAP_SYS_NICE instead of CAP_CGROUP for now
…key960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-adv7511-v4.9:
  HACK: adv7511: Add delay to allow for edid probing to work
  Add adv7511 changes from android-hikey-linaro-4.9 branch
…60-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-drm-v4.9:
  drm: kirin960: Cleanup unused functions
  iommu: fix building warning
  iommu: iommu code changes
  HACK: drm: kirin960: Build fixups and changes to make it work
  kirin_fbdev: Eat FBIO_WAITFORVSYNC ioctl to avoid errors
  drm: resolve the performance issue by interrupt mechanism
  drm: hisilicon: solve tearing issue of display
  drm: solve display underflow at 1280x800@60fps
  drm: Add hisilicon DRM driver for hikey960
…y960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-sound-v4.9:
  Sound: Remove deprecated code, as power supply is already enabled in fastboot
  sound: Add hisi i2s audio driver
…ey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-op-tee-v4.9:
  tee: optee: fix uninitialized symbol 'parg'
  tee: add forward declaration for struct device
  tee: optee: optee_bench.h: remove useless include **not for mainline**
  OP-TEE Benchmark **not for mainline**
  tee: optee: interruptible RPC sleep
  Sync OP-TEE driver with new naming of interrupts
  tee: apply v16 delta
  tee: apply v15 delta
  optee: support asynchronous supplicant requests
  tee: add TEE_IOCTL_PARAM_ATTR_META
  tee: add tee_param_is_memref() for driver use
  tee: indicate privileged dev in gen_caps
  optee: sync patch set v14
  tee: add kernel internal client interface **not for mainline**
  tee: new ioctl to a register tee_shm from a dmabuf file descriptor
  include/linux/arm-smccc.h: avoid sign extension problem
  Documentation: tee subsystem and op-tee driver
  tee: add OP-TEE driver
  tee: generic TEE subsystem
…hikey960-upstream-rebase-v4.9-2017-07-31-10-15-34

* working-hikey960-upstream-defconfig-v4.9: (23 commits)
  hikey960_defconfig: Cleanup hikey960_defconfig via savedefconfig
  arm64: defconfig: enable sync_file, update Mali
  hikey960_defconfig: clean up MALI configs
  hikey960_defconfig: enable sync_file
  hikey960_defconfig: enable bluetooth for TI WL183x
  arm64: defconfig: enable bluetooth for TI WL183x
  hikey960_defconfig: Enable gpu devfreq and thermal
  arm64: defconfig: Enable gpu devfreq and thermal
  hikey960_defconfig: append CPUFREQ configs
  hikey960_defconfig: append CONFIG_CPU_IDLE_MULTIPLE_DRIVERS configs
  hikey960_defconfig: append F2FS and SQUASHFS configs
  hikey960_defconfig: append MALI configs
  hikey960_defconfig: append USB configs
  hikey960_defconfig: add configs for thermal sensor
  arm64: defconfig: add configs for thermal sensor
  hikey960_defconfig: Add initial defconfig
  arm64: defconfig: enable usb for hikey960
  arm64: defconfig: enable power management for Hi3660
  arm64: defconfig: PCI: add PCIe drivers defconfig for hisilicon Kirin SoC
  arm64: defconfig: enable Mali GPU
  ...
@vchong
Copy link
Author

vchong commented Aug 3, 2017

@docularxu I took the latest from today (dfe5529), added CONFIG_TEE=y and CONFIG_OPTEE=y to defconfig and hikey960_defconfig, ran below commands:

make ARCH=arm64 defconfig
make ARCH=arm64 savedefconfig
mv defconfig arch/arm64/configs
make ARCH=arm64 hikey960_defconfig
make ARCH=arm64 savedefconfig
mv defconfig arch/arm64/configs/hikey960_defconfig

and submitted this PR. But the diff generated more than just 2 lines of difference. Please advise. Thanks!

Signed-off-by: Victor Chong <victor.chong@linaro.org>
@vchong
Copy link
Author

vchong commented Aug 3, 2017

@docularxu Updated per offline discussion. Thanks for the tip! :)

@fboudra
Copy link

fboudra commented Aug 4, 2017

@vchong some kernel configs are changed and are unrelated to OP-TEE. Usually, you should add your new kernel configs then use make savedefconfig.

@docularxu docularxu closed this Aug 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants