Skip to contentSkip to conversation

ARM: initial Rockchip stuff for 4.3

GIT PULL New Heiko Stübner 2 participants 11 messages Jul 16, 2015 – Jul 17, 2015

Subsystems (4)
lore
Share & tools
lore

Heiko Stübner

author maintainer
#0 lore raw

Hi Olof, Kevin, Arnd,

The 3 patches add support for the rk3368 ARM64 soc from Rockchip. Patch 3/3 needs a dependency, namely

git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-rk3368

which Stephen Boyd declared stable.

The patches for rk3368 have been on the lists for 3 weeks now.

The two pull requests then add stuff for the 32bit Rockchip socs explained in the signed tags in them.

So if nothing stands out, please apply and pull.

Thanks
Heiko

author maintainer
#1 lore raw

PATCH 1/3 arm64: add Rockchip architecture entry

The rk3368 is Rockchip's first ARM64 soc, build around 8 Cortex-A53 cores.

---
 arch/arm64/Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm64/Kconfig +10 -0
index 0f6edb1..6ad9971 100644
@@ -202,6 +202,16 @@ config ARCH_QCOM
 	help
 	  This enables support for the ARMv8 based Qualcomm chipsets.
 
+config ARCH_ROCKCHIP
+	bool "Rockchip Platforms"
+	select ARCH_HAS_RESET_CONTROLLER
+	select ARCH_REQUIRE_GPIOLIB
+	select PINCTRL
+	select PINCTRL_ROCKCHIP
+	help
+	  This enables support for the ARMv8 based Rockchip chipsets,
+	  like the RK3368.
+
 config ARCH_SEATTLE
 	bool "AMD Seattle SoC Family"
 	help
Signature · 1 line
2.1.4
#2 lore raw

PATCH 1/3 arm64: add Rockchip architecture entry

Quoted 6 lines · Heiko St?bner

The rk3368 is Rockchip's first ARM64 soc, build around 8 Cortex-A53 cores.

---
 arch/arm64/Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

Thanks, applied (to Kconfig.platforms)

-Olof

author maintainer
#3 lore raw

PATCH 2/3 arm64: defconfig: enable ARCH_ROCKCHIP

In reply to Heiko Stübner

Enable building Rockchip support in the defconfig.

---
 arch/arm64/configs/defconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/configs/defconfig +2 -0
index f38c94f..410646f 100644
@@ -35,6 +35,7 @@ CONFIG_ARCH_EXYNOS7=y
 CONFIG_ARCH_FSL_LS2085A=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_132_SOC=y
@@ -101,6 +102,7 @@ CONFIG_SERIO_AMBAKMI=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
Signature · 1 line
2.1.4
#4 lore raw

PATCH 2/3 arm64: defconfig: enable ARCH_ROCKCHIP

Quoted 6 lines · Heiko St?bner

Enable building Rockchip support in the defconfig.

---
 arch/arm64/configs/defconfig | 2 ++
 1 file changed, 2 insertions(+)

APplied, but based on earlier email with Will, we might need to deal with this conflicting with them enabling feature options. Should be manageable.

-Olof

author maintainer
#5 lore raw

PATCH 3/3 arm64: dts: add Rockchip rk3368 core dtsi and board dts for the r88 board

In reply to Heiko Stübner

In terms of peripherals the rk3368 is quite similar to the rk3288, which makes it possible to have a lot basic components working in the first go. More to follow once I tracked down all the tiny differences that still exist in some parts.

With these dts files, the R88 board is able to boot from an attached usb device and most likely from its emmc too, if the emmc uses a standard partition table instead of Rockchip's own one - the emmc itself is detected correctly.

---
as mentioned in the cover letter, needed dependency (stable branch)

git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-rk3368

 arch/arm64/boot/dts/Makefile                |   1 +
 arch/arm64/boot/dts/rockchip/Makefile       |   5 +
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 354 +++++++++++
 arch/arm64/boot/dts/rockchip/rk3368.dtsi    | 900 ++++++++++++++++++++++++++++
 4 files changed, 1260 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/Makefile
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-r88.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368.dtsi
arch/arm64/boot/dts/Makefile +1 -0
index 38913be..0c57290 100644
@@ -7,6 +7,7 @@ dts-dirs += freescale
 dts-dirs += hisilicon
 dts-dirs += mediatek
 dts-dirs += qcom
+dts-dirs += rockchip
 dts-dirs += sprd
 dts-dirs += xilinx
 
arch/arm64/boot/dts/rockchip/Makefile new file +5 -0
new file mode 100644
index 0000000..601e6a2
@@ -0,0 +1,5 @@
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
+
+always		:= $(dtb-y)
+subdir-y	:= $(dts-dirs)
+clean-files	:= *.dtb
arch/arm64/boot/dts/rockchip/rk3368-r88.dts new file +354 -0

354 lines not on this page · raw message

arch/arm64/boot/dts/rockchip/rk3368.dtsi new file +900 -0

900 lines not on this page · raw message

Signature · 1 line
2.1.4
#6 lore raw

PATCH 3/3 arm64: dts: add Rockchip rk3368 core dtsi and board dts for the r88 board

Quoted 10 lines · Heiko St?bner

In terms of peripherals the rk3368 is quite similar to the rk3288, which makes it possible to have a lot basic components working in the first go. More to follow once I tracked down all the tiny differences that still exist in some parts.

With these dts files, the R88 board is able to boot from an attached usb device and most likely from its emmc too, if the emmc uses a standard partition table instead of Rockchip's own one - the emmc itself is detected correctly.

Quoted 6 lines

---
as mentioned in the cover letter, needed dependency (stable branch)

git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-rk3368

Merged in the branch and applied the patch. Thanks.

