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

Merge tag 'v3.19-rockchip-dts2' of... 

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

Pull "ARM: rockchip: second batch of dts related changes" from Heiko Stuebner:

- the dts part of the rk3288 smp support
- rate init for rk3288 clocks
- enablement of various peripherals
- new boardfile for Haoyu Marsboard (rk3066 based)

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

:
  ARM: dts: rockchip: enable PWM on Radxa Rock
  ARM: dts: rockchip: fix invalid unit-address in rk3188.dtsi
  ARM: dts: rk3288: add VOP iommu nodes
  ARM: dts: rockchip: add reset for CPU nodes
  ARM: dts: rockchip: add intmem node for rk3288 smp support
  ARM: dts: rockchip: add pmu references to cpus nodes
  ARM: dts: rockchip: add serial aliases for rk3066 and rk3188
  ARM: dts: rockchip: Add devicetree source for MarsBoard RK3066
  ARM: dts: rockchip: Add EMAC Rockchip for RK3066 SoCs

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents af947cbf efb66e93

Documentation/devicetree/bindings/arm/rockchip.txt

+4 −0
Original line number Diff line number Diff line 
Rockchip platforms device tree bindings

---------------------------------------



- MarsBoard RK3066 board:

    Required root node properties:

      - compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";



- bq Curie 2 tablet:

    Required root node properties:

      - compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rk3066a-bqcurie2.dtb \

	rk3066a-marsboard.dtb \

	rk3188-radxarock.dtb \

	rk3288-evb-act8846.dtb \

	rk3288-evb-rk808.dtb

arch/arm/boot/dts/rk3066a-marsboard.dts

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

 * Copyright (c) 2014 Romain Perier <romain.perier@gmail.com>

 *

 * 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 "rk3066a.dtsi"



/ {

	model = "MarsBoard RK3066";

	compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";



	memory {

		reg = <0x60000000 0x40000000>;

	};



	vcc_sd0: sdmmc-regulator {

		compatible = "regulator-fixed";

		regulator-name = "sdmmc-supply";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;

		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

	};

};



&i2c1 {

	status = "okay";

	clock-frequency = <400000>;



	tps: tps@2d {

		reg = <0x2d>;



		interrupt-parent = <&gpio6>;

		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;



		vcc5-supply = <&vcc_io>;

		vcc6-supply = <&vcc_io>;



		regulators {

			vcc_rtc: regulator@0 {

				regulator-name = "vcc_rtc";

				regulator-always-on;

			};



			vcc_io: regulator@1 {

				regulator-name = "vcc_io";

				regulator-always-on;

			};



			vdd_arm: regulator@2 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;

				regulator-always-on;

			};



			vcc_ddr: regulator@3 {

				regulator-name = "vcc_ddr";

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;

				regulator-always-on;

			};



			vcc18_cif: regulator@5 {

				regulator-name = "vcc18_cif";

				regulator-always-on;

			};



			vdd_11: regulator@6 {

				regulator-name = "vdd_11";

				regulator-always-on;

			};



			vcc_25: regulator@7 {

				regulator-name = "vcc_25";

				regulator-always-on;

			};



			vcc_18: regulator@8 {

				regulator-name = "vcc_18";

				regulator-always-on;

			};



			vcc25_hdmi: regulator@9 {

				regulator-name = "vcc25_hdmi";

				regulator-always-on;

			};



			vcca_33: regulator@10 {

				regulator-name = "vcca_33";

				regulator-always-on;

			};



			vcc_rmii: regulator@11 {

				regulator-name = "vcc_rmii";

			};



			vcc28_cif: regulator@12 {

				regulator-name = "vcc28_cif";

				regulator-always-on;

			};

		};

	};

};



/* must be included after &tps gets defined */

#include "tps65910.dtsi"



&emac {

	status = "okay";



	phy = <&phy0>;

	phy-supply = <&vcc_rmii>;



	pinctrl-names = "default";

	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>;



	phy0: ethernet-phy@0 {

		reg = <0>;

		interrupt-parent = <&gpio1>;

		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;

	};

};



&pinctrl {

	lan8720a {

		phy_int: phy-int {

			rockchip,pins = <RK_GPIO1 26 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&uart0 {

	status = "okay";

};



&uart1 {

	status = "okay";

};



&uart2 {

	status = "okay";

};



&uart3 {

	status = "okay";

};



&wdt {

	status = "okay";

};

arch/arm/boot/dts/rk3066a.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -234,6 +234,24 @@ 
			bias-disable;

		};



		emac {

			emac_xfer: emac-xfer {

				rockchip,pins = <RK_GPIO1 16 RK_FUNC_2 &pcfg_pull_none>, /* mac_clk */

						<RK_GPIO1 17 RK_FUNC_2 &pcfg_pull_none>, /* tx_en */

						<RK_GPIO1 18 RK_FUNC_2 &pcfg_pull_none>, /* txd1 */

						<RK_GPIO1 19 RK_FUNC_2 &pcfg_pull_none>, /* txd0 */

						<RK_GPIO1 20 RK_FUNC_2 &pcfg_pull_none>, /* rx_err */

						<RK_GPIO1 21 RK_FUNC_2 &pcfg_pull_none>, /* crs_dvalid */

						<RK_GPIO1 22 RK_FUNC_2 &pcfg_pull_none>, /* rxd1 */

						<RK_GPIO1 23 RK_FUNC_2 &pcfg_pull_none>; /* rxd0 */

			};



			emac_mdio: emac-mdio {

				rockchip,pins = <RK_GPIO1 24 RK_FUNC_2 &pcfg_pull_none>, /* mac_md */

						<RK_GPIO1 25 RK_FUNC_2 &pcfg_pull_none>; /* mac_mdclk */

			};

		};



		emmc {

			emmc_clk: emmc-clk {

				rockchip,pins = <RK_GPIO3 31 RK_FUNC_2 &pcfg_pull_default>;
@@ -587,3 +605,7 @@ 
&wdt {

	compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";

};



&emac {

	compatible = "rockchip,rk3066-emac";

};

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

+12 −0
Original line number Diff line number Diff line
@@ -243,6 +243,18 @@ 
	disable-wp;

};



&pwm1 {

	status = "okay";

};



&pwm2 {

	status = "okay";

};



&pwm3 {

	status = "okay";

};



&pinctrl {

	pcfg_output_low: pcfg-output-low {

		output-low;

CRA Git | Maintained and supported by SUSTech CRA and CCSE