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

Commit 87f89ace authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.15-rockchip-dts32-2' of... 

Merge tag 'v4.15-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts32 updates for 4.15 part2" from Heiko Stübner:

CEC support for the two rk3288-firefly variants and general hdmi support
for the firefly-reload. A lot of additions and corrections for the
rk3288-vyasa and thermal support for the rv1108.

* tag 'v4.15-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: enable the hdmi output on the rk3288-firefly-reload
  ARM: dts: rockchip: define the two possible rk3288 CEC pins
  ARM: dts: rockchip: add the cec clk for dw-hdmi on rk3288
  ARM: dts: rockchip: Add io domains for rk3288-vyasa
  ARM: dts: rockchip: Add usb otg for rk3288-vyasa
  ARM: dts: rockchip: Add usb host for rk3288-vyasa
  ARM: dts: rockchip: Add gmac support for rk3288-vyasa board
  ARM: dts: rockchip: Add regulators for rk3288-vyasa
  ARM: dts: rockchip: Use vmmc-supply from PMIC on rk3288-vyasa
  ARM: dts: rockchip: Remove vdd_log from rk808, DCDC_REG1 on rk3288-vyasa
  ARM: dts: rockchip: enable tsadc module on RV1108 evaluation board
  ARM: dts: rockchip: add thermal nodes for RV1108 SoC
  ARM: dts: rockchip: add tsadc node for RV1108 SoC
  ARM: dts: rockchip: add RGA device node for RK3288
parents ea7cdc06 be84dfa7

arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
				regulator-name = "vdd10_lcd";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			vcca_18: REG7  {
@@ -223,6 +224,7 @@ 
				regulator-name = "vcc18_lcd";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};

		};

	};

arch/arm/boot/dts/rk3288-firefly-reload.dts

+11 −0
Original line number Diff line number Diff line
@@ -226,6 +226,13 @@ 
	};

};



&hdmi {

	ddc-i2c-bus = <&i2c5>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_cec_c0>;

	status = "okay";

};



&i2c0 {

	hym8563: hym8563@51 {

		compatible = "haoyu,hym8563";
@@ -255,6 +262,10 @@ 
	};

};



&i2c5 {

	status = "okay";

};



&i2s {

	status = "okay";

};

arch/arm/boot/dts/rk3288-vyasa.dts

+165 −14
Original line number Diff line number Diff line
@@ -56,25 +56,98 @@ 
		device_type = "memory";

	};



	vcc_sd: sdmmc-regulator {

	dc12_vbat: dc12-vbat {

		compatible = "regulator-fixed";

		gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc_pwr>;

		regulator-name = "vcc_sd";

		regulator-name = "dc12_vbat";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		regulator-boot-on;

	};



	vboot_3v3: vboot-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vboot_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&dc12_vbat>;

	};



	vcc_sys: vsys-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-min-microvolt = <3700000>;

		regulator-max-microvolt = <3700000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&dc12_vbat>;

	};



	vboot_5v: vboot-5v {

		compatible = "regulator-fixed";

		regulator-name = "vboot_sv";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&dc12_vbat>;

	};



	v3g_3v3: v3g-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "v3g_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&dc12_vbat>;

	};



	vsus_5v: vsus-5v {

		compatible = "regulator-fixed";

		regulator-name = "vsus_5v";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_io>;

	};



	vusb1_5v: vusb1-5v {

		compatible = "regulator-fixed";

		regulator-name = "vusb1_5v";

		enable-active-high;

		gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; /* OTG_VBUS_DRV */

		pinctrl-names = "default";

		pinctrl-0 = <&otg_vbus_drv>;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vsus_5v>;

	};



	vusb2_5v: vusb2-5v {

		compatible = "regulator-fixed";

		regulator-name = "vusb2_5v";

		enable-active-high;

		gpio = <&gpio8 RK_PB1 GPIO_ACTIVE_HIGH>; /* USB2_PWR_EN */

		pinctrl-names = "default";

		pinctrl-0 = <&usb2_pwr_en>;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vsus_5v>;

	};



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

	};

};
@@ -82,6 +155,22 @@ 
	cpu0-supply = <&vdd_cpu>;

};



