Commit 94562040 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: A few fixes for veyron-{fievel,tiger} 



Fix/improve a few things for veyron fievel/tiger:

- move 'vccsys' regulator from tiger to fievel, both boards
  have it (and tiger includes the fievel .dtsi)
- move 'ext_gmac' node below regulators
- fix GPIO ids of vcc5_host1 and vcc5_host2 regulators
- remove reset configuration from 'gmac' node, this is already done
  in rk3288.dtsi
- fixed style issues of some multi-line comments
- switch 'vcc18_lcdt', 'vdd10_lcd' and 'vcc33_ccd' regulators off
  during suspend
- no pull-up on the Bluetooth wake-up pin, there is an external
  pull-up. The signal is active low, add the 'bt_host_wake_l'
  pinctrl config
- move BC 1.2 pins up in the pinctrl config to keep 'wake only' pins
  separate
- add BC 1.2 pins to sleep config

Fixes: 0067692b ("ARM: dts: rockchip: add veyron-fievel board")
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent a5021c45

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

+34 −24
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 


	/delete-node/ bt-activity;



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

	vccsys: vccsys {

		compatible = "regulator-fixed";

		regulator-name = "vccsys";

		regulator-boot-on;

		regulator-always-on;

	};



	/*
@@ -41,7 +41,7 @@ 
	vcc5_host1: vcc5-host1-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio5 RK_PC1 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio5 RK_PC2 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&hub_usb1_pwr_en>;

		regulator-name = "vcc5_host1";
@@ -52,7 +52,7 @@ 
	vcc5_host2: vcc5-host2-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio5 RK_PC2 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio5 RK_PB6 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&hub_usb2_pwr_en>;

		regulator-name = "vcc5_host2";
@@ -70,6 +70,13 @@ 
		regulator-always-on;

		regulator-boot-on;

	};



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <125000000>;

		clock-output-names = "ext_gmac";

	};

};



&gmac {
@@ -83,13 +90,13 @@ 
	phy-supply = <&vcc33_lan>;

	pinctrl-names = "default";

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

	resets = <&cru SRST_MAC>;

	reset-names = "stmmaceth";

	rx_delay = <0x10>;

	tx_delay = <0x30>;



	/* Reset for the RTL8211 PHY which requires a 10-ms reset pulse (low)

	 * with a 30ms settling time. */

	/*

	 * Reset for the RTL8211 PHY which requires a 10-ms reset pulse (low)

	 * with a 30ms settling time.

	 */

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

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 30000>;
@@ -120,7 +127,8 @@ 
	regulators {

		/delete-node/ LDO_REG1;



		/* According to the schematic, vcc18_lcdt is for

		/*

		 * According to the schematic, vcc18_lcdt is for

		 * HDMI_AVDD_1V8

		 */

		vcc18_lcdt: LDO_REG2 {
@@ -130,12 +138,12 @@ 
			regulator-max-microvolt = <1800000>;

			regulator-name = "vdd18_lcdt";

			regulator-state-mem {

				regulator-on-in-suspend;

				regulator-suspend-microvolt = <1800000>;

				regulator-off-in-suspend;

			};

		};



		/* This is not a pwren anymore, but the real power supply,

		/*

		 * This is not a pwren anymore, but the real power supply,

		 * vdd10_lcd for HDMI_AVDD_1V0

		 */

		vdd10_lcd: LDO_REG7 {
@@ -145,8 +153,7 @@ 
			regulator-max-microvolt = <1000000>;

			regulator-name = "vdd10_lcd";

			regulator-state-mem {

				regulator-on-in-suspend;

				regulator-suspend-microvolt = <1000000>;

				regulator-off-in-suspend;

			};

		};
@@ -158,8 +165,7 @@ 
			regulator-max-microvolt = <3300000>;

			regulator-name = "vcc33_ccd";

			regulator-state-mem {

				regulator-on-in-suspend;

				regulator-suspend-microvolt = <3300000>;

				regulator-off-in-suspend;

			};

		};
@@ -180,7 +186,7 @@ 
		interrupts = <RK_PD7 IRQ_TYPE_LEVEL_LOW>;

		marvell,wakeup-pin = /bits/ 16 <13>;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_host_wake>;

		pinctrl-0 = <&bt_host_wake_l>;

	};

};
@@ -206,13 +212,13 @@ 
		&ddrio_pwroff

		&global_pwroff



		/* Wake only */

		&bt_dev_wake_awake

		&pwr_led1_on



		/* For usb bc1.2 */

		&usb_otg_ilim_sel

		&usb_usb_ilim_sel



		/* Wake only */

		&bt_dev_wake_awake

		&pwr_led1_on

	>;



	pinctrl-1 = <
@@ -221,6 +227,10 @@ 
		&ddrio_pwroff

		&global_pwroff



		/* For usb bc1.2 */

		&usb_otg_ilim_sel

		&usb_usb_ilim_sel



		/* Sleep only */

		&bt_dev_wake_sleep

		&pwr_led1_blink

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

+0 −7
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ 
		     "google,veyron", "rockchip,rk3288";



	/delete-node/ vcc18-lcd;



	vccsys: vccsys {

		compatible = "regulator-fixed";

		regulator-name = "vccsys";

		regulator-boot-on;

		regulator-always-on;

	};

};



&backlight {

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

+4 −0
Original line number Diff line number Diff line
@@ -586,6 +586,10 @@ 
			rockchip,pins = <4 RK_PD7 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		bt_host_wake_l: bt-host-wake-l {

			rockchip,pins = <4 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		/*

		 * We run sdio0 at max speed; bump up drive strength.

		 * We also have external pulls, so disable the internal ones.