Commit 1a88083b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.2-rockchip-dts64-1' of... 

Merge tag 'v5.2-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Core new soc features are hdmi-cec for rk3328, scheduler capacity-values
and emmc cleanups for rk3399. New boards are the OrangePi (rk3399) and
NanoPi NEO4. Both the OrangePi as well as the NanoPC/Pie family also
directly got some additional features added after the boards itself.

The Rock960 family (rock960+ficus) got their power-tree cleaned to match
the schematics and also got hdmi-audio and their gpu enabled.

Mali support also got enabled on the RockPi4 and finally both
rk3328-rock64 and rk3328-roc-cc got some additional features.

* tag 'v5.2-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

: (23 commits)
  arm64: dts: rockchip: Decrease emmc-phy's drive impedance on rk3399-puma
  arm64: dts: rockchip: Define drive-impedance-ohm for RK3399's emmc-phy.
  arm64: dts: rockchip: Disable DCMDs on RK3399's eMMC controller.
  arm64: dts: rockchip: Add nanopi4 ethernet phy
  arm64: dts: rockchip: Add PWM fan for NanoPC-T4
  arm64: dts: rockchip: Add the fusb typec manager to rk3399-orangepi
  arm64: dts: rockchip: Specify vid supply for the rk3399-orangepi compass (AK09911)
  arm64: dts: rockchip: Fix clock names and add missing supplies for bluetooth on rk3399-orangepi
  arm64: dts: rockchip: Add 12V DCIN regulator to rk3399-ficus
  arm64: dts: rockchip: Rename vcc_sys into vcc5v0_sys on rk3399-rock960
  arm64: dts: rockchip: Add Nanopi NEO4 initial support
  arm64: dts: rockchip: enable hdmi audio out for rk3399-rockpro64
  arm64: dts: rockchip: Add support for the Orange Pi RK3399 board.
  arm64: dts: rockchip: enable mali on rock960 boards
  arm64: dts: rockchip: enable mali on Rock Pi 4
  arm64: dts: rockchip: add rk3328-roc-cc cpu-supply entries for all cpu nodes
  arm64: dts: rockchip: give some life to the rk3328-roc-cc leds
  arm64: dts: rockchip: add #sound-dai-cells to HDMI of rk3328
  arm64: dts: rockchip: add ir-receiver node on rk3328-rock64
  arm64: dts: rockchip: add leds node on rk3328-rock64
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f6f9683c b4e17282

Documentation/devicetree/bindings/arm/rockchip.yaml

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ properties: 
          - enum:

              - friendlyarm,nanopc-t4

              - friendlyarm,nanopi-m4

              - friendlyarm,nanopi-neo4

          - const: rockchip,rk3399



      - description: GeekBuying GeekBox
@@ -325,6 +326,11 @@ properties: 
          - const: netxeon,r89

          - const: rockchip,rk3288



      - description: Orange Pi RK3399 board

        items:

          - const: rockchip,rk3399-orangepi

          - const: rockchip,rk3399



      - description: Phytec phyCORE-RK3288 Rapid Development Kit

        items:

          - const: phytec,rk3288-pcm-947

arch/arm64/boot/dts/rockchip/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb

arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

+32 −0
Original line number Diff line number Diff line
@@ -81,12 +81,44 @@ 
		regulator-always-on;

		regulator-boot-on;

	};



	leds {

		compatible = "gpio-leds";



		power {

			label = "firefly:blue:power";

			linux,default-trigger = "heartbeat";

			gpios = <&rk805 1 GPIO_ACTIVE_LOW>;

			default-state = "on";

			mode = <0x23>;

		};



		user {

			label = "firefly:yellow:user";

			linux,default-trigger = "mmc1";

			gpios = <&rk805 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

			mode = <0x05>;

		};

	};

};



&cpu0 {

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&cpu2 {

	cpu-supply = <&vdd_arm>;

};



&cpu3 {

	cpu-supply = <&vdd_arm>;

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

+31 −2
Original line number Diff line number Diff line
@@ -65,6 +65,27 @@ 
		regulator-max-microvolt = <5000000>;

	};



	ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;

		pinctrl-0 = <&ir_int>;

		pinctrl-names = "default";

	};



	leds {

		compatible = "gpio-leds";



		power {

			gpios = <&rk805 1 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "mmc0";

		};



		standby {

			gpios = <&rk805 0 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "heartbeat";

		};

	};



	sound {

		compatible = "audio-graph-card";

		label = "rockchip,rk3328";
@@ -157,6 +178,8 @@ 
		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;

		#clock-cells = <1>;

		clock-output-names = "xin32k", "rk805-clkout2";

		gpio-controller;

		#gpio-cells = <2>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int_l>;

		rockchip,system-power-controller;
@@ -218,7 +241,7 @@ 
			};



			vcc_18: LDO_REG1 {

				regulator-name = "vdd_18";

				regulator-name = "vcc_18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;
@@ -230,7 +253,7 @@ 
			};



			vcc18_emmc: LDO_REG2 {

				regulator-name = "vcc_18emmc";

				regulator-name = "vcc18_emmc";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;
@@ -281,6 +304,12 @@ 
};



&pinctrl {

	ir {

		ir_int: ir-int {

			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -657,14 +657,17 @@ 
		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru PCLK_HDMI>,

			 <&cru SCLK_HDMI_SFC>;

			 <&cru SCLK_HDMI_SFC>,

			 <&cru SCLK_RTC32K>;

		clock-names = "iahb",

			      "isfr";

			      "isfr",

			      "cec";

		phys = <&hdmiphy>;

		phy-names = "hdmi";

		pinctrl-names = "default";

		pinctrl-0 = <&hdmi_cec &hdmii2c_xfer &hdmi_hpd>;

		rockchip,grf = <&grf>;

		#sound-dai-cells = <0>;

		status = "disabled";



		ports {

CRA Git | Maintained and supported by SUSTech CRA and CCSE