Commit c5e51c98 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.7-rockchip-dts32-2' of... 

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

Merge "Rockchip dts32 updates for v4.7 - part2" from Heiko Stübner:

This adds the rk3288-miqi as new board, adapts the edp-phy settings
to the binding-change that made it into 4.6, adds rk3288 i2c controller
nodes and moves the rk3288 thermal data into the soc dtsi, as there
really is no need to have that separate file.

* tag 'v4.7-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: move the rk3288 thermal data into rk3288.dtsi
  ARM: dts: rockchip: add MiQi board from mqmaker
  dt-bindings: add vendor-prefix for mqmaker
  ARM: dts: rockchip: move rk3288 edp phy under the GRF
  ARM: dts: rockchip: make rk3288-grf a simple-mfd
  ARM: dts: rockchip: add i2c nodes for RK3228 SoCs
parents 48ea582f f87305fa

Documentation/devicetree/bindings/arm/rockchip.txt

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ Rockchip platforms device tree bindings 
		     "google,veyron-speedy-rev3", "google,veyron-speedy-rev2",

		     "google,veyron-speedy", "google,veyron", "rockchip,rk3288";



- mqmaker MiQi:

    Required root node properties:

      - compatible = "mqmaker,miqi", "rockchip,rk3288";



- Rockchip RK3368 evb:

    Required root node properties:

      - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ mitsubishi Mitsubishi Electric Corporation 
mosaixtech	Mosaix Technologies, Inc.

moxa	Moxa

mpl	MPL AG

mqmaker	mqmaker Inc.

msi	Micro-Star International Co. Ltd.

mti	Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)

mundoreader	Mundo Reader S.L.

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-evb-rk808.dtb \

	rk3288-firefly-beta.dtb \

	rk3288-firefly.dtb \

	rk3288-miqi.dtb \

	rk3288-popmetal.dtb \

	rk3288-r89.dtb \

	rk3288-rock2-square.dtb \

arch/arm/boot/dts/rk3228.dtsi

+80 −0
Original line number Diff line number Diff line
@@ -187,6 +187,58 @@ 
		status = "disabled";

	};



	i2c0: i2c@11050000 {

		compatible = "rockchip,rk3228-i2c";

		reg = <0x11050000 0x1000>;

		interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "i2c";

		clocks = <&cru PCLK_I2C0>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2c0_xfer>;

		status = "disabled";

	};



	i2c1: i2c@11060000 {

		compatible = "rockchip,rk3228-i2c";

		reg = <0x11060000 0x1000>;

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "i2c";

		clocks = <&cru PCLK_I2C1>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2c1_xfer>;

		status = "disabled";

	};



	i2c2: i2c@11070000 {

		compatible = "rockchip,rk3228-i2c";

		reg = <0x11070000 0x1000>;

		interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "i2c";

		clocks = <&cru PCLK_I2C2>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2c2_xfer>;

		status = "disabled";

	};



	i2c3: i2c@11080000 {

		compatible = "rockchip,rk3228-i2c";

		reg = <0x11080000 0x1000>;

		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "i2c";

		clocks = <&cru PCLK_I2C3>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_xfer>;

		status = "disabled";

	};



	pwm0: pwm@110b0000 {

		compatible = "rockchip,rk3288-pwm";

		reg = <0x110b0000 0x10>;
@@ -429,6 +481,34 @@ 
			};

		};



		i2c0 {

			i2c0_xfer: i2c0-xfer {

				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,

						<0 1 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		i2c1 {

			i2c1_xfer: i2c1-xfer {

				rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_none>,

						<0 3 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		i2c2 {

			i2c2_xfer: i2c2-xfer {

				rockchip,pins = <2 20 RK_FUNC_1 &pcfg_pull_none>,

						<2 21 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		i2c3 {

			i2c3_xfer: i2c3-xfer {

				rockchip,pins = <0 6 RK_FUNC_1 &pcfg_pull_none>,

						<0 7 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		pwm0 {

			pwm0_pin: pwm0-pin {

				rockchip,pins = <3 21 RK_FUNC_1 &pcfg_pull_none>;

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

0 → 100644
+472 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 Heiko Stuebner <heiko@sntech.de>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;

#include <dt-bindings/input/input.h>

#include "rk3288.dtsi"



/ {

	model = "mqmaker MiQi";

	compatible = "mqmaker,miqi", "rockchip,rk3288";



	chosen {

		stdout-path = "serial2:115200n8";

	};



	memory {

		device_type = "memory";

		reg = <0 0x80000000>;

	};



	ext_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <125000000>;

		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 {

		compatible = "gpio-leds";



		work {

			gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;

			label = "miqi:green:user";

			linux,default-trigger = "default-on";

			pinctrl-names = "default";

			pinctrl-0 = <&led_ctl>;

		};

	};



	vcc_flash: flash-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_flash";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vcc_io>;

	};



	vcc_host: usb-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "vcc_host";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	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>;

	};



	vcc_sys: vsys-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&cpu0 {

	cpu0-supply = <&vdd_cpu>;

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	disable-wp;

	non-removable;

	num-slots = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>;

	vmmc-supply = <&vcc_io>;

	vqmmc-supply = <&vcc_flash>;

	status = "okay";

};



&gmac {

	assigned-clocks = <&cru SCLK_MAC>;

	assigned-clock-parents = <&ext_gmac>;

	clock_in_out = "input";

	pinctrl-names = "default";

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

	phy-supply = <&vcc_lan>;

	phy-mode = "rgmii";

	snps,reset-active-low;

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

	snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>;

	tx_delay = <0x30>;

	rx_delay = <0x10>;

	status = "ok";

};



&hdmi {

	ddc-i2c-bus = <&i2c5>;

	status = "okay";

};



&i2c0 {

	clock-frequency = <400000>;

	status = "okay";



	vdd_cpu: syr827@40 {

		compatible = "silergy,syr827";

		fcs,suspend-voltage-selector = <1>;

		reg = <0x40>;

		regulator-name = "vdd_cpu";

		regulator-min-microvolt = <850000>;

		regulator-max-microvolt = <1350000>;

		regulator-always-on;

		regulator-boot-on;

		regulator-enable-ramp-delay = <300>;

		regulator-ramp-delay = <8000>;

		vin-supply = <&vcc_sys>;

	};



	vdd_gpu: syr828@41 {

		compatible = "silergy,syr828";

		fcs,suspend-voltage-selector = <1>;

		reg = <0x41>;

		regulator-name = "vdd_gpu";

		regulator-min-microvolt = <850000>;

		regulator-max-microvolt = <1350000>;

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	hym8563: hym8563@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "xin32k";

	};



	act8846: act8846@5a {

		compatible = "active-semi,act8846";

		reg = <0x5a>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_vsel>;

		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";

				regulator-always-on;

			};



			vcc_io: REG2 {

				regulator-name = "vcc_io";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};



			vdd_log: REG3 {

				regulator-name = "vdd_log";

				regulator-min-microvolt = <1100000>;

				regulator-max-microvolt = <1100000>;

				regulator-always-on;

			};



			vcc_20: REG4 {

				regulator-name = "vcc_20";

				regulator-min-microvolt = <2000000>;

				regulator-max-microvolt = <2000000>;

				regulator-always-on;

			};



			vccio_sd: REG5 {

				regulator-name = "vccio_sd";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};



			vdd10_lcd: REG6 {

				regulator-name = "vdd10_lcd";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			vcca_18: REG7 {

				regulator-name = "vcca_18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

			};



			vcca_33: REG8 {

				regulator-name = "vcca_33";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

			};



			vcc_lan: REG9 {

				regulator-name = "vcc_lan";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

			};



			vdd_10: REG10 {

				regulator-name = "vdd_10";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			vcc_18: REG11 {

				regulator-name = "vcc_18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};



			vcc18_lcd: REG12 {

				regulator-name = "vcc18_lcd";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};

		};

	};

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&pinctrl {

	pcfg_output_high: pcfg-output-high {

		output-high;

	};



	pcfg_output_low: pcfg-output-low {

		output-low;

	};



	pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {

		bias-pull-up;

		drive-strength = <12>;

	};



	act8846 {

		pmic_int: pmic-int {

			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		pmic_sleep: pmic-sleep {

			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_output_low>;

		};



		pmic_vsel: pmic-vsel {

			rockchip,pins = <7 1 RK_FUNC_GPIO &pcfg_output_low>;

		};

	};



	gmac {

		phy_int: phy-int {

			rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		phy_pmeb: phy-pmeb {

			rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		phy_rst: phy-rst {

			rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>;

		};

	};



	leds {

		led_ctl: led-ctl {

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

		};

	};



	sdmmc {

		/*

		 * Default drive strength isn't enough to achieve even

		 * high-speed mode on firefly board so bump up to 12ma.

		 */

		sdmmc_bus4: sdmmc-bus4 {

			rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_12ma>,

					<6 17 RK_FUNC_1 &pcfg_pull_up_drv_12ma>,

					<6 18 RK_FUNC_1 &pcfg_pull_up_drv_12ma>,

					<6 19 RK_FUNC_1 &pcfg_pull_up_drv_12ma>;

		};



		sdmmc_clk: sdmmc-clk {

			rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_12ma>;

		};



		sdmmc_cmd: sdmmc-cmd {

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

		};



		sdmmc_pwr: sdmmc-pwr {

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

		};

	};



	usb_host {

		host_vbus_drv: host-vbus-drv {

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

		};

	};

};



&saradc {

	vref-supply = <&vcc_18>;

	status = "okay";

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	disable-wp;

	num-slots = <1>;

	pinctrl-names = "default";

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

	vmmc-supply = <&vcc_sd>;

	vqmmc-supply = <&vccio_sd>;

	status = "okay";

};



&tsadc {

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

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

	status = "okay";

};



&uart2 {

	status = "okay";

};



&uart3 {

	status = "okay";

};



&usbphy {

	status = "okay";

};



&usb_host1 {

	status = "okay";

};



&usb_otg {

	/*

	 * The otg controller is the only system power source,

	 * so needs to always stay in device mode.

	 */

	dr_mode = "peripheral";

	status = "okay";

};



&vopb {

	status = "okay";

};



&vopb_mmu {

	status = "okay";

};



&vopl {

	status = "okay";

};



&vopl_mmu {

	status = "okay";

};



&wdt {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE