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

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

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

Pull "Rockchip dts32 changes for 4.10" from Heiko Stübner:

A bit of attention for the rk3066, fixed tsadc reset node
as well as enabling the dma for uart and mmc controllers.

And one new soc, the rk1108 combining a single-core Cortex-A7
with a separate DSP core.

* tag 'v4.10-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add the sdmmc pinctrl for rk1108
  ARM: dts: rockchip: add rockchip RK1108 Evaluation board
  ARM: dts: rockchip: add basic support for RK1108 SOC
  clk: rockchip: add dt-binding header for rk1108
  dt-bindings: rockchip-dw-mshc: add RK1108 dw-mshc description
  ARM: dts: rockchip: enable dma for uart and mmc on rk3066a
  ARM: dts: rockchip: fix TSADC reset node for rk3066a
parents f39266cb c458e1b5

Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required Properties: 
	- "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following,

							before RK3288

	- "rockchip,rk3288-dw-mshc": for Rockchip RK3288

	- "rockchip,rk1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK1108

	- "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036

	- "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368

	- "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399

arch/arm/boot/dts/Makefile

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

	arm-realview-pbx-a9.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rk1108-evb.dtb \

	rk3036-evb.dtb \

	rk3036-kylin.dtb \

	rk3066a-bqcurie2.dtb \

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

0 → 100644
+69 −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 "rk1108.dtsi"



/ {

	model = "Rockchip RK1108 Evaluation board";

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



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x08000000>;

	};



	chosen {

		stdout-path = "serial2:1500000n8";

	};

};



&uart0 {

	status = "okay";

};



&uart1 {

	status = "okay";

};



&uart2 {

	status = "okay";

};

arch/arm/boot/dts/rk1108.dtsi

0 → 100644
+452 −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/clock/rk1108-cru.h>

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

/ {

	#address-cells = <1>;

	#size-cells = <1>;



	compatible = "rockchip,rk1108";



	interrupt-parent = <&gic>;



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@f00 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0xf00>;

		};

	};



	arm-pmu {

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

		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

	};



	timer {

		compatible = "arm,armv7-timer";

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

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;

		clock-frequency = <24000000>;

	};



	xin24m: oscillator {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;

		clock-output-names = "xin24m";

		#clock-cells = <0>;

	};



	amba {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		pdma: pdma@102a0000 {

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

			reg = <0x102a0000 0x4000>;

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

			arm,pl330-broken-no-flushp;

			clocks = <&cru ACLK_DMAC>;

			clock-names = "apb_pclk";

		};

	};



	bus_intmem@10080000 {

		compatible = "mmio-sram";

		reg = <0x10080000 0x2000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x10080000 0x2000>;

	};



	uart2: serial@10210000 {

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

		reg = <0x10210000 0x100>;

		interrupts = <GIC_SPI 46 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 = <&uart2m0_xfer>;

		status = "disabled";

	};



	uart1: serial@10220000 {

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

		reg = <0x10220000 0x100>;

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

	};



	uart0: serial@10230000 {

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

		reg = <0x10230000 0x100>;

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

	};



	grf: syscon@10300000 {

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

		reg = <0x10300000 0x1000>;

	};



	pmugrf: syscon@20060000 {

		compatible = "rockchip,rk1108-pmugrf", "syscon";

		reg = <0x20060000 0x1000>;

	};



	cru: clock-controller@20200000 {

		compatible = "rockchip,rk1108-cru";

		reg = <0x20200000 0x1000>;

		rockchip,grf = <&grf>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	emmc: dwmmc@30110000 {

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

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

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

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

		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;

		reg = <0x30110000 0x4000>;

		status = "disabled";

	};



	sdio: dwmmc@30120000 {

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

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

		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,

			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;

		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

		reg = <0x30120000 0x4000>;

		status = "disabled";

	};



	sdmmc: dwmmc@30130000 {

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

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

		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,

			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;

		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

		reg = <0x30130000 0x4000>;

		status = "disabled";

	};



	gic: interrupt-controller@32010000 {

		compatible = "arm,gic-400";

		interrupt-controller;

		#interrupt-cells = <3>;

		#address-cells = <0>;



		reg = <0x32011000 0x1000>,

		      <0x32012000 0x1000>,

		      <0x32014000 0x2000>,

		      <0x32016000 0x2000>;

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

	};



	pinctrl: pinctrl {

		compatible = "rockchip,rk1108-pinctrl";

		rockchip,grf = <&grf>;

		rockchip,pmu = <&pmugrf>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		gpio0: gpio0@20030000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x20030000 0x100>;

			interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&xin24m>;



			gpio-controller;

			#gpio-cells = <2>;



			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpio1: gpio1@10310000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x10310000 0x100>;

			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&xin24m>;



			gpio-controller;

			#gpio-cells = <2>;



			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpio2: gpio2@10320000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x10320000 0x100>;

			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&xin24m>;



			gpio-controller;

			#gpio-cells = <2>;



			interrupt-controller;

			#interrupt-cells = <2>;

		};



		gpio3: gpio3@10330000 {

			compatible = "rockchip,gpio-bank";

			reg = <0x10330000 0x100>;

			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&xin24m>;



			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;

		};



		pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {

			drive-strength = <8>;

		};



		pcfg_pull_none_drv_12ma: pcfg-pull-none-drv-12ma {

			drive-strength = <12>;

		};



		pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {

			bias-pull-up;

			drive-strength = <8>;

		};



		pcfg_pull_none_drv_4ma: pcfg-pull-none-drv-4ma {

			drive-strength = <4>;

		};



		pcfg_pull_up_drv_4ma: pcfg-pull-up-drv-4ma {

			bias-pull-up;

			drive-strength = <4>;

		};



		pcfg_output_high: pcfg-output-high {

			output-high;

		};



		pcfg_output_low: pcfg-output-low {

			output-low;

		};



		pcfg_input_high: pcfg-input-high {

			bias-pull-up;

			input-enable;

		};



		i2c1 {

			i2c1_xfer: i2c1-xfer {

				rockchip,pins = <2 RK_PD3 RK_FUNC_1 &pcfg_pull_up>,

						<2 RK_PD4 RK_FUNC_1 &pcfg_pull_up>;

			};

		};



		i2c2m1 {

			i2c2m1_xfer: i2c2m1-xfer {

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

						<0 RK_PC6 RK_FUNC_3 &pcfg_pull_none>;

			};



			i2c2m1_gpio: i2c2m1-gpio {

				rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,

						<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;

			};

		};



		i2c2m05v {

			i2c2m05v_xfer: i2c2m05v-xfer {

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

						<1 RK_PD4 RK_FUNC_2 &pcfg_pull_none>;

			};



			i2c2m05v_gpio: i2c2m05v-gpio {

				rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,

						<1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;

			};

		};



		i2c3 {

			i2c3_xfer: i2c3-xfer {

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

						<0 RK_PC4 RK_FUNC_2 &pcfg_pull_none>;

			};

		};



		sdmmc {

			sdmmc_clk: sdmmc-clk {

				rockchip,pins = <3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_drv_4ma>;

			};



			sdmmc_cmd: sdmmc-cmd {

				rockchip,pins = <3 RK_PC5 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;

			};



			sdmmc_cd: sdmmc-cd {

				rockchip,pins = <0 RK_PA1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;

			};



			sdmmc_bus1: sdmmc-bus1 {

				rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;

			};



			sdmmc_bus4: sdmmc-bus4 {

				rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,

						<3 RK_PC2 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,

						<3 RK_PC1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>,

						<3 RK_PC0 RK_FUNC_1 &pcfg_pull_up_drv_4ma>;

			};

		};



		uart0 {

			uart0_xfer: uart0-xfer {

				rockchip,pins = <3 RK_PA6 RK_FUNC_1 &pcfg_pull_up>,

						<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none>;

			};



			uart0_cts: uart0-cts {

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

			};



			uart0_rts: uart0-rts {

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

			};



			uart0_rts_gpio: uart0-rts-gpio {

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

			};

		};



		uart1 {

			uart1_xfer: uart1-xfer {

				rockchip,pins = <1 RK_PD3 RK_FUNC_1 &pcfg_pull_up>,

						<1 RK_PD2 RK_FUNC_1 &pcfg_pull_none>;

			};



			uart1_cts: uart1-cts {

				rockchip,pins = <1 RK_PD0 RK_FUNC_1 &pcfg_pull_none>;

			};



			uart1_rts: uart1-rts {

				rockchip,pins = <1 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		uart2m0 {

			uart2m0_xfer: uart2m0-xfer {

				rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_up>,

						<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;

			};

		};



		uart2m1 {

			uart2m1_xfer: uart2m1-xfer {

				rockchip,pins = <3 RK_PC3 RK_FUNC_2 &pcfg_pull_up>,

						<3 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;

			};

		};



		uart2_5v {

			uart2_5v_cts: uart2_5v-cts {

				rockchip,pins = <1 RK_PD4 RK_FUNC_1 &pcfg_pull_none>;

			};



			uart2_5v_rts: uart2_5v-rts {

				rockchip,pins = <1 RK_PD5 RK_FUNC_1 &pcfg_pull_none>;

			};

		};

	};

};

arch/arm/boot/dts/rk3066a.dtsi

+18 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ 
		clock-names = "saradc", "apb_pclk";

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		#io-channel-cells = <1>;

		resets = <&cru SRST_SARADC>;

		resets = <&cru SRST_TSADC>;

		reset-names = "saradc-apb";

		status = "disabled";

	};
@@ -637,16 +637,25 @@ 


&mmc0 {

	clock-frequency = <50000000>;

	dmas = <&dmac2 1>;

	dma-names = "rx-tx";

	max-frequency = <50000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;

};



&mmc1 {

	dmas = <&dmac2 3>;

	dma-names = "rx-tx";

	pinctrl-names = "default";

	pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;

};



&emmc {

	dmas = <&dmac2 4>;

	dma-names = "rx-tx";

};



&pwm0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_out>;
@@ -678,21 +687,29 @@ 
};



&uart0 {

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

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

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>;

};



&uart1 {

	dmas = <&dmac1_s 2>, <&dmac1_s 3>;

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

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_xfer>;

};



&uart2 {

	dmas = <&dmac2 6>, <&dmac2 7>;

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

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_xfer>;

};



&uart3 {

	dmas = <&dmac2 8>, <&dmac2 9>;

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

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_xfer>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE