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

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

Merge tag 'v3.18-rockchip-dts2-v2' of... 

Merge tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "second bunch of dts changes for 3.18" from Heiko Stubner:

More peripheral support for Rockchip SoCs
- dwc2 usb controllers
- spi controllers
- emmc controller

* tag 'v3.18-rockchip-dts2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: Remove "regulator-always-on" in vcc_rmii for Radxa Rock
  ARM: dts: rockchip: fix rk3188 emmc pull references
  ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references
  ARM: dts: rockchip: clean up rk3xxx mmc nodes
  ARM: dts: rockchip: add emmc nodes for rk3066 and rk3188
  ARM: dts: rockchip: add Cortex-A9 SPI controller nodes
  ARM: dts: rockchip: enable usb ports on Radxa Rock
  ARM: dts: rockchip: add dwc2 controllers for rk3066 and rk3188
  ARM: dts: rockchip: remove rockchip,bus-index from rk3xxx i2c0
  ARM: dts: Switch i2c0 to 400kHz on rk3288-evb-rk808
  ARM: dts: Add rk808 PMIC to rk3288-evb-rk808
  ARM: dts: Add mshc aliases for rk3288
  ARM: dts: Add SPI nodes to rk3288
  ARM: dts: Enable USB host1(dwc) on rk3288-evb
  ARM: dts: add rk3288 dwc2 controller support
  ARM: dts: Add sdio0 and sdio1 to the rk3288

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5f0798ce 6051ddd4

arch/arm/boot/dts/rk3066a.dtsi

