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

Commit 3445b2fa authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

ARM: dts: rockchip: move rk3288 io-domain nodes to the grf 



io-voltage control is actually part of the grf, so move the node under the
newly available grf simple-mfd.

To minimize duplicate code, the core node and compatible property
gets placed in the core rk3288.dtsi while the individual boards
now only need to enable it and add the necessary supply properties.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 7dbc2b97

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

+15 −16
Original line number Original line Diff line number Diff line
@@ -64,22 +64,6 @@ 
		clock-output-names = "ext_gmac";

		clock-output-names = "ext_gmac";

	};

	};





	io_domains: io-domains {

		compatible = "rockchip,rk3288-io-voltage-domain";

		rockchip,grf = <&grf>;



		audio-supply = <&vcca_33>;

		bb-supply = <&vcc_io>;

		dvp-supply = <&dovdd_1v8>;

		flash0-supply = <&vcc_flash>;

		flash1-supply = <&vcc_lan>;

		gpio30-supply = <&vcc_io>;

		gpio1830-supply = <&vcc_io>;

		lcdc-supply = <&vcc_io>;

		sdcard-supply = <&vccio_sd>;

		wifi-supply = <&vccio_wl>;

	};



	ir: ir-receiver {

	ir: ir-receiver {

		compatible = "gpio-ir-receiver";

		compatible = "gpio-ir-receiver";

		pinctrl-names = "default";

		pinctrl-names = "default";
@@ -397,6 +381,21 @@ 
	status = "okay";

	status = "okay";

};

};





&io_domains {

	status = "okay";



	audio-supply = <&vcca_33>;

	bb-supply = <&vcc_io>;

	dvp-supply = <&dovdd_1v8>;

	flash0-supply = <&vcc_flash>;

	flash1-supply = <&vcc_lan>;

	gpio30-supply = <&vcc_io>;

	gpio1830-supply = <&vcc_io>;

	lcdc-supply = <&vcc_io>;

	sdcard-supply = <&vccio_sd>;

	wifi-supply = <&vccio_wl>;

};