&gmac {

	assigned-clocks = <&cru SCLK_MAC>;

	assigned-clock-parents = <&ext_gmac>;

	clock_in_out = "input";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>;

	phy-supply = <&vcc_lan>;

	phy-mode = "rgmii";

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

	status = "okay";

};



&gpu {

	mali-supply = <&vdd_gpu>;

	status = "okay";
@@ -121,8 +210,8 @@ 
		vcc12-supply = <&vcc_io>;



		regulators {

			vdd_cpu: vdd_log: DCDC_REG1 {

				regulator-name = "vdd_log";

			vdd_cpu: DCDC_REG1 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;
@@ -260,8 +349,8 @@ 
				};

			};



			vcc33_sd: SWITCH_REG1 {

				regulator-name = "vcc33_sd";

			vcc_sd: SWITCH_REG1 {

				regulator-name = "vcc_sd";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;
@@ -289,6 +378,21 @@ 
	status = "okay";

};



&io_domains {

	status = "okay";



	audio-supply = <&vcc_18>;

	bb-supply = <&vcc_io>;

	dvp-supply = <&vcc_io>;

	flash0-suuply = <&vcc_18>;

	flash1-supply = <&vcc_lan>;

	gpio30-supply = <&vcc_io>;

	gpio1830 = <&vcc_io>;

	lcdc-supply = <&vcc_io>;

	sdcard-supply = <&vccio_sd>;

	wifi-supply = <&vcc_18>;

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;
@@ -312,6 +416,24 @@ 
	status = "okay";

};



&usbphy {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host1 {

	pinctrl-names = "default";

	pinctrl-0 = <&phy_pwr_en>;

	status = "okay";

};



&usb_otg {

	status = "okay";

};



&vopb {

	status = "okay";

};
@@ -333,15 +455,44 @@ 
};



&pinctrl {

	pcfg_output_high: pcfg-output-high {

		output-high;

	};



	gmac {

		phy_int: phy-int {

			rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		phy_pmeb: phy-pmeb {

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

		};



		phy_rst: phy-rst {

			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;

		};

	};



	pmic {

		pmic_int: pmic-int {

			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	sdmmc {

		sdmmc_pwr: sdmmc-pwr {

			rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;

	usb_host {

		phy_pwr_en: phy-pwr-en {

			rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;

		};



		usb2_pwr_en: usb2-pwr-en {

			rockchip,pins = <8 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb_otg {

		otg_vbus_drv: otg-vbus-drv {

			rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;



		};

	};

};

arch/arm/boot/dts/rk3288.dtsi

+21 −2
Original line number Diff line number Diff line
@@ -972,6 +972,17 @@ 
		status = "disabled";

	};



	rga: rga@ff920000 {

		compatible = "rockchip,rk3288-rga";

		reg = <0x0 0xff920000 0x0 0x180>;

		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;

		clock-names = "aclk", "hclk", "sclk";

		power-domains = <&power RK3288_PD_VIO>;

		resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>;

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

	};



	vopb: vop@ff930000 {

		compatible = "rockchip,rk3288-vop";

		reg = <0x0 0xff930000 0x0 0x19c>;
@@ -1167,8 +1178,8 @@ 
		reg-io-width = <4>;

		rockchip,grf = <&grf>;

		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;

		clock-names = "iahb", "isfr";

		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;

		clock-names = "iahb", "isfr", "cec";

		power-domains = <&power RK3288_PD_VIO>;

		status = "disabled";
@@ -1470,6 +1481,14 @@ 
		};



		hdmi {

			hdmi_cec_c0: hdmi-cec-c0 {

				rockchip,pins = <7 RK_PC0 RK_FUNC_2 &pcfg_pull_none>;

			};



			hdmi_cec_c7: hdmi-cec-c7 {

				rockchip,pins = <7 RK_PC7 RK_FUNC_4 &pcfg_pull_none>;

			};



			hdmi_ddc: hdmi-ddc {

				rockchip,pins = <7 19 RK_FUNC_2 &pcfg_pull_none>,

						<7 20 RK_FUNC_2 &pcfg_pull_none>;

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

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ 
	status = "okay";

};



&tsadc {

	status = "okay";

};



&u2phy {

	status = "okay";