Commit f6f9683c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Quite a bit of love for the rk3288-veyron chromeos devices and a number
of cleanups for rk3288 from that area, hdmi support for the old rk3066
a small rv1108-eglin-r1 cleanup and wifi+hdmi-cec for the tinker board.

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

:
  ARM: dts: rockchip: enable vop0 and hdmi nodes to rk3066a-mk808
  ARM: dts: rockchip: add rk3066 hdmi nodes
  ARM: dts: rockchip: Add device tree for rk3288-veyron-mighty
  dt-bindings: ARM: dts: rockchip: Add bindings for rk3288-veyron-mighty
  ARM: dts: rockchip: Add vdd_logic to rk3288-veyron
  ARM: dts: rockchip: Add dvs-gpios to rk3288-veyron-jerry
  ARM: dts: rockchip: Add rk3288-veyron-jerry rev 10-15
  dt-bindings: ARM: dts: rockchip: Add rk3288-veyron-jerry rev 10-15
  ARM: dts: rockchip: Fix gic/efuse sort ordering for rk3288
  ARM: dts: rockchip: Enable WiFi on rk3288-tinker
  ARM: dts: rockchip: add grf reference in rk3288 tsadc node
  ARM: dts: rockchip: Enable HDMI CEC on rk3288-tinker-s
  ARM: dts: rockchip: remove disable-wp from rv1108-elgin-r1 emmc node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1c93235a 4b028ebd

Documentation/devicetree/bindings/arm/rockchip.yaml

+18 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ properties: 
          - const: google,gru

          - const: rockchip,rk3399



      - description: Google Jaq (Haier Chromebook 11 and more)

      - description: Google Jaq (Haier Chromebook 11 and more w/ uSD)

        items:

          - const: google,veyron-jaq-rev5

          - const: google,veyron-jaq-rev4
@@ -159,6 +159,12 @@ properties: 


      - description: Google Jerry (Hisense Chromebook C11 and more)

        items:

          - const: google,veyron-jerry-rev15

          - const: google,veyron-jerry-rev14

          - const: google,veyron-jerry-rev13

          - const: google,veyron-jerry-rev12

          - const: google,veyron-jerry-rev11

          - const: google,veyron-jerry-rev10

          - const: google,veyron-jerry-rev7

          - const: google,veyron-jerry-rev6

          - const: google,veyron-jerry-rev5
@@ -199,6 +205,17 @@ properties: 
          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Mighty (Haier Chromebook 11 and more w/ SD)

        items:

          - const: google,veyron-mighty-rev5

          - const: google,veyron-mighty-rev4

          - const: google,veyron-mighty-rev3

          - const: google,veyron-mighty-rev2

          - const: google,veyron-mighty-rev1

          - const: google,veyron-mighty

          - const: google,veyron

          - const: rockchip,rk3288



      - description: Google Minnie (Asus Chromebook Flip C100P)

        items:

          - const: google,veyron-minnie-rev4

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -909,6 +909,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-veyron-jaq.dtb \

	rk3288-veyron-jerry.dtb \

	rk3288-veyron-mickey.dtb \

	rk3288-veyron-mighty.dtb \

	rk3288-veyron-minnie.dtb \

	rk3288-veyron-pinky.dtb \

	rk3288-veyron-speedy.dtb \

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

+29 −0
Original line number Diff line number Diff line
@@ -30,6 +30,17 @@ 
		};

	};



	hdmi_con {

		compatible = "hdmi-connector";

		type = "c";



		port {

			hdmi_con_in: endpoint {

				remote-endpoint = <&hdmi_out_con>;

			};

		};

	};



	vcc_io: vcc-io {

		compatible = "regulator-fixed";

		regulator-name = "vcc_io";
@@ -91,6 +102,20 @@ 
	};

};



&hdmi {

	status = "okay";

};



&hdmi_in_vop1 {

	status = "disabled";

};



&hdmi_out {

	hdmi_out_con: endpoint {

		remote-endpoint = <&hdmi_con_in>;

	};

};



&mmc0 {

	bus-width = <4>;

	cap-mmc-highspeed;
@@ -150,6 +175,10 @@ 
	status = "okay";

};



&vop0 {

	status = "okay";

};



&wdt {

	status = "okay";

};

arch/arm/boot/dts/rk3066a.dtsi

+59 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ 
		vop0_out: port {

			#address-cells = <1>;

			#size-cells = <0>;



			vop0_out_hdmi: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&hdmi_in_vop0>;

			};

		};

	};
@@ -101,6 +106,49 @@ 
		vop1_out: port {

			#address-cells = <1>;

			#size-cells = <0>;



			vop1_out_hdmi: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&hdmi_in_vop1>;

			};

		};

	};



	hdmi: hdmi@10116000 {

		compatible = "rockchip,rk3066-hdmi";

		reg = <0x10116000 0x2000>;

		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_HDMI>;

		clock-names = "hclk";

		pinctrl-names = "default";

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

		power-domains = <&power RK3066_PD_VIO>;

		rockchip,grf = <&grf>;

		status = "disabled";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			hdmi_in: port@0 {

				reg = <0>;

				#address-cells = <1>;

				#size-cells = <0>;



				hdmi_in_vop0: endpoint@0 {

					reg = <0>;

					remote-endpoint = <&vop0_out_hdmi>;

				};



				hdmi_in_vop1: endpoint@1 {

					reg = <1>;

					remote-endpoint = <&vop1_out_hdmi>;

				};

			};



			hdmi_out: port@1 {

				reg = <1>;

			};

		};

	};
@@ -380,6 +428,17 @@ 
			 */

		};



		hdmi {

			hdmi_hpd: hdmi-hpd {

				rockchip,pins = <0 RK_PA0 1 &pcfg_pull_default>;

			};



			hdmii2c_xfer: hdmii2c-xfer {

				rockchip,pins = <0 RK_PA1 1 &pcfg_pull_none>,

						<0 RK_PA2 1 &pcfg_pull_none>;

			};

		};



		i2c0 {

			i2c0_xfer: i2c0-xfer {

				rockchip,pins = <RK_GPIO2 28 RK_FUNC_1 &pcfg_pull_none>,

arch/arm/boot/dts/rk3288-tinker-s.dts

+5 −0
Original line number Diff line number Diff line
@@ -23,3 +23,8 @@ 
	mmc-ddr-1_8v;

	status = "okay";

};



&hdmi {

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_cec_c0>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE