[PATCH v1 0/6] Support the rk3036 Kylin board

[PATCH v1 0/6] Support the rk3036 Kylin board

[Caesar Wang]

Kylin-board is based on RK3036 SOCs, add the initiation
version for working.

This series patches have the following decriptions:

PATCH[1/6]:
ARM: dts: fix the correct pinctrl control for rk3036

The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
can't set the status in the internal.
---

PATCH[2/6]:
ARM: dts: add the lcdc and hdmi node for rk3036

Add the devices is related to display.
Based on the series patches of Mark Yao's
---

PATCH[3/6]:
ARM: dts: add the sdio/sdmmc node for rk3036

Add the wifi/sd card work for kylin board.
---

PATCH[4/6]:
ARM: dts: rockchip: add the kylin board for rk3036

Add the dts for kylin board.
---

PATCH[5/6]:
ARM: dts: add the sound codec for kylin board

Make the codec rt5616 working on kylin board.
The realteak have been upstream for Mark Brown,
I guess need some days to review.

---

PATCH[6/6]:
ARM: dts: add the sdio node for kylin board

Enable the sdio for kylin board.
---



Caesar Wang (6):
  ARM: dts: fix the correct pinctrl control for rk3036
  ARM: dts: add the lcdc and hdmi node for rk3036
  ARM: dts: add the sdio/sdmmc node for rk3036
  ARM: dts: rockchip: add the kylin board for rk3036
  ARM: dts: add the sound codec for kylin board
  ARM: dts: add the sdio node for kylin board

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3036-kylin.dts                 | 345 +++++++++++++++++++++
 arch/arm/boot/dts/rk3036.dtsi                      | 167 ++++++++--
 4 files changed, 498 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts

-- 
1.9.1

[PATCH v1 1/6] ARM: dts: fix the correct pinctrl control for rk3036

[Caesar Wang]

The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
can't set the status in the internal.

We should keep the default status for enable the gpio status,
In fact, the pull_none is the disable the gpio pull up/down.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---

 arch/arm/boot/dts/rk3036.dtsi | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index f8758bf..620e6e0 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -427,12 +427,8 @@
 			#interrupt-cells = <2>;
 		};
 
-		pcfg_pull_up: pcfg-pull-up {
-			bias-pull-up;
-		};
-
-		pcfg_pull_down: pcfg-pull-down {
-			bias-pull-down;
+		pcfg_pull_default: pcfg_pull_default {
+			bias-pull-pin-default;
 		};
 
 		pcfg_pull_none: pcfg-pull-none {
@@ -473,18 +469,18 @@
 			};
 
 			emmc_cmd: emmc-cmd {
-				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_default>;
 			};
 
 			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>;
+				rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_default>,
+						<1 25 RK_FUNC_2 &pcfg_pull_default>,
+						<1 26 RK_FUNC_2 &pcfg_pull_default>,
+						<1 27 RK_FUNC_2 &pcfg_pull_default>,
+						<1 28 RK_FUNC_2 &pcfg_pull_default>,
+						<1 29 RK_FUNC_2 &pcfg_pull_default>,
+						<1 30 RK_FUNC_2 &pcfg_pull_default>,
+						<1 31 RK_FUNC_2 &pcfg_pull_default>;
 			};
 		};
 
@@ -522,12 +518,12 @@
 
 		uart0 {
 			uart0_xfer: uart0-xfer {
-				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_up>,
+				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>,
 						<0 17 RK_FUNC_1 &pcfg_pull_none>;
 			};
 
 			uart0_cts: uart0-cts {
-				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_default>;
 			};
 
 			uart0_rts: uart0-rts {
@@ -537,7 +533,7 @@
 
 		uart1 {
 			uart1_xfer: uart1-xfer {
-				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_none>,
+				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_default>,
 						<2 23 RK_FUNC_1 &pcfg_pull_none>;
 			};
 			/* no rts / cts for uart1 */
@@ -545,7 +541,7 @@
 
 		uart2 {
 			uart2_xfer: uart2-xfer {
-				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
+				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_default>,
 						<1 19 RK_FUNC_2 &pcfg_pull_none>;
 			};
 			/* no rts / cts for uart2 */
-- 
1.9.1

[PATCH v1 2/6] ARM: dts: add the lcdc and hdmi node for rk3036

[Caesar Wang]

The rk3036 support two overlay plane and one hwc plane,
it support IOMMU, and its IOMMU same as rk3288's.

Meanwhile, add the inno hdmi for HDMI display.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---

 arch/arm/boot/dts/rk3036.dtsi | 61 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 620e6e0..11a8078 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -145,6 +145,37 @@
 		};
 	};
 
+	lcdc_mmu: iommu@10118300 {
+		compatible = "rockchip,iommu";
+		reg = <0x10118300 0x100>;
+		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "lcdc_mmu";
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	lcdc: lcdc@10118000 {
+		compatible = "rockchip,rk3036-lcdc";
+		reg = <0x10118000 0x19c>;
+		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru HCLK_LCDC>;
+		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		resets = <&cru SRST_LCDC1_A>, <&cru SRST_LCDC1_H>, <&cru SRST_LCDC1_D>;
+		reset-names = "axi", "ahb", "dclk";
+		iommus = <&lcdc_mmu>;
+
+		status = "disabled";
+
+		lcdc_out: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			lcdc_out_hdmi: endpoint@0 {
+				reg = <1>;
+				remote-endpoint = <&hdmi_in_lcdc>;
+			};
+		};
+	};
+
 	gic: interrupt-controller@10139000 {
 		compatible = "arm,gic-400";
 		interrupt-controller;
@@ -248,6 +279,27 @@
 		status = "disabled";
 	};
 
+	hdmi: hdmi@20034000 {
+		compatible = "rockchip,rk3036-inno-hdmi";
+		reg = <0x20034000 0x4000>;
+		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru  PCLK_HDMI>;
+		clock-names = "pclk";
+		rockchip,grf = <&grf>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hdmi_ctl>;
+		status = "disabled";
+
+		hdmi_in: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			hdmi_in_lcdc: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&lcdc_out_hdmi>;
+			};
+		};
+	};
+
 	timer: timer@20044000 {
 		compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer";
 		reg = <0x20044000 0x20>;
@@ -484,6 +536,15 @@
 			};
 		};
 
+		hdmi {
+			hdmi_ctl: hdmi-ctl {
+				rockchip,pins = <1 8  RK_FUNC_1 &pcfg_pull_none>,
+						<1 9  RK_FUNC_1 &pcfg_pull_none>,
+						<1 10 RK_FUNC_1 &pcfg_pull_none>,
+						<1 11 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
 		i2c0 {
 			i2c0_xfer: i2c0-xfer {
 				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,
-- 
1.9.1

[PATCH v1 3/6] ARM: dts: add the sdio/sdmmc node for rk3036

[Caesar Wang]

In general, the sdio/sdmmc is used by the wifi module
and sd card.

let's add the node for these function.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---

 arch/arm/boot/dts/rk3036.dtsi | 72 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 11a8078..947d070 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -55,6 +55,8 @@
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		mshc0 = &emmc;
+		mshc1 = &sdmmc;
+		mshc2 = &sdio;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
@@ -215,6 +217,30 @@
 		status = "disabled";
 	};
 
+	sdmmc: dwmmc@10214000 {
+		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
+		clock-frequency = <37500000>;
+		clock-freq-min-max = <400000 37500000>;
+		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
+		clock-names = "biu", "ciu";
+		fifo-depth = <0x100>;
+		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+		reg = <0x10214000 0x4000>;
+		status = "disabled";
+	};
+
+	sdio: dwmmc@10218000 {
+		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
+		clock-freq-min-max = <400000 37500000>;
+		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
+			<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
+		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		fifo-depth = <0x100>;
+		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+		reg = <0x10218000 0x4000>;
+		status = "disabled";
+	};
+
 	emmc: dwmmc@1021c000 {
 		compatible = "rockchip,rk3288-dw-mshc";
 		reg = <0x1021c000 0x4000>;
@@ -511,6 +537,52 @@
 			};
 		};
 
+		sdmmc {
+			sdmmc_clk: sdmmc-clk {
+				rockchip,pins = <1 16 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sdmmc_cmd: sdmmc-cmd {
+				rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_default>;
+			};
+
+			sdmmc_cd: sdmcc-cd {
+				rockchip,pins = <1 17 RK_FUNC_1 &pcfg_pull_default>;
+			};
+
+			sdmmc_bus1: sdmmc-bus1 {
+				rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_default>;
+			};
+
+			sdmmc_bus4: sdmmc-bus4 {
+				rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_default>,
+						<1 19 RK_FUNC_1 &pcfg_pull_default>,
+						<1 20 RK_FUNC_1 &pcfg_pull_default>,
+						<1 21 RK_FUNC_1 &pcfg_pull_default>;
+			};
+		};
+
+		sdio {
+			sdio_bus1: sdio-bus1 {
+				rockchip,pins = <0 11 RK_FUNC_1 &pcfg_pull_default>;
+			};
+
+			sdio_bus4: sdio-bus4 {
+				rockchip,pins = <0 11 RK_FUNC_1 &pcfg_pull_default>,
+						<0 12 RK_FUNC_1 &pcfg_pull_default>,
+						<0 13 RK_FUNC_1 &pcfg_pull_default>,
+						<0 14 RK_FUNC_1 &pcfg_pull_default>;
+			};
+
+			sdio_cmd: sdio-cmd {
+				rockchip,pins = <0 8 RK_FUNC_1 &pcfg_pull_default>;
+			};
+
+			sdio_clk: sdio-clk {
+				rockchip,pins = <0 9 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
 		emmc {
 			/*
 			 * We run eMMC at max speed; bump up drive strength.
-- 
1.9.1

[PATCH v1 4/6] ARM: dts: rockchip: add the kylin board for rk3036

[Caesar Wang]

This patchset is the initiation version to try work
for kylin board.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3036-kylin.dts                 | 298 +++++++++++++++++++++
 3 files changed, 303 insertions(+)
 create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts

diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index c40c091..56653c4 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -1,6 +1,10 @@
 Rockchip platforms device tree bindings
 ---------------------------------------
 
+- Kylin RK3036 board:
+    Required root node properties:
+      - compatible = "rockchip,kylin-rk3036", "rockchip,rk3036";
+
 - MarsBoard RK3066 board:
     Required root node properties:
       - compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5e284dd..b911601 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -513,6 +513,7 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \
 	arm-realview-pb1176.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3036-evb.dtb \
+	rk3036-kylin.dtb \
 	rk3066a-bqcurie2.dtb \
 	rk3066a-marsboard.dtb \
 	rk3066a-rayeager.dtb \
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
new file mode 100644
index 0000000..69b1e1e
--- /dev/null
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -0,0 +1,298 @@
+/*
+ * 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 KylinBoard";
+	compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
+
+	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;
+	};
+};
+
+&acodec {
+	status = "okay";
+};
+
+&emmc {
+	status = "okay";
+};
+
+&hdmi {
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <400000>;
+
+	status = "okay";
+
+	rk808: pmic@1b {
+		compatible = "rockchip,rk808";
+		reg = <0x1b>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int &global_pwroff>;
+		rockchip,system-power-controller;
+		wakeup-source;
+		#clock-cells = <1>;
+		clock-output-names = "xin32k", "rk808-clkout2";
+
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc6-supply = <&vcc_sys>;
+		vcc7-supply = <&vcc_sys>;
+		vcc8-supply = <&vcc_18>;
+		vcc9-supply = <&vcc_io>;
+		vcc10-supply = <&vcc_io>;
+		vcc11-supply = <&vcc_sys>;
+		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 = <1350000>;
+				regulator-name = "vdd_arm";
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_gpu: DCDC_REG2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <1250000>;
+				regulator-name = "vdd_gpu";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vcc_ddr";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_io: DCDC_REG4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc_io";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vccio_pmu: LDO_REG1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vccio_pmu";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcc_tp: LDO_REG2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc_tp";
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_10: LDO_REG3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-name = "vdd_10";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vcc18_lcd: LDO_REG4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc18_lcd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vccio_sd: LDO_REG5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vccio_sd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vout5: LDO_REG6 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <2500000>;
+				regulator-name = "vout5";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc_18: LDO_REG7 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_18";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcca_codec: LDO_REG8 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcca_codec";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc_wl: SWITCH_REG1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vcc_wl";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_lcd: SWITCH_REG2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vcc_lcd";
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+		};
+	};
+};
+
+&i2c2 {
+	status = "okay";
+};
+
+&lcdc {
+	status = "okay";
+};
+
+&lcdc_mmu {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
+
+&usb_host {
+	status = "okay";
+};
+
+&usb_otg {
+	status = "okay";
+};
+
+&pinctrl {
+	pmic {
+		pmic_int: pmic-int {
+			rockchip,pins = <2 2 RK_FUNC_GPIO &pcfg_pull_default>;
+		};
+	};
+
+	sleep {
+		global_pwroff: global-pwroff {
+			rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>;
+		};
+	};
+};
-- 
1.9.1

[PATCH v1 5/6] ARM: dts: add the sound codec for kylin board

[Caesar Wang]

Support the rt5616 codec for kylin board, but we need
enable the i2s firstly.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---

 arch/arm/boot/dts/rk3036-kylin.dts | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 69b1e1e..296139b 100644
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -46,6 +46,28 @@
 	model = "Rockchip RK3036 KylinBoard";
 	compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
 
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "rockchip,rt5616-codec";
+		simple-audio-card,mclk-fs = <64>;
+		simple-audio-card,widgets =
+			"Microphone", "Microphone Jack",
+			"Headphone", "Headphone Jack";
+		simple-audio-card,routing =
+			"MIC1", "Microphone Jack",
+			"MIC2", "Microphone Jack",
+			"Microphone Jack", "micbias1",
+			"Headphone Jack", "HPOL",
+			"Headphone Jack", "HPOR";
+		simple-audio-card,cpu {
+			sound-dai = <&i2s>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&rt5616>;
+		};
+	};
+
 	vcc_sys: vsys-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_sys";
@@ -261,6 +283,17 @@
 
 &i2c2 {
 	status = "okay";
+
+	rt5616: rt5616@1b {
+		#sound-dai-cells = <0>;
+		compatible = "rt5616";
+		reg = <0x1b>;
+	};
+};
+
+&i2s {
+	#sound-dai-cells = <0>;
+	status = "okay";
 };
 
 &lcdc {
-- 
1.9.1

[PATCH v1 6/6] ARM: dts: add the sdio node for kylin board

[Caesar Wang]

Let's enable the sdio for wifi module on kylin board.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>

---

 arch/arm/boot/dts/rk3036-kylin.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 296139b..581e954 100644
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -304,6 +304,20 @@
 	status = "okay";
 };
 
+&sdio {
+	status = "okay";
+
+	broken-cd;
+	bus-width = <4>;
+	cap-sdio-irq;
+	keep-power-in-suspend;
+	non-removable;
+	num-slots = <1>;
+	default-sample-phase = <90>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;
+};
+
 &uart2 {
 	status = "okay";
 };
-- 
1.9.1

Re: [PATCH v1 1/6] ARM: dts: fix the correct pinctrl control for rk3036

[Heiko Stübner]

Am Donnerstag, 17. Dezember 2015, 22:21:47 schrieb Caesar Wang:
> The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
> can't set the status in the internal.
> 
> We should keep the default status for enable the gpio status,
> In fact, the pull_none is the disable the gpio pull up/down.
> 
> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
> Signed-off-by: Caesar Wang <wxt@rock-chips.com>

>From the signed-off-by's I guess this change was created by Xing (author), 
right?


Heiko

> ---
> 
>  arch/arm/boot/dts/rk3036.dtsi | 34 +++++++++++++++-------------------
>  1 file changed, 15 insertions(+), 19 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
> index f8758bf..620e6e0 100644
> --- a/arch/arm/boot/dts/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rk3036.dtsi
> @@ -427,12 +427,8 @@
>  			#interrupt-cells = <2>;
>  		};
> 
> -		pcfg_pull_up: pcfg-pull-up {
> -			bias-pull-up;
> -		};
> -
> -		pcfg_pull_down: pcfg-pull-down {
> -			bias-pull-down;
> +		pcfg_pull_default: pcfg_pull_default {
> +			bias-pull-pin-default;
>  		};
> 
>  		pcfg_pull_none: pcfg-pull-none {
> @@ -473,18 +469,18 @@
>  			};
> 
>  			emmc_cmd: emmc-cmd {
> -				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_none>;
> +				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_default>;
>  			};
> 
>  			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>;
> +				rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 25 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 26 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 27 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 28 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 29 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 30 RK_FUNC_2 &pcfg_pull_default>,
> +						<1 31 RK_FUNC_2 &pcfg_pull_default>;
>  			};
>  		};
> 
> @@ -522,12 +518,12 @@
> 
>  		uart0 {
>  			uart0_xfer: uart0-xfer {
> -				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_up>,
> +				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>,
>  						<0 17 RK_FUNC_1 &pcfg_pull_none>;
>  			};
> 
>  			uart0_cts: uart0-cts {
> -				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_up>;
> +				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_default>;
>  			};
> 
>  			uart0_rts: uart0-rts {
> @@ -537,7 +533,7 @@
> 
>  		uart1 {
>  			uart1_xfer: uart1-xfer {
> -				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_none>,
> +				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_default>,
>  						<2 23 RK_FUNC_1 &pcfg_pull_none>;
>  			};
>  			/* no rts / cts for uart1 */
> @@ -545,7 +541,7 @@
> 
>  		uart2 {
>  			uart2_xfer: uart2-xfer {
> -				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
> +				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_default>,
>  						<1 19 RK_FUNC_2 &pcfg_pull_none>;
>  			};
>  			/* no rts / cts for uart2 */

Re: [PATCH v1 5/6] ARM: dts: add the sound codec for kylin board

[Heiko Stübner]

Am Donnerstag, 17. Dezember 2015, 22:21:51 schrieb Caesar Wang:
> Support the rt5616 codec for kylin board, but we need
> enable the i2s firstly.
> 
> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
> ---
> 
>  arch/arm/boot/dts/rk3036-kylin.dts | 33 +++++++++++++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/rk3036-kylin.dts
> b/arch/arm/boot/dts/rk3036-kylin.dts index 69b1e1e..296139b 100644
> --- a/arch/arm/boot/dts/rk3036-kylin.dts
> +++ b/arch/arm/boot/dts/rk3036-kylin.dts
> @@ -46,6 +46,28 @@
>  	model = "Rockchip RK3036 KylinBoard";
>  	compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
> 
> +	sound {
> +		compatible = "simple-audio-card";
> +		simple-audio-card,format = "i2s";
> +		simple-audio-card,name = "rockchip,rt5616-codec";
> +		simple-audio-card,mclk-fs = <64>;
> +		simple-audio-card,widgets =
> +			"Microphone", "Microphone Jack",
> +			"Headphone", "Headphone Jack";
> +		simple-audio-card,routing =
> +			"MIC1", "Microphone Jack",
> +			"MIC2", "Microphone Jack",
> +			"Microphone Jack", "micbias1",
> +			"Headphone Jack", "HPOL",
> +			"Headphone Jack", "HPOR";
> +		simple-audio-card,cpu {
> +			sound-dai = <&i2s>;
> +		};
> +		simple-audio-card,codec {
> +			sound-dai = <&rt5616>;
> +		};
> +	};
> +
>  	vcc_sys: vsys-regulator {
>  		compatible = "regulator-fixed";
>  		regulator-name = "vcc_sys";
> @@ -261,6 +283,17 @@
> 
>  &i2c2 {
>  	status = "okay";
> +
> +	rt5616: rt5616@1b {
> +		#sound-dai-cells = <0>;
> +		compatible = "rt5616";
> +		reg = <0x1b>;
> +	};

I don't see that codec in the asoc-tree [0]. And the compatible
would of course also need to be "realtek,rt5616".


[0] https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/tree/sound/soc/codecs?h=for-next


> +};
> +
> +&i2s {
> +	#sound-dai-cells = <0>;
> +	status = "okay";
>  };
> 
>  &lcdc {

Re: [PATCH v1 0/6] Support the rk3036 Kylin board

[Heiko Stübner]

Hi Caesar, Kees,

Am Donnerstag, 17. Dezember 2015, 11:45:06 schrieb Kees Cook:
> On Thu, Dec 17, 2015 at 6:21 AM, Caesar Wang <wxt@rock-chips.com> wrote:
> > Kylin-board is based on RK3036 SOCs, add the initiation
> > version for working.
> > 
> > This series patches have the following decriptions:
> > 
> > PATCH[1/6]:
> > ARM: dts: fix the correct pinctrl control for rk3036
> > 
> > The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
> > can't set the status in the internal.
> > ---
> > 
> > PATCH[2/6]:
> > ARM: dts: add the lcdc and hdmi node for rk3036
> > 
> > Add the devices is related to display.
> > Based on the series patches of Mark Yao's
> > ---
> > 
> > PATCH[3/6]:
> > ARM: dts: add the sdio/sdmmc node for rk3036
> > 
> > Add the wifi/sd card work for kylin board.
> > ---
> > 
> > PATCH[4/6]:
> > ARM: dts: rockchip: add the kylin board for rk3036
> > 
> > Add the dts for kylin board.
> > ---
> > 
> > PATCH[5/6]:
> > ARM: dts: add the sound codec for kylin board
> > 
> > Make the codec rt5616 working on kylin board.
> > The realteak have been upstream for Mark Brown,
> > I guess need some days to review.
> > 
> > ---
> > 
> > PATCH[6/6]:
> > ARM: dts: add the sdio node for kylin board
> > 
> > Enable the sdio for kylin board.
> > ---
> 
> Thanks for sending this!
> 
> Reviewed-by: Kees Cook <keescook@chromium.org>
> 
> Some thoughts: maybe collapse 4, 5, and 6 together, since it's a new file?

@Caesar, no need to resend, I can do that merging myself.
After we clarified the authorship of patch1 ;-) .

Except the audio patch, as we're missing the realtek codec driver.
I'll also drop the lcdc+hdmi parts for now, as the relevant parts aren't in
any maintainer-tree yet. The ordering is for this:

- atomic conversion
- rk3036 vop
- inno-hdmi driver
- dts changes last

The driver for the Innosilicon hdmi driver is from November, had one comment 
from me and Caesar+ Yakir should make sure it works with the atomic 
modesetting variant of the drm/kms driver please. (And probably resend the 
series fixing that one tiny comment).


Heiko

Re: [PATCH v1 1/6] ARM: dts: fix the correct pinctrl control for rk3036

[Caesar Wang]

Heiko,

在 2015年12月18日 07:28, Heiko Stübner 写道:
> Am Donnerstag, 17. Dezember 2015, 22:21:47 schrieb Caesar Wang:
>> The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
>> can't set the status in the internal.
>>
>> We should keep the default status for enable the gpio status,
>> In fact, the pull_none is the disable the gpio pull up/down.
>>
>> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
>> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
>  From the signed-off-by's I guess this change was created by Xing (author),
> right?

The original patch:

-		pcfg_pull_up: pcfg-pull-up {
-			bias-pull-up;
-		};
-
-		pcfg_pull_down: pcfg-pull-down {
-			bias-pull-down;
+		pcfg_pull_default: pcfg_pull_default {
+			bias-pull-pin-default;

I'm re-writing the patch to fit the others.

Yep, the seem should change commit author as the

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>



>
> Heiko
>
>> ---
>>
>>   arch/arm/boot/dts/rk3036.dtsi | 34 +++++++++++++++-------------------
>>   1 file changed, 15 insertions(+), 19 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
>> index f8758bf..620e6e0 100644
>> --- a/arch/arm/boot/dts/rk3036.dtsi
>> +++ b/arch/arm/boot/dts/rk3036.dtsi
>> @@ -427,12 +427,8 @@
>>   			#interrupt-cells = <2>;
>>   		};
>>
>> -		pcfg_pull_up: pcfg-pull-up {
>> -			bias-pull-up;
>> -		};
>> -
>> -		pcfg_pull_down: pcfg-pull-down {
>> -			bias-pull-down;
>> +		pcfg_pull_default: pcfg_pull_default {
>> +			bias-pull-pin-default;
>>   		};
>>
>>   		pcfg_pull_none: pcfg-pull-none {
>> @@ -473,18 +469,18 @@
>>   			};
>>
>>   			emmc_cmd: emmc-cmd {
>> -				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_none>;
>> +				rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_default>;
>>   			};
>>
>>   			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>;
>> +				rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 25 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 26 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 27 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 28 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 29 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 30 RK_FUNC_2 &pcfg_pull_default>,
>> +						<1 31 RK_FUNC_2 &pcfg_pull_default>;
>>   			};
>>   		};
>>
>> @@ -522,12 +518,12 @@
>>
>>   		uart0 {
>>   			uart0_xfer: uart0-xfer {
>> -				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_up>,
>> +				rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>,
>>   						<0 17 RK_FUNC_1 &pcfg_pull_none>;
>>   			};
>>
>>   			uart0_cts: uart0-cts {
>> -				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_up>;
>> +				rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_default>;
>>   			};
>>
>>   			uart0_rts: uart0-rts {
>> @@ -537,7 +533,7 @@
>>
>>   		uart1 {
>>   			uart1_xfer: uart1-xfer {
>> -				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_none>,
>> +				rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_default>,
>>   						<2 23 RK_FUNC_1 &pcfg_pull_none>;
>>   			};
>>   			/* no rts / cts for uart1 */
>> @@ -545,7 +541,7 @@
>>
>>   		uart2 {
>>   			uart2_xfer: uart2-xfer {
>> -				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
>> +				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_default>,
>>   						<1 19 RK_FUNC_2 &pcfg_pull_none>;
>>   			};
>>   			/* no rts / cts for uart2 */
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip


-- 
caesar wang | software engineer | wxt@rock-chip.com

Re: [PATCH v1 4/6] ARM: dts: rockchip: add the kylin board for rk3036

[Rob Herring]

On Thu, Dec 17, 2015 at 10:21:50PM +0800, Caesar Wang wrote:
> This patchset is the initiation version to try work
> for kylin board.
> 
> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
> ---
> 
>  Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
>  arch/arm/boot/dts/Makefile                         |   1 +
>  arch/arm/boot/dts/rk3036-kylin.dts                 | 298 +++++++++++++++++++++
>  3 files changed, 303 insertions(+)
>  create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH v1 0/6] Support the rk3036 Kylin board

[Heiko Stübner]

Hi Caesar,

Am Donnerstag, 17. Dezember 2015, 22:21:46 schrieb Caesar Wang:
> Kylin-board is based on RK3036 SOCs, add the initiation
> version for working.

I've applied:
- patch1 (please include the "rockchip:" part in dts subjects)
- patch3 (dito)
- patch4 (after merging in patch6 and dropping the hdmi+lcdc parts)

Please resubmit the missing parts (audio + graphics) against my dts-branch [0]
after the relevant maintainers have added the code-parts to their trees.


Thanks
Heiko

[0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/log/?h=v4.5-armsoc/dts32

> 
> This series patches have the following decriptions:
> 
> PATCH[1/6]:
> ARM: dts: fix the correct pinctrl control for rk3036
> 
> The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
> can't set the status in the internal.
> ---
> 
> PATCH[2/6]:
> ARM: dts: add the lcdc and hdmi node for rk3036
> 
> Add the devices is related to display.
> Based on the series patches of Mark Yao's
> ---
> 
> PATCH[3/6]:
> ARM: dts: add the sdio/sdmmc node for rk3036
> 
> Add the wifi/sd card work for kylin board.
> ---
> 
> PATCH[4/6]:
> ARM: dts: rockchip: add the kylin board for rk3036
> 
> Add the dts for kylin board.
> ---
> 
> PATCH[5/6]:
> ARM: dts: add the sound codec for kylin board
> 
> Make the codec rt5616 working on kylin board.
> The realteak have been upstream for Mark Brown,
> I guess need some days to review.
> 
> ---
> 
> PATCH[6/6]:
> ARM: dts: add the sdio node for kylin board
> 
> Enable the sdio for kylin board.
> ---
> 
> 
> 
> Caesar Wang (6):
>   ARM: dts: fix the correct pinctrl control for rk3036
>   ARM: dts: add the lcdc and hdmi node for rk3036
>   ARM: dts: add the sdio/sdmmc node for rk3036
>   ARM: dts: rockchip: add the kylin board for rk3036
>   ARM: dts: add the sound codec for kylin board
>   ARM: dts: add the sdio node for kylin board
> 
>  Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
>  arch/arm/boot/dts/Makefile                         |   1 +
>  arch/arm/boot/dts/rk3036-kylin.dts                 | 345
> +++++++++++++++++++++ arch/arm/boot/dts/rk3036.dtsi                      |
> 167 ++++++++-- 4 files changed, 498 insertions(+), 19 deletions(-)
>  create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts

Re: [PATCH v1 0/6] Support the rk3036 Kylin board

[Caesar Wang]

Hi Heiko,

在 2015年12月20日 01:16, Heiko Stübner 写道:
> Hi Caesar,
>
> Am Donnerstag, 17. Dezember 2015, 22:21:46 schrieb Caesar Wang:
>> Kylin-board is based on RK3036 SOCs, add the initiation
>> version for working.
> I've applied:
> - patch1 (please include the "rockchip:" part in dts subjects)
> - patch3 (dito)
> - patch4 (after merging in patch6 and dropping the hdmi+lcdc parts)

Okay, thanks!

Sync to the rockchip github 
<https://github.com/rockchip-linux/kernel/commits/develop4.4>.

> Please resubmit the missing parts (audio + graphics) against my dts-branch [0]
> after the relevant maintainers have added the code-parts to their trees.

For codec:
RT5616 is existing  in
https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/log/?h=for-next 
now.

For 3036 vop:
I would like wait a moment from Mark Yao updating the driver.


>
> Thanks
> Heiko
>
> [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/log/?h=v4.5-armsoc/dts32
>
>> This series patches have the following decriptions:
>>
>> PATCH[1/6]:
>> ARM: dts: fix the correct pinctrl control for rk3036
>>
>> The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
>> can't set the status in the internal.
>> ---
>>
>> PATCH[2/6]:
>> ARM: dts: add the lcdc and hdmi node for rk3036
>>
>> Add the devices is related to display.
>> Based on the series patches of Mark Yao's
>> ---
>>
>> PATCH[3/6]:
>> ARM: dts: add the sdio/sdmmc node for rk3036
>>
>> Add the wifi/sd card work for kylin board.
>> ---
>>
>> PATCH[4/6]:
>> ARM: dts: rockchip: add the kylin board for rk3036
>>
>> Add the dts for kylin board.
>> ---
>>
>> PATCH[5/6]:
>> ARM: dts: add the sound codec for kylin board
>>
>> Make the codec rt5616 working on kylin board.
>> The realteak have been upstream for Mark Brown,
>> I guess need some days to review.
>>
>> ---
>>
>> PATCH[6/6]:
>> ARM: dts: add the sdio node for kylin board
>>
>> Enable the sdio for kylin board.
>> ---
>>
>>
>>
>> Caesar Wang (6):
>>    ARM: dts: fix the correct pinctrl control for rk3036
>>    ARM: dts: add the lcdc and hdmi node for rk3036
>>    ARM: dts: add the sdio/sdmmc node for rk3036
>>    ARM: dts: rockchip: add the kylin board for rk3036
>>    ARM: dts: add the sound codec for kylin board
>>    ARM: dts: add the sdio node for kylin board
>>
>>   Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
>>   arch/arm/boot/dts/Makefile                         |   1 +
>>   arch/arm/boot/dts/rk3036-kylin.dts                 | 345
>> +++++++++++++++++++++ arch/arm/boot/dts/rk3036.dtsi                      |
>> 167 ++++++++-- 4 files changed, 498 insertions(+), 19 deletions(-)
>>   create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [PATCH v1 0/6] Support the rk3036 Kylin board

[Heiko Stübner]

Hi Caesar,

Am Sonntag, 20. Dezember 2015, 20:49:14 schrieb Caesar Wang:
> Hi Heiko,
> 
> 在 2015年12月20日 01:16, Heiko Stübner 写道:
> > Hi Caesar,
> > 
> > Am Donnerstag, 17. Dezember 2015, 22:21:46 schrieb Caesar Wang:
> >> Kylin-board is based on RK3036 SOCs, add the initiation
> >> version for working.
> > 
> > I've applied:
> > - patch1 (please include the "rockchip:" part in dts subjects)
> > - patch3 (dito)
> > - patch4 (after merging in patch6 and dropping the hdmi+lcdc parts)
> 
> Okay, thanks!
> 
> Sync to the rockchip github
> <https://github.com/rockchip-linux/kernel/commits/develop4.4>.
> 
> > Please resubmit the missing parts (audio + graphics) against my dts-branch
> > [0] after the relevant maintainers have added the code-parts to their
> > trees.
> For codec:
> RT5616 is existing  in
> https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/log/?h=for-ne
> xt now.

that seems to be missing the devicetree-parts. I think you can just send a 
patch to Mark adding
- of_device_id match table
- of_match_table assignment
- binding-documentation (it seems to have only compatible and reg propeties)


Heiko

> For 3036 vop:
> I would like wait a moment from Mark Yao updating the driver.
> 
> > Thanks
> > Heiko
> > 
> > [0]
> > https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/log
> > /?h=v4.5-armsoc/dts32> 
> >> This series patches have the following decriptions:
> >> 
> >> PATCH[1/6]:
> >> ARM: dts: fix the correct pinctrl control for rk3036
> >> 
> >> The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs
> >> can't set the status in the internal.
> >> ---
> >> 
> >> PATCH[2/6]:
> >> ARM: dts: add the lcdc and hdmi node for rk3036
> >> 
> >> Add the devices is related to display.
> >> Based on the series patches of Mark Yao's
> >> ---
> >> 
> >> PATCH[3/6]:
> >> ARM: dts: add the sdio/sdmmc node for rk3036
> >> 
> >> Add the wifi/sd card work for kylin board.
> >> ---
> >> 
> >> PATCH[4/6]:
> >> ARM: dts: rockchip: add the kylin board for rk3036
> >> 
> >> Add the dts for kylin board.
> >> ---
> >> 
> >> PATCH[5/6]:
> >> ARM: dts: add the sound codec for kylin board
> >> 
> >> Make the codec rt5616 working on kylin board.
> >> The realteak have been upstream for Mark Brown,
> >> I guess need some days to review.
> >> 
> >> ---
> >> 
> >> PATCH[6/6]:
> >> ARM: dts: add the sdio node for kylin board
> >> 
> >> Enable the sdio for kylin board.
> >> ---
> >> 
> >> Caesar Wang (6):
> >>    ARM: dts: fix the correct pinctrl control for rk3036
> >>    ARM: dts: add the lcdc and hdmi node for rk3036
> >>    ARM: dts: add the sdio/sdmmc node for rk3036
> >>    ARM: dts: rockchip: add the kylin board for rk3036
> >>    ARM: dts: add the sound codec for kylin board
> >>    ARM: dts: add the sdio node for kylin board
> >>   
> >>   Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
> >>   arch/arm/boot/dts/Makefile                         |   1 +
> >>   arch/arm/boot/dts/rk3036-kylin.dts                 | 345
> >> 
> >> +++++++++++++++++++++ arch/arm/boot/dts/rk3036.dtsi                     
> >> |
> >> 167 ++++++++-- 4 files changed, 498 insertions(+), 19 deletions(-)
> >> 
> >>   create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts
> > 
> > _______________________________________________
> > Linux-rockchip mailing list
> > Linux-rockchip@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-rockchip