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

Commit 2b424c7a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.2-rockchip-dts1' of... 

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

Merge "ARM: rockchip: dts changes for 4.2" from Heiko Stuebner:

Some misc improvements defining additional supply regulators, enabling
the Cortex-A12 HW PMU on the rk3288 and the tsadc on some more rk3288
boards, as well as some usb properties and marking the radxarock pmic
as system-power-controller.

* tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add system-power-controller to act8846 on radxarock
  ARM: dts: rockchip: add properties for dwc2 usb otg controller
  ARM: dts: rockchip: enable tsadc on rk3288 boards
  ARM: dts: rockchip: add act8846 supplies on rk3288-firefly
  ARM: dts: rockchip: Specify VMMC and VQMMC on rk3288-evb
  ARM: dts: rockchip: Enable Cortex-A12 HW PMU events on rk3288
parents 9d8a71ff 9ab79be0

arch/arm/boot/dts/rk3188-radxarock.dts

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
		compatible = "active-semi,act8846";

		reg = <0x5a>;

		status = "okay";

		system-power-controller;



		pinctrl-names = "default";

		pinctrl-0 = <&act8846_dvs0_ctl>;

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

+23 −0
Original line number Diff line number Diff line
@@ -112,6 +112,23 @@ 
		regulator-always-on;

		regulator-boot-on;

	};



	/*

	 * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from

	 * vcc_io directly.  Those boards won't be able to power cycle SD cards

	 * but it shouldn't hurt to toggle this pin there anyway.

	 */

	vcc_sd: sdmmc-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc_pwr>;

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

	};

};



&emmc {
@@ -141,6 +158,8 @@ 
	pinctrl-names = "default";

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

	status = "okay";

	vmmc-supply = <&vcc_sd>;

	vqmmc-supply = <&vccio_sd>;

};



&i2c0 {
@@ -232,6 +251,10 @@ 
		sdmmc_cmd: sdmmc-cmd {

			rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;

		};



		sdmmc_pwr: sdmmc-pwr {

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

		};

	};



	usb {

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

+14 −0
Original line number Diff line number Diff line
@@ -246,6 +246,14 @@ 
		pinctrl-0 = <&pmic_vsel>, <&pwr_hold>;

		system-power-controller;



		vp1-supply = <&vcc_sys>;

		vp2-supply = <&vcc_sys>;

		vp3-supply = <&vcc_sys>;

		vp4-supply = <&vcc_sys>;

		inl1-supply = <&vcc_sys>;

		inl2-supply = <&vcc_sys>;

		inl3-supply = <&vcc_20>;



		regulators {

			vcc_ddr: REG1 {

				regulator-name = "vcc_ddr";
@@ -457,6 +465,12 @@ 
	status = "okay";

};



&tsadc {

	rockchip,hw-tshut-mode = <0>;

	rockchip,hw-tshut-polarity = <0>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;

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

+6 −0
Original line number Diff line number Diff line
@@ -406,6 +406,12 @@ 
	};

};



&tsadc {

	rockchip,hw-tshut-mode = <0>;

	rockchip,hw-tshut-polarity = <0>;

	status = "okay";

};



&vopb {

	status = "okay";

};

arch/arm/boot/dts/rk3288.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -44,6 +44,14 @@ 
		spi2 = &spi2;

	};



	arm-pmu {

		compatible = "arm,cortex-a12-pmu";

		interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -434,6 +442,7 @@ 
		interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_USBHOST1>;

		clock-names = "otg";

		dr_mode = "host";

		phys = <&usbphy2>;

		phy-names = "usb2-phy";

		status = "disabled";
@@ -446,6 +455,11 @@ 
		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_OTG0>;

		clock-names = "otg";

		dr_mode = "otg";

		g-np-tx-fifo-size = <16>;

		g-rx-fifo-size = <275>;

		g-tx-fifo-size = <256 128 128 64 64 32>;

		g-use-dma;

		phys = <&usbphy0>;

		phy-names = "usb2-phy";

		status = "disabled";