+67 −0
Original line number Diff line number Diff line
@@ -179,6 +179,27 @@ 
			bias-disable;

		};



		emmc {

			emmc_clk: emmc-clk {

				rockchip,pins = <RK_GPIO3 31 RK_FUNC_2 &pcfg_pull_default>;

			};



			emmc_cmd: emmc-cmd {

				rockchip,pins = <RK_GPIO4 9 RK_FUNC_2 &pcfg_pull_default>;

			};



			emmc_rst: emmc-rst {

				rockchip,pins = <RK_GPIO4 10 RK_FUNC_2 &pcfg_pull_default>;

			};



			/*

			 * The data pins are shared between nandc and emmc and

			 * not accessible through pinctrl. Also they should've

			 * been already set correctly by firmware, as

			 * flash/emmc is the boot-device.

			 */

		};



		i2c0 {

			i2c0_xfer: i2c0-xfer {

				rockchip,pins = <RK_GPIO2 28 RK_FUNC_1 &pcfg_pull_none>,
@@ -238,6 +259,42 @@ 
			};

		};



		spi0 {

			spi0_clk: spi0-clk {

				rockchip,pins = <RK_GPIO1 5 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi0_cs0: spi0-cs0 {

				rockchip,pins = <RK_GPIO1 4 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi0_tx: spi0-tx {

				rockchip,pins = <RK_GPIO1 7 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi0_rx: spi0-rx {

				rockchip,pins = <RK_GPIO1 6 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi0_cs1: spi0-cs1 {

				rockchip,pins = <RK_GPIO4 15 RK_FUNC_1 &pcfg_pull_default>;

			};

		};



		spi1 {

			spi1_clk: spi1-clk {

				rockchip,pins = <RK_GPIO2 19 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi1_cs0: spi1-cs0 {

				rockchip,pins = <RK_GPIO2 20 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi1_rx: spi1-rx {

				rockchip,pins = <RK_GPIO2 22 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi1_tx: spi1-tx {

				rockchip,pins = <RK_GPIO2 21 RK_FUNC_2 &pcfg_pull_default>;

			};

			spi1_cs1: spi1-cs1 {

				rockchip,pins = <RK_GPIO2 23 RK_FUNC_2 &pcfg_pull_default>;

			};

		};



		uart0 {

			uart0_xfer: uart0-xfer {

				rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>,
@@ -406,6 +463,16 @@ 
	pinctrl-0 = <&pwm3_out>;

};



&spi0 {

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;

};



&spi1 {

	pinctrl-names = "default";

	pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>;

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

+43 −1
Original line number Diff line number Diff line
@@ -65,6 +65,19 @@ 
		pinctrl-0 = <&ir_recv_pin>;

	};



	vcc_otg: usb-otg-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&otg_vbus_drv>;

		regulator-name = "otg-vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

	};



	vcc_sd0: sdmmc-regulator {

		compatible = "regulator-fixed";

		regulator-name = "sdmmc-supply";
@@ -74,6 +87,19 @@ 
		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

	};



	vcc_host: usb-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 3 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "host-pwr";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&i2c1 {
@@ -160,7 +186,6 @@ 
				regulator-name = "VCC_RMII";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};



			vccio_wl: REG10 {
@@ -220,6 +245,15 @@ 
			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb {

		host_vbus_drv: host-vbus-drv {

			rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>;

		};

		otg_vbus_drv: otg-vbus-drv {

			rockchip,pins = <2 31 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&uart0 {
@@ -238,6 +272,14 @@ 
	status = "okay";

};



&usb_host {

	status = "okay";

};



&usb_otg {

	status = "okay";

};



&wdt {

	status = "okay";

};

arch/arm/boot/dts/rk3188.dtsi

+69 −0
Original line number Diff line number Diff line
@@ -147,6 +147,27 @@ 
			bias-disable;

		};



		emmc {

			emmc_clk: emmc-clk {

				rockchip,pins = <RK_GPIO0 24 RK_FUNC_2 &pcfg_pull_none>;

			};



			emmc_cmd: emmc-cmd {

				rockchip,pins = <RK_GPIO0 26 RK_FUNC_2 &pcfg_pull_up>;

			};



			emmc_rst: emmc-rst {

				rockchip,pins = <RK_GPIO0 27 RK_FUNC_2 &pcfg_pull_none>;

			};



			/*

			 * The data pins are shared between nandc and emmc and

			 * not accessible through pinctrl. Also they should've

			 * been already set correctly by firmware, as

			 * flash/emmc is the boot-device.

			 */

		};



		i2c0 {

			i2c0_xfer: i2c0-xfer {

				rockchip,pins = <RK_GPIO1 24 RK_FUNC_1 &pcfg_pull_none>,
@@ -206,6 +227,42 @@ 
			};

		};



		spi0 {

			spi0_clk: spi0-clk {

				rockchip,pins = <RK_GPIO1 6 RK_FUNC_2 &pcfg_pull_up>;

			};

			spi0_cs0: spi0-cs0 {

				rockchip,pins = <RK_GPIO1 7 RK_FUNC_2 &pcfg_pull_up>;

			};

			spi0_tx: spi0-tx {

				rockchip,pins = <RK_GPIO1 5 RK_FUNC_2 &pcfg_pull_up>;

			};

			spi0_rx: spi0-rx {

				rockchip,pins = <RK_GPIO1 4 RK_FUNC_2 &pcfg_pull_up>;

			};

			spi0_cs1: spi0-cs1 {

				rockchip,pins = <RK_GPIO1 15 RK_FUNC_1 &pcfg_pull_up>;

			};

		};



		spi1 {

			spi1_clk: spi1-clk {

				rockchip,pins = <RK_GPIO0 30 RK_FUNC_1 &pcfg_pull_up>;

			};

			spi1_cs0: spi1-cs0 {

				rockchip,pins = <RK_GPIO0 31 RK_FUNC_1 &pcfg_pull_up>;

			};

			spi1_rx: spi1-rx {

				rockchip,pins = <RK_GPIO0 28 RK_FUNC_1 &pcfg_pull_up>;

			};

			spi1_tx: spi1-tx {

				rockchip,pins = <RK_GPIO0 29 RK_FUNC_1 &pcfg_pull_up>;

			};

			spi1_cs1: spi1-cs1 {

				rockchip,pins = <RK_GPIO1 14 RK_FUNC_2 &pcfg_pull_up>;

			};

		};



		uart0 {

			uart0_xfer: uart0-xfer {

				rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
@@ -381,6 +438,18 @@ 
	pinctrl-0 = <&pwm3_out>;

};



&spi0 {

	compatible = "rockchip,rk3188-spi", "rockchip,rk3066-spi";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;

};



&spi1 {

	compatible = "rockchip,rk3188-spi", "rockchip,rk3066-spi";

	pinctrl-names = "default";

	pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>;

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

+132 −0
Original line number Diff line number Diff line
@@ -16,3 +16,135 @@ 
/ {

	compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";

};



&i2c0 {

	clock-frequency = <400000>;

	status = "okay";



	rk808: pmic@1b {

		compatible = "rockchip,rk808";

		reg = <0x1b>;

		interrupt-parent = <&gpio0>;

		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int>;

		rockchip,system-power-controller;

		wakeup-source;

		#clock-cells = <1>;

		clock-output-names = "xin32k", "rk808-clkout2";



		vcc8-supply = <&vcc_18>;

		vcc9-supply = <&vcc_io>;

		vcc10-supply = <&vcc_io>;

		vcc12-supply = <&vcc_io>;

		vddio-supply = <&vccio_pmu>;



		regulators {

			vdd_cpu: DCDC_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1300000>;

				regulator-name = "vdd_arm";

			};



			vdd_gpu: DCDC_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <850000>;

				regulator-max-microvolt = <1250000>;

				regulator-name = "vdd_gpu";

			};



			vcc_ddr: DCDC_REG3 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_ddr";

			};



			vcc_io: DCDC_REG4 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcc_io";

			};



			vccio_pmu: LDO_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_pmu";

			};



			vcc_tp: LDO_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcc_tp";

			};



			vdd_10: LDO_REG3 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-name = "vdd_10";

			};



			vcc18_lcd: LDO_REG4 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc18_lcd";

			};



			vccio_sd: LDO_REG5 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vccio_sd";

			};



			vdd10_lcd: LDO_REG6 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-name = "vdd10_lcd";

			};



			vcc_18: LDO_REG7 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-name = "vcc_18";

			};



			vcca_codec: LDO_REG8 {

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcca_codec";

			};



			vcc_wl: SWITCH_REG1 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_wl";

			};



			vcc_lcd: SWITCH_REG2 {

				regulator-always-on;

				regulator-boot-on;

				regulator-name = "vcc_lcd";

			};

		};

	};

};

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

+4 −0
Original line number Diff line number Diff line
@@ -177,3 +177,7 @@ 
&usb_host0_ehci {

	status = "okay";

};



&usb_host1 {

	status = "okay";

};