&pinctrl {

&pinctrl {

	pcfg_output_high: pcfg-output-high {

	pcfg_output_high: pcfg-output-high {

		output-high;

		output-high;

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

+13 −13
Original line number Original line Diff line number Diff line
@@ -64,19 +64,6 @@ 
		clock-output-names = "ext_gmac";

		clock-output-names = "ext_gmac";

	};

	};





	io_domains: io-domains {

		compatible = "rockchip,rk3288-io-voltage-domain";



		audio-supply = <&vcca_33>;

		flash0-supply = <&vcc_flash>;

		flash1-supply = <&vcc_lan>;

		gpio30-supply = <&vcc_io>;

		gpio1830-supply = <&vcc_io>;

		lcdc-supply = <&vcc_io>;

		sdcard-supply = <&vccio_sd>;

		wifi-supply = <&vcc_18>;

	};



	leds {

	leds {

		compatible = "gpio-leds";

		compatible = "gpio-leds";
@@ -321,6 +308,19 @@ 
	status = "okay";

	status = "okay";

};

};





&io_domains {

	status = "okay";



	audio-supply = <&vcca_33>;

	flash0-supply = <&vcc_flash>;

	flash1-supply = <&vcc_lan>;

	gpio30-supply = <&vcc_io>;

	gpio1830-supply = <&vcc_io>;

	lcdc-supply = <&vcc_io>;

	sdcard-supply = <&vccio_sd>;

	wifi-supply = <&vcc_18>;

};



&pinctrl {

&pinctrl {

	pcfg_output_high: pcfg-output-high {

	pcfg_output_high: pcfg-output-high {

		output-high;

		output-high;

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

+15 −16
Original line number Original line Diff line number Diff line
@@ -77,22 +77,6 @@ 
		};

		};

	};

	};





	io_domains: io-domains {

		compatible = "rockchip,rk3288-io-voltage-domain";

		rockchip,grf = <&grf>;



		audio-supply = <&vcca_33>;

		bb-supply = <&vcc_io>;

		dvp-supply = <&vcc18_dvp>;

		flash0-supply = <&vcc_flash>;

		flash1-supply = <&vcc_lan>;

		gpio30-supply = <&vcc_io>;

		gpio1830-supply = <&vcc_io>;

		lcdc-supply = <&vcc_io>;

		sdcard-supply = <&vccio_sd>;

		wifi-supply = <&vccio_wl>;

	};



	ir: ir-receiver {

	ir: ir-receiver {

		compatible = "gpio-ir-receiver";

		compatible = "gpio-ir-receiver";

		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -437,6 +421,21 @@ 
	status = "okay";

	status = "okay";

};

};





&io_domains {

	status = "okay";



	audio-supply = <&vcca_33>;

	bb-supply = <&vcc_io>;

	dvp-supply = <&vcc18_dvp>;

	flash0-supply = <&vcc_flash>;

	flash1-supply = <&vcc_lan>;

	gpio30-supply = <&vcc_io>;

	gpio1830-supply = <&vcc_io>;

	lcdc-supply = <&vcc_io>;

	sdcard-supply = <&vccio_sd>;

	wifi-supply = <&vccio_wl>;

};



&pinctrl {

&pinctrl {

	ak8963 {

	ak8963 {

		comp_int: comp-int {

		comp_int: comp-int {

arch/arm/boot/dts/rk3288-rock2-som.dtsi

+15 −16
Original line number Original line Diff line number Diff line
@@ -61,22 +61,6 @@ 
		clock-output-names = "ext_gmac";

		clock-output-names = "ext_gmac";

	};

	};





	io_domains: io-domains {

		compatible = "rockchip,rk3288-io-voltage-domain";

		rockchip,grf = <&grf>;



		audio-supply = <&vcc_io>;

		bb-supply = <&vcc_io>;

		dvp-supply = <&vcc_18>;

		flash0-supply = <&vcc_flash>;

		flash1-supply = <&vccio_pmu>;

		gpio30-supply = <&vccio_pmu>;

		gpio1830 = <&vcc_io>;

		lcdc-supply = <&vcc_io>;

		sdcard-supply = <&vccio_sd>;

		wifi-supply = <&vcc_18>;

	};



	vcc_flash: flash-regulator {

	vcc_flash: flash-regulator {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-name = "vcc_sys";
@@ -259,6 +243,21 @@ 
	};

	};

};

};





&io_domains {

	status = "okay";



	audio-supply = <&vcc_io>;

	bb-supply = <&vcc_io>;

	dvp-supply = <&vcc_18>;

	flash0-supply = <&vcc_flash>;

	flash1-supply = <&vccio_pmu>;

	gpio30-supply = <&vccio_pmu>;

	gpio1830 = <&vcc_io>;

	lcdc-supply = <&vcc_io>;

	sdcard-supply = <&vccio_sd>;

	wifi-supply = <&vcc_18>;

};



&pinctrl {

&pinctrl {

	pcfg_output_high: pcfg-output-high {

	pcfg_output_high: pcfg-output-high {

		output-high;

		output-high;

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

+12 −13
Original line number Original line Diff line number Diff line
@@ -83,19 +83,6 @@ 
		reset-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;

	};

	};





	io_domains: io-domains {

		compatible = "rockchip,rk3288-io-voltage-domain";

		rockchip,grf = <&grf>;



		bb-supply = <&vcc33_io>;

		dvp-supply = <&vcc_18>;

		flash0-supply = <&vcc18_flashio>;

		gpio1830-supply = <&vcc33_io>;

		gpio30-supply = <&vcc33_io>;

		lcdc-supply = <&vcc33_lcd>;

		wifi-supply = <&vcc18_wl>;

	};



	sdio_pwrseq: sdio-pwrseq {

	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		compatible = "mmc-pwrseq-simple";

		clocks = <&rk808 RK808_CLKOUT1>;

		clocks = <&rk808 RK808_CLKOUT1>;
@@ -355,6 +342,18 @@ 
	i2c-scl-rising-time-ns = <1000>;

	i2c-scl-rising-time-ns = <1000>;

};

};





&io_domains {

	status = "okay";



	bb-supply = <&vcc33_io>;

	dvp-supply = <&vcc_18>;

	flash0-supply = <&vcc18_flashio>;

	gpio1830-supply = <&vcc33_io>;

	gpio30-supply = <&vcc33_io>;

	lcdc-supply = <&vcc33_lcd>;

	wifi-supply = <&vcc18_wl>;

};



&pwm1 {

&pwm1 {

	status = "okay";

	status = "okay";

};

};