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

Merge tag 'v4.5-rockchip-dts32-1' of... 

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

Merge "rockchip dts32 changes for 4.5" from Heiko Stuebner:

First round of arm devicetree changes.
Among the bigger changes are two new Veyron boards, support for
the dual-core cortex-a7 rk3036 soc and addition of support for
the crypto engine of the rk3288. Smaller changes include some
IR receivers, updates of thermal settings more reflecting real-
life and testing-results.

* tag 'v4.5-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add gpio-ir-receiver to the R89 board
  ARM: dts: rockchip: add touchscreen node to veyron minnie
  ARM: dts: rockchip: add veyron-mickey board
  ARM: dts: rockchip: add veyron-brain board
  ARM: dts: rockchip: make sure edp_24m is associated to xin24m on veyron
  ARM: dts: rockchip: override thermal settings on veyron-speedy
  ARM: dts: rockchip: update the thermal management on rk3288
  ARM: dts: rockchip: Add Crypto node for rk3288
  ARM: dts: rockchip: add rk3036-evb board
  ARM: dts: rockchip: add core rk3036 dtsi
  clk: rockchip: add dt-binding header for rk3036
  clk: rockchip: add an id for rk3288 crypto clk
  ARM: dts: rockchip: Add IR receiver to RK3288 Radxa Rock 2 Square
  ARM: dts: rockchip: add channels properties for i2s
  ARM: dts: rockchip: set system-power-controller property on rk3288-rock2
  ARM: dts: rockchip: Setup rk3066/rk3188 ethernet0 alias for u-boot
  ARM: dts: rockchip: Setup rk3288 ethernet0 alias for u-boot
parents 629b557a 06611141

Documentation/devicetree/bindings/arm/rockchip.txt

+14 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ Rockchip platforms device tree bindings 
    Required root node properties:

      - compatible = "netxeon,r89", "rockchip,rk3288";



- Google Brain (dev-board):

    Required root node properties:

      - compatible = "google,veyron-brain-rev0", "google,veyron-brain",

		     "google,veyron", "rockchip,rk3288";



- Google Jaq (Haier Chromebook 11 and more):

    Required root node properties:

      - compatible = "google,veyron-jaq-rev5", "google,veyron-jaq-rev4",
@@ -49,6 +54,15 @@ Rockchip platforms device tree bindings 
		     "google,veyron-jerry-rev3", "google,veyron-jerry",

		     "google,veyron", "rockchip,rk3288";



- Google Mickey (Asus Chromebit CS10):

    Required root node properties:

      - compatible = "google,veyron-mickey-rev8", "google,veyron-mickey-rev7",

		     "google,veyron-mickey-rev6", "google,veyron-mickey-rev5",

		     "google,veyron-mickey-rev4", "google,veyron-mickey-rev3",

		     "google,veyron-mickey-rev2", "google,veyron-mickey-rev1",

		     "google,veyron-mickey-rev0", "google,veyron-mickey",

		     "google,veyron", "rockchip,rk3288";



- Google Minnie (Asus Chromebook Flip C100P):

    Required root node properties:

      - compatible = "google,veyron-minnie-rev4", "google,veyron-minnie-rev3",

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
dtb-$(CONFIG_ARCH_REALVIEW) += \

	arm-realview-pb1176.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rk3036-evb.dtb \

	rk3066a-bqcurie2.dtb \

	rk3066a-marsboard.dtb \

	rk3066a-rayeager.dtb \
@@ -523,8 +524,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-popmetal.dtb \

	rk3288-r89.dtb \

	rk3288-rock2-square.dtb \

	rk3288-veyron-brain.dtb \

	rk3288-veyron-jaq.dtb \

	rk3288-veyron-jerry.dtb \

	rk3288-veyron-mickey.dtb \

	rk3288-veyron-minnie.dtb \

	rk3288-veyron-pinky.dtb \

	rk3288-veyron-speedy.dtb

arch/arm/boot/dts/rk3036-evb.dts

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

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



/ {

	model = "Rockchip RK3036 Evaluation board";

	compatible = "rockchip,rk3036-evb", "rockchip,rk3036";

};



&i2c1 {

	status = "okay";



	hym8563: hym8563@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "xin32k";

	};

};



&uart2 {

	status = "okay";

};

arch/arm/boot/dts/rk3036.dtsi

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

 * 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.

 */



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

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/pinctrl/rockchip.h>

#include <dt-bindings/clock/rk3036-cru.h>

#include "skeleton.dtsi"



/ {

	compatible = "rockchip,rk3036";



	interrupt-parent = <&gic>;



	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;

		mshc0 = &emmc;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

	};



	memory {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "rockchip,rk3036-smp";



		cpu0: cpu@f00 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0xf00>;

			resets = <&cru SRST_CORE0>;

			operating-points = <

				/* KHz    uV */

				 816000 1000000

			>;

			clock-latency = <40000>;

			clocks = <&cru ARMCLK>;

		};



		cpu1: cpu@f01 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0xf01>;

			resets = <&cru SRST_CORE1>;

		};

	};



	amba {

		compatible = "arm,amba-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		pdma: pdma@20078000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x20078000 0x4000>;

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

			clocks = <&cru ACLK_DMAC2>;

			clock-names = "apb_pclk";

		};

	};



	arm-pmu {

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

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>, <&cpu1>;

	};



	timer {

		compatible = "arm,armv7-timer";

		arm,cpu-registers-not-fw-configured;

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

		clock-frequency = <24000000>;

	};



	xin24m: oscillator {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;

		clock-output-names = "xin24m";

		#clock-cells = <0>;

	};



	bus_intmem@10080000 {

		compatible = "mmio-sram";

		reg = <0x10080000 0x2000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x10080000 0x2000>;



		smp-sram@0 {

			compatible = "rockchip,rk3066-smp-sram";

			reg = <0x00 0x10>;

		};

	};



	gic: interrupt-controller@10139000 {

		compatible = "arm,gic-400";

		interrupt-controller;

		#interrupt-cells = <3>;

		#address-cells = <0>;



		reg = <0x10139000 0x1000>,

		      <0x1013a000 0x1000>,

		      <0x1013c000 0x2000>,

		      <0x1013e000 0x2000>;

		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

	};



	usb_otg: usb@10180000 {

		compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb",

				"snps,dwc2";

		reg = <0x10180000 0x40000>;

		interrupts = <GIC_SPI 10 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;

		status = "disabled";

	};



	usb_host: usb@101c0000 {

		compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb",

				"snps,dwc2";

		reg = <0x101c0000 0x40000>;

		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_OTG1>;

		clock-names = "otg";

		dr_mode = "host";

		status = "disabled";

	};



	emmc: dwmmc@1021c000 {

		compatible = "rockchip,rk3288-dw-mshc";

		reg = <0x1021c000 0x4000>;

		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

		broken-cd;

		bus-width = <8>;

		cap-mmc-highspeed;

		clock-frequency = <37500000>;

		clock-freq-min-max = <400000 37500000>;

		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,

			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;

		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";

		default-sample-phase = <158>;

		disable-wp;

		dmas = <&pdma 12>;

		dma-names = "rx-tx";

		fifo-depth = <0x100>;

		mmc-ddr-1_8v;

		non-removable;

		num-slots = <1>;

		pinctrl-names = "default";

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

		status = "disabled";

	};



	i2s: i2s@10220000 {

		compatible = "rockchip,rk3036-i2s", "rockchip,rk3066-i2s";

		reg = <0x10220000 0x4000>;

		interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "i2s_hclk", "i2s_clk";

		clocks = <&cru HCLK_I2S>, <&cru SCLK_I2S>;

		dmas = <&pdma 0>, <&pdma 1>;

		dma-names = "tx", "rx";

		pinctrl-names = "default";

		pinctrl-0 = <&i2s_bus>;

		status = "disabled";

	};



	cru: clock-controller@20000000 {

		compatible = "rockchip,rk3036-cru";

		reg = <0x20000000 0x1000>;

		rockchip,grf = <&grf>;

		#clock-cells = <1>;

		#reset-cells = <1>;

		assigned-clocks = <&cru PLL_GPLL>;

		assigned-clock-rates = <594000000>;

	};



	grf: syscon@20008000 {

		compatible = "rockchip,rk3036-grf", "syscon";

		reg = <0x20008000 0x1000>;

	};



	acodec: acodec-ana@20030000 {

		compatible = "rk3036-codec";

		reg = <0x20030000 0x4000>;

		rockchip,grf = <&grf>;

		clock-names = "acodec_pclk";

		clocks = <&cru PCLK_ACODEC>;

		status = "disabled";

	};



	timer: timer@20044000 {

		compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer";

		reg = <0x20044000 0x20>;

		interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&xin24m>, <&cru PCLK_TIMER>;

		clock-names = "timer", "pclk";

	};



	pwm0: pwm@20050000 {

		compatible = "rockchip,rk3036-pwm", "rockchip,rk2928-pwm";

		reg = <0x20050000 0x10>;

		#pwm-cells = <3>;

		clocks = <&cru PCLK_PWM>;

		clock-names = "pwm";

		pinctrl-names = "default";

		pinctrl-0 = <&pwm0_pin>;

		status = "disabled";

	};



	pwm1: pwm@20050010 {

		compatible = "rockchip,rk3036-pwm", "rockchip,rk2928-pwm";

		reg = <0x20050010 0x10>;

		#pwm-cells = <3>;

		clocks = <&cru PCLK_PWM>;

		clock-names = "pwm";

		pinctrl-names = "default";

		pinctrl-0 = <&pwm1_pin>;

		status = "disabled";

	};



	pwm2: pwm@20050020 {

		compatible = "rockchip,rk3036-pwm", "rockchip,rk2928-pwm";

		reg = <0x20050020 0x10>;

		#pwm-cells = <3>;

		clocks = <&cru PCLK_PWM>;

		clock-names = "pwm";

		pinctrl-names = "default";

		pinctrl-0 = <&pwm2_pin>;

		status = "disabled";

	};



	pwm3: pwm@20050030 {

		compatible = "rockchip,rk3036-pwm", "rockchip,rk2928-pwm";

		reg = <0x20050030 0x10>;

		#pwm-cells = <2>;

		clocks = <&cru PCLK_PWM>;

		clock-names = "pwm";

		pinctrl-names = "default";

		pinctrl-0 = <&pwm3_pin>;

		status = "disabled";

	};



	i2c1: i2c@20056000 {

		compatible = "rockchip,rk3288-i2c";

		reg = <0x20056000 0x1000>;

		interrupts = <GIC_SPI 25 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@2005a000 {

		compatible = "rockchip,rk3288-i2c";

		reg = <0x2005a000 0x1000>;

		interrupts = <GIC_SPI 26 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";

	};



	uart0: serial@20060000 {

		compatible = "rockchip,rk3036-uart", "snps,dw-apb-uart";

		reg = <0x20060000 0x100>;

		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

		clock-frequency = <24000000>;

		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;

		clock-names = "baudclk", "apb_pclk";

		pinctrl-names = "default";

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

		status = "disabled";

	};



	uart1: serial@20064000 {

		compatible = "rockchip,rk3036-uart", "snps,dw-apb-uart";

		reg = <0x20064000 0x100>;

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

		clock-frequency = <24000000>;

		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;

		clock-names = "baudclk", "apb_pclk";

		pinctrl-names = "default";

		pinctrl-0 = <&uart1_xfer>;

		status = "disabled";

	};



	uart2: serial@20068000 {

		compatible = "rockchip,rk3036-uart", "snps,dw-apb-uart";

		reg = <0x20068000 0x100>;

		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

		clock-frequency = <24000000>;

		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;

		clock-names = "baudclk", "apb_pclk";

		pinctrl-names = "default";

		pinctrl-0 = <&uart2_xfer>;

		status = "disabled";

	};



	i2c0: i2c@20072000 {

		compatible = "rockchip,rk3288-i2c";

		reg = <0x20072000 0x1000>;

		interrupts = <GIC_SPI 24 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";

	};



	pinctrl: pinctrl {

		compatible = "rockchip,rk3036-pinctrl";

		rockchip,grf = <&grf>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		gpio0: gpio0@2007c000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x2007c000 0x100>;

			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cru PCLK_GPIO0>;



			gpio-controller;

			#gpio-cells = <2>;



			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpio1: gpio1@20080000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x20080000 0x100>;

			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cru PCLK_GPIO1>;



			gpio-controller;

			#gpio-cells = <2>;



			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpio2: gpio2@20084000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x20084000 0x100>;

			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cru PCLK_GPIO2>;



			gpio-controller;

			#gpio-cells = <2>;



			interrupt-controller;

			#interrupt-cells = <2>;

		};



		pcfg_pull_up: pcfg-pull-up {

			bias-pull-up;

		};



		pcfg_pull_down: pcfg-pull-down {

			bias-pull-down;

		};



		pcfg_pull_none: pcfg-pull-none {

			bias-disable;

		};



		pwm0 {

			pwm0_pin: pwm0-pin {

				rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;

			};

		};



		pwm1 {

			pwm1_pin: pwm1-pin {

				rockchip,pins = <0 1 RK_FUNC_2 &pcfg_pull_none>;

			};

		};



		pwm2 {

			pwm2_pin: pwm2-pin {

				rockchip,pins = <0 1 2 &pcfg_pull_none>;

			};

		};



		pwm3 {

			pwm3_pin: pwm3-pin {

				rockchip,pins = <0 27 1 &pcfg_pull_none>;

			};

		};



		emmc {

			/*

			 * We run eMMC at max speed; bump up drive strength.

			 * We also have external pulls, so disable the internal ones.

			 */

			emmc_clk: emmc-clk {

				rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none>;

			};



			emmc_cmd: emmc-cmd {

				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_none>;

			};



			emmc_bus8: emmc-bus8 {

				rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_none>,

						<1 25 RK_FUNC_2 &pcfg_pull_none>,

						<1 26 RK_FUNC_2 &pcfg_pull_none>,

						<1 27 RK_FUNC_2 &pcfg_pull_none>,

						<1 28 RK_FUNC_2 &pcfg_pull_none>,

						<1 29 RK_FUNC_2 &pcfg_pull_none>,

						<1 30 RK_FUNC_2 &pcfg_pull_none>,

						<1 31 RK_FUNC_2 &pcfg_pull_none>;

			};

		};



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

			};

		};



		i2s {

			i2s_bus: i2s-bus {

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

						<1 1 RK_FUNC_1 &pcfg_pull_none>,

						<1 2 RK_FUNC_1 &pcfg_pull_none>,

						<1 3 RK_FUNC_1 &pcfg_pull_none>,

						<1 4 RK_FUNC_1 &pcfg_pull_none>,

						<1 5 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		uart0 {

			uart0_xfer: uart0-xfer {

				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_up>,

						<0 17 RK_FUNC_1 &pcfg_pull_none>;

			};



			uart0_cts: uart0-cts {

				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_up>;

			};



			uart0_rts: uart0-rts {

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

			};

		};



		uart1 {

			uart1_xfer: uart1-xfer {

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

						<2 23 RK_FUNC_1 &pcfg_pull_none>;

			};

			/* no rts / cts for uart1 */

		};



		uart2 {

			uart2_xfer: uart2-xfer {

				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,

						<1 19 RK_FUNC_2 &pcfg_pull_none>;

			};

			/* no rts / cts for uart2 */

		};

	};

};

arch/arm/boot/dts/rk3066a.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
		dma-names = "tx", "rx";

		clock-names = "i2s_hclk", "i2s_clk";

		clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;

		rockchip,playback-channels = <8>;

		rockchip,capture-channels = <2>;

		status = "disabled";

	};
@@ -118,6 +120,8 @@ 
		dma-names = "tx", "rx";

		clock-names = "i2s_hclk", "i2s_clk";

		clocks = <&cru HCLK_I2S1>, <&cru SCLK_I2S1>;

		rockchip,playback-channels = <2>;

		rockchip,capture-channels = <2>;

		status = "disabled";

	};
@@ -133,6 +137,8 @@ 
		dma-names = "tx", "rx";

		clock-names = "i2s_hclk", "i2s_clk";

		clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>;

		rockchip,playback-channels = <2>;

		rockchip,capture-channels = <2>;

		status = "disabled";

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE