Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bd641ff authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.7-rockchip-dts32-1' of... 

Merge tag 'v4.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

A lot display-controller nodes for DSI and the Analogix DP on rk3288
as well as general display+hdmi support on rk3036. With the Analogix
DP support, Veyron Chromeboks can now finally use their internal
display.

Other than this big improvement we have thermal support on the rk3228,
a long time missing binding document for the General Register Files
block, better operating points for Veyron devices and a bunch of fixes
with parts stemming from warnings that new dtc version can generate.

* tag 'v4.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

: (27 commits)
  ARM: dts: rockchip: move rk3036 memory definition to board files
  ARM: dts: rockchip: enable the eDP on rk3288 veyron devices
  ARM: dts: rockchip: simple panel and backlight supplies on veyron boards
  ARM: dts: rockchip: override edp hpd handling on veyron-pinky and speedy
  ARM: dts: rockchip: add rk3288-veyron-minnie backlight and panel settings
  ARM: dts: rockchip: add rk3288-veyron-jaq backlight and panel overrides
  ARM: dts: rockchip: add core rk3288-veyron backlight and panel nodes
  ARM: dts: rockchip: add startup delay to rk3288-veyron panel-regulators
  ARM: dts: rockchip: move edp-hpd pin definition into common location
  ARM: dts: rockchip: add rk3288 displayport controller node
  ARM: dts: rockchip: add rk3288 edp-phy node
  ARM: dts: rockchip: add missing unitname to cpu_leakage efuse
  ARM: dts: rockchip: drop unneeded properties from mipi node
  ARM: dts: rockchip: clean up gpio-keys nodes
  ARM: dts: rockchip: fix missing usbphy unit-names
  ARM: dts: rockchip: fix rk3288 power-domain unit names
  ARM: dts: rockchip: update rk3288-veyron cpu operating points
  ARM: dts: rockchip: remove broken-cd from emmc and sdio
  ARM: dts: rockchip: enable the tsadc for rk3228 evb
  ARM: dts: rockchip: add the thermal main info found on rk3228
  ...

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

Documentation/devicetree/bindings/soc/rockchip/grf.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* Rockchip General Register Files (GRF)



The general register file will be used to do static set by software, which

is composed of many registers for system control.



From RK3368 SoCs, the GRF is divided into two sections,

- GRF, used for general non-secure system,

- PMUGRF, used for always on system



Required Properties:



- compatible: GRF should be one of the followings

   - "rockchip,rk3066-grf", "syscon": for rk3066

   - "rockchip,rk3188-grf", "syscon": for rk3188

   - "rockchip,rk3228-grf", "syscon": for rk3228

   - "rockchip,rk3288-grf", "syscon": for rk3288

   - "rockchip,rk3368-grf", "syscon": for rk3368

   - "rockchip,rk3399-grf", "syscon": for rk3399

- compatible: PMUGRF should be one of the followings

   - "rockchip,rk3368-pmugrf", "syscon": for rk3368

   - "rockchip,rk3399-pmugrf", "syscon": for rk3399

- reg: physical base address of the controller and length of memory mapped

  region.



Example: GRF and PMUGRF of RK3399 SoCs



	pmugrf: syscon@ff320000 {

		compatible = "rockchip,rk3399-pmugrf", "syscon";

		reg = <0x0 0xff320000 0x0 0x1000>;

	};



	grf: syscon@ff770000 {

		compatible = "rockchip,rk3399-grf", "syscon";

		reg = <0x0 0xff770000 0x0 0x10000>;

	};

arch/arm/boot/dts/rk3036-evb.dts

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ 
/ {

	model = "Rockchip RK3036 Evaluation board";

	compatible = "rockchip,rk3036-evb", "rockchip,rk3036";



	memory {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

	};

};



&emac {

arch/arm/boot/dts/rk3036-kylin.dts

+17 −1
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ 
	model = "Rockchip RK3036 KylinBoard";

	compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";



	memory {

		device_type = "memory";

		reg = <0x60000000 0x20000000>;

	};



	leds: gpio-leds {

		compatible = "gpio-leds";
@@ -130,6 +135,10 @@ 
	status = "okay";

};



&hdmi {

	status = "okay";

};



&i2c1 {

	clock-frequency = <400000>;
@@ -341,7 +350,6 @@ 
&sdio {

	status = "okay";



	broken-cd;

	bus-width = <4>;

	cap-sd-highspeed;

	cap-sdio-irq;
@@ -385,6 +393,14 @@ 
	status = "okay";

};



&vop {

	status = "okay";

};



&vop_mmu {

	status = "okay";

};



&pinctrl {

	leds {

		led_ctl: led-ctl {

arch/arm/boot/dts/rk3036.dtsi

+65 −6
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ 
		spi = &spi;

	};



	memory {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -119,6 +114,11 @@ 
		interrupt-affinity = <&cpu0>, <&cpu1>;

	};



	display-subsystem {

		compatible = "rockchip,display-subsystem";

		ports = <&vop_out>;

	};



	timer {

		compatible = "arm,armv7-timer";

		arm,cpu-registers-not-fw-configured;
@@ -149,6 +149,36 @@ 
		};

	};



	vop: vop@10118000 {

		compatible = "rockchip,rk3036-vop";

		reg = <0x10118000 0x19c>;

		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru HCLK_LCDC>;

		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";

		resets = <&cru SRST_LCDC1_A>, <&cru SRST_LCDC1_H>, <&cru SRST_LCDC1_D>;

		reset-names = "axi", "ahb", "dclk";

		iommus = <&vop_mmu>;

		status = "disabled";



		vop_out: port {

			#address-cells = <1>;

			#size-cells = <0>;

			vop_out_hdmi: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&hdmi_in_vop>;

			};

		};

	};



	vop_mmu: iommu@10118300 {

		compatible = "rockchip,iommu";

		reg = <0x10118300 0x100>;

		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vop_mmu";

		#iommu-cells = <0>;

		status = "disabled";

	};



	gic: interrupt-controller@10139000 {

		compatible = "arm,gic-400";

		interrupt-controller;
@@ -237,7 +267,6 @@ 
		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x1021c000 0x4000>;

		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

		broken-cd;

		bus-width = <8>;

		cap-mmc-highspeed;

		clock-frequency = <37500000>;
@@ -297,6 +326,27 @@ 
		status = "disabled";

	};



	hdmi: hdmi@20034000 {

		compatible = "rockchip,rk3036-inno-hdmi";

		reg = <0x20034000 0x4000>;

		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru  PCLK_HDMI>;

		clock-names = "pclk";

		rockchip,grf = <&grf>;

		pinctrl-names = "default";

		pinctrl-0 = <&hdmi_ctl>;

		status = "disabled";



		hdmi_in: port {

			#address-cells = <1>;

			#size-cells = <0>;

			hdmi_in_vop: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&vop_out_hdmi>;

			};

		};

	};



	timer: timer@20044000 {

		compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer";

		reg = <0x20044000 0x20>;
@@ -644,6 +694,15 @@ 
			};

		};



		hdmi {

			hdmi_ctl: hdmi-ctl {

				rockchip,pins = <1 8  RK_FUNC_1 &pcfg_pull_none>,

						<1 9  RK_FUNC_1 &pcfg_pull_none>,

						<1 10 RK_FUNC_1 &pcfg_pull_none>,

						<1 11 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		uart0 {

			uart0_xfer: uart0-xfer {

				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>,

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+5 −6
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/input/input.h>

#include "rk3066a.dtsi"



/ {
@@ -77,21 +78,19 @@ 


	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;



		button@0 {

		power {

			gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */

			linux,code = <116>;

			linux,code = <KEY_POWER>;

			label = "GPIO Key Power";

			linux,input-type = <1>;

			wakeup-source;

			debounce-interval = <100>;

		};

		button@1 {

		volume-down {

			gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */

			linux,code = <104>;

			linux,code = <KEY_VOLUMEDOWN>;

			label = "GPIO Key Vol-";

			linux,input-type = <1>;

			debounce-interval = <100>;