-Olof

author maintainer
#7 lore raw

[GIT PULL 1/2] Rockchip soc changes for 4.3, part1

In reply to Heiko Stübner

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.3-rockchip32-soc1

for you to fetch changes up to cb8cc37f4d38d96552f2c52deb15e511cdacf906:

ARM: rockchip: fix broken build (2015-07-06 11:46:08 +0200)

----------------------------------------------------------------
Some suspend improvements enabling the possibility to wakeup from usbphy events and a rework of how cpu cores are brought u? and down, as it was possible to produce lockups when hammering the cpu hotplug functions.

----------------------------------------------------------------
Caesar Wang (4):
ARM: rockchip: fix the CPU soft reset
ARM: rockchip: ensure CPU to enter WFI/WFE state
ARM: rockchip: fix the SMP code style
ARM: rockchip: fix broken build

Chris Zhong (2):
ARM: rockchip: add support holding 24Mhz osc during suspend
ARM: rockchip: remove some useless macro in pm.h

Doug Anderson (1):
ARM: rockchip: restore dapswjdp after suspend

 arch/arm/mach-rockchip/platsmp.c | 56 ++++++++++++++++++++++++----------------
 arch/arm/mach-rockchip/pm.c      | 45 ++++++++++++++++++++++++++++++--
 arch/arm/mach-rockchip/pm.h      |  7 -----
 3 files changed, 77 insertions(+), 31 deletions(-)
#8 lore raw

[GIT PULL 1/2] Rockchip soc changes for 4.3, part1

Quoted 10 lines · Heiko St?bner

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.3-rockchip32-soc1

for you to fetch changes up to cb8cc37f4d38d96552f2c52deb15e511cdacf906:

Quoted 7 lines

ARM: rockchip: fix broken build (2015-07-06 11:46:08 +0200)

----------------------------------------------------------------
Some suspend improvements enabling the possibility to wakeup from usbphy events and a rework of how cpu cores are brought u? and down, as it was possible to produce lockups when hammering the cpu hotplug functions.

Thanks, merged.

-Olof

author maintainer
#9 lore raw

[GIT PULL 2/2] Rockchip dts changes for 4.3, part1

In reply to Heiko Stübner

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.3-rockchip32-dts1

for you to fetch changes up to 4863dcd394019b542ac968870cba734d27e992e0:

ARM: dts: rockchip: add rk3288 arm-pmu irq affinity (2015-07-16 22:22:47 +0200)

----------------------------------------------------------------
This adds the board for the Netxeon R89 used in different TV-boxes and the initial support for two Chromebooks from the veyron family.
Additionally a non-critical fix for the watchdog irq on rk3288, addition of the gmac reset line, a ramp delay for the cpu regulator on the firefly board and cpu affinity for the arm-pmu spi irqs.

----------------------------------------------------------------
Alexandru M Stan (2):
ARM: dts: rockchip: add shared rk3288-veyron files
ARM: dts: rockchip: add veyron-jerry board

Chris Zhong (1):
ARM: dts: Add sbs-battery dts fragment used by chromebooks

Heiko Stuebner (7):
ARM: dts: rockchip: fix rk3288 watchdog irq
dt-bindings: add vendor prefix for Netxeon Technology
ARM: dts: rockchip: add Netxeon R89 board
ARM: dts: rockchip: add veyron-pinky board
ARM: dts: rockchip: add missing device_type = "memory" to boards
dt-bindings: document rk3368 R88 board from Rockchip
ARM: dts: rockchip: add rk3288 arm-pmu irq affinity

Romain Perier (2):
ARM: dts: rockchip: Add STMMAC reset signal in GMAC interface for rk3288
ARM: dts: rockchip: Add ramp delay for vdd_cpu in firefly board dts

 Documentation/devicetree/bindings/arm/rockchip.txt |  20 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   5 +-
 arch/arm/boot/dts/cros-ec-sbs.dtsi                 |  52 ++
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   1 +
 arch/arm/boot/dts/rk3066a-marsboard.dts            |   1 +
 arch/arm/boot/dts/rk3066a-rayeager.dts             |   1 +
 arch/arm/boot/dts/rk3188-radxarock.dts             |   1 +
 arch/arm/boot/dts/rk3288-evb.dtsi                  |   1 +
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   3 +
 arch/arm/boot/dts/rk3288-popmetal.dts              |   1 +
 arch/arm/boot/dts/rk3288-r89.dts                   | 413 +++++++++++++++
 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    | 232 +++++++++
 arch/arm/boot/dts/rk3288-veyron-jerry.dts          | 197 +++++++
 arch/arm/boot/dts/rk3288-veyron-pinky.dts          | 128 +++++
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         | 122 +++++
 arch/arm/boot/dts/rk3288-veyron.dtsi               | 563 +++++++++++++++++++++
 arch/arm/boot/dts/rk3288.dtsi                      |  11 +-
 18 files changed, 1748 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-r89.dts
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi
#10 lore raw

[GIT PULL 2/2] Rockchip dts changes for 4.3, part1

Quoted 12 lines · Heiko St?bner

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.3-rockchip32-dts1

for you to fetch changes up to 4863dcd394019b542ac968870cba734d27e992e0:

ARM: dts: rockchip: add rk3288 arm-pmu irq affinity (2015-07-16 22:22:47 +0200)

Quoted 8 lines

----------------------------------------------------------------
This adds the board for the Netxeon R89 used in different TV-boxes and the initial support for two Chromebooks from the veyron family.
Additionally a non-critical fix for the watchdog irq on rk3288, addition of the gmac reset line, a ramp delay for the cpu regulator on the firefly board and cpu affinity for the arm-pmu spi irqs.

Thanks, merged.

-Olof