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

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

Merge tag 'v5.1-rockchip-dtfixes-1' of... 

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

Fixes for dtc warnings, fixes for ethernet transfers on rk3328,
sd-card related fixes on both rk3328 ans rk3288-tinker and a
regulator fix on rock64 and making ddc actually work on the
Rock PI 4 due to missing the ddc bus.

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

:
  ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys
  ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi
  ARM: dts: rockchip: Fix gpu opp node names for rk3288
  arm64: dts: rockchip: fix rk3328 sdmmc0 write errors
  arm64: dts: rockchip: fix rk3328 rgmii high tx error rate
  ARM: dts: rockchip: Fix SD card detection on rk3288-tinker
  arm64: dts: rockchip: Fix vcc_host1_5v GPIO polarity on rk3328-rock64
  ARM: dts: rockchip: fix rk3288 cpu opp node reference
  arm64: dts: rockchip: add DDC bus on Rock Pi 4
  arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delay

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3e372088 1a966651

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

+2 −1
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ 
			};



			vccio_sd: LDO_REG5 {

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_sd";
@@ -430,7 +431,7 @@ 
	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	broken-cd;

	disable-wp;			/* wp not hooked up */

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

arch/arm/boot/dts/rk3288-veyron.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


	gpio_keys: gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key_l>;

arch/arm/boot/dts/rk3288.dtsi

+9 −11
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
			compatible = "arm,cortex-a12";

			reg = <0x501>;

			resets = <&cru SRST_CORE1>;

			operating-points = <&cpu_opp_table>;

			operating-points-v2 = <&cpu_opp_table>;

			#cooling-cells = <2>; /* min followed by max */

			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;
@@ -80,7 +80,7 @@ 
			compatible = "arm,cortex-a12";

			reg = <0x502>;

			resets = <&cru SRST_CORE2>;

			operating-points = <&cpu_opp_table>;

			operating-points-v2 = <&cpu_opp_table>;

			#cooling-cells = <2>; /* min followed by max */

			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;
@@ -90,7 +90,7 @@ 
			compatible = "arm,cortex-a12";

			reg = <0x503>;

			resets = <&cru SRST_CORE3>;

			operating-points = <&cpu_opp_table>;

			operating-points-v2 = <&cpu_opp_table>;

			#cooling-cells = <2>; /* min followed by max */

			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;
@@ -1119,8 +1119,6 @@ 
		clock-names = "ref", "pclk";

		power-domains = <&power RK3288_PD_VIO>;

		rockchip,grf = <&grf>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";



		ports {
@@ -1282,27 +1280,27 @@ 
	gpu_opp_table: gpu-opp-table {

		compatible = "operating-points-v2";



		opp@100000000 {

		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <950000>;

		};

		opp@200000000 {

		opp-200000000 {

			opp-hz = /bits/ 64 <200000000>;

			opp-microvolt = <950000>;

		};

		opp@300000000 {

		opp-300000000 {

			opp-hz = /bits/ 64 <300000000>;

			opp-microvolt = <1000000>;

		};

		opp@400000000 {

		opp-400000000 {

			opp-hz = /bits/ 64 <400000000>;

			opp-microvolt = <1100000>;

		};

		opp@500000000 {

		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <1200000>;

		};

		opp@600000000 {

		opp-600000000 {

			opp-hz = /bits/ 64 <600000000>;

			opp-microvolt = <1250000>;

		};

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

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ 
	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

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

	tx_delay = <0x25>;

	rx_delay = <0x11>;

	tx_delay = <0x24>;

	rx_delay = <0x18>;

	status = "okay";

};

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

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ 


	vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb20_host_drv>;

		regulator-name = "vcc_host1_5v";