* [PATCH 2/3] ARM: dts: rockchip: Add HDMI out for RockPI N8/N10
2020-07-20 11:02 [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10 Jagan Teki
@ 2020-07-20 11:02 ` Jagan Teki
2020-07-20 11:02 ` [PATCH 3/3] arm64: dts: rockchip: Add PCIe for RockPI N10 Jagan Teki
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Jagan Teki @ 2020-07-20 11:02 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: Suniel Mahesh, Michael Trimarchi, linux-arm-kernel,
linux-rockchip, devicetree, linux-kernel, linux-amarula,
Jagan Teki
This patch adds support to enable HDMI out for
N10 and N8 combinations SBCs.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
---
arch/arm/boot/dts/rk3288-vmarc-som.dtsi | 10 ++++++++++
.../dts/rockchip-radxa-dalang-carrier.dtsi | 20 +++++++++++++++++++
.../dts/rockchip/rk3399pro-vmarc-som.dtsi | 12 +++++++++++
3 files changed, 42 insertions(+)
diff --git a/arch/arm/boot/dts/rk3288-vmarc-som.dtsi b/arch/arm/boot/dts/rk3288-vmarc-som.dtsi
index abe3c01d13aa..ba2732ec72da 100644
--- a/arch/arm/boot/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-vmarc-som.dtsi
@@ -38,6 +38,12 @@ &gmac {
snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
};
+&hdmi {
+ ddc-i2c-bus = <&i2c5>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_cec_c0>;
+};
+
&i2c0 {
clock-frequency = <400000>;
status = "okay";
@@ -225,6 +231,10 @@ regulator-state-mem {
};
};
+&i2c5 {
+ status = "okay";
+};
+
&io_domains {
bb-supply = <&vcc_io>;
flash0-supply = <&vccio_flash>;
diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
index d2b6ead148a2..26b53eac4706 100644
--- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -66,6 +66,10 @@ &gmac {
status = "okay";
};
+&hdmi {
+ status = "okay";
+};
+
&pwm0 {
status = "okay";
};
@@ -94,3 +98,19 @@ &uart0 {
&uart2 {
status = "okay";
};
+
+&vopb {
+ status = "okay";
+};
+
+&vopb_mmu {
+ status = "okay";
+};
+
+&vopl {
+ status = "okay";
+};
+
+&vopl_mmu {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index 111d6cf9a4e6..ebccc4a153a2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -39,6 +39,12 @@ &gmac {
snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
};
+&hdmi {
+ ddc-i2c-bus = <&i2c3>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_cec>;
+};
+
&i2c0 {
clock-frequency = <400000>;
i2c-scl-falling-time-ns = <30>;
@@ -285,6 +291,12 @@ hym8563: hym8563@51 {
};
};
+&i2c3 {
+ i2c-scl-rising-time-ns = <450>;
+ i2c-scl-falling-time-ns = <15>;
+ status = "okay";
+};
+
&io_domains {
status = "okay";
bt656-supply = <&vcca_1v8>;
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] arm64: dts: rockchip: Add PCIe for RockPI N10
2020-07-20 11:02 [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10 Jagan Teki
2020-07-20 11:02 ` [PATCH 2/3] ARM: dts: rockchip: Add HDMI out " Jagan Teki
@ 2020-07-20 11:02 ` Jagan Teki
2020-07-22 18:51 ` Jagan Teki
2020-07-21 8:15 ` [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10 kernel test robot
2020-07-22 19:21 ` Heiko Stuebner
3 siblings, 1 reply; 7+ messages in thread
From: Jagan Teki @ 2020-07-20 11:02 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: Suniel Mahesh, Michael Trimarchi, linux-arm-kernel,
linux-rockchip, devicetree, linux-kernel, linux-amarula,
Jagan Teki
This patch adds support to enable PCIe for RockPI N10.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
.../dts/rockchip/rk3399pro-vmarc-som.dtsi | 41 ++++++++++++++++++-
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index ebccc4a153a2..b415b8a16c78 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -11,6 +11,19 @@
/ {
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
+
+
+ vcc3v3_pcie: vcc-pcie-regulator {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie_pwr>;
+ regulator-name = "vcc3v3_pcie";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc5v0_sys>;
+ };
};
&cpu_l0 {
@@ -142,7 +155,8 @@ vcca_0v9: LDO_REG1 {
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <900000>;
};
};
@@ -177,7 +191,8 @@ vcca_1v8: LDO_REG4 {
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <1850000>;
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1850000>;
};
};
@@ -304,6 +319,22 @@ &io_domains {
sdmmc-supply = <&vccio_sd>;
};
+&pcie_phy {
+ status = "okay";
+};
+
+&pcie0 {
+ ep-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
+ max-link-speed = <2>;
+ num-lanes = <4>;
+ pinctrl-0 = <&pcie_clkreqnb_cpm>;
+ pinctrl-names = "default";
+ vpcie0v9-supply = <&vcca_0v9>; /* VCC_0V9_S0 */
+ vpcie1v8-supply = <&vcca_1v8>; /* VCC_1V8_S0 */
+ vpcie3v3-supply = <&vcc3v3_pcie>;
+ status = "okay";
+};
+
&pinctrl {
hym8563 {
hym8563_int: hym8563-int {
@@ -311,6 +342,12 @@ hym8563_int: hym8563-int {
};
};
+ pcie {
+ pcie_pwr: pcie-pwr {
+ rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] arm64: dts: rockchip: Add PCIe for RockPI N10
2020-07-20 11:02 ` [PATCH 3/3] arm64: dts: rockchip: Add PCIe for RockPI N10 Jagan Teki
@ 2020-07-22 18:51 ` Jagan Teki
2020-07-22 19:21 ` Heiko Stuebner
0 siblings, 1 reply; 7+ messages in thread
From: Jagan Teki @ 2020-07-22 18:51 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring
Cc: Suniel Mahesh, Michael Trimarchi, linux-arm-kernel,
open list:ARM/Rockchip SoC...,
devicetree, linux-kernel, linux-amarula
Hi Heiko,
On Mon, Jul 20, 2020 at 4:33 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> This patch adds support to enable PCIe for RockPI N10.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 41 ++++++++++++++++++-
> 1 file changed, 39 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
> index ebccc4a153a2..b415b8a16c78 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
> @@ -11,6 +11,19 @@
>
> / {
> compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
> +
> +
Sorry for this extra space, let me know so that I can resend next version.
Jagan.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] arm64: dts: rockchip: Add PCIe for RockPI N10
2020-07-22 18:51 ` Jagan Teki
@ 2020-07-22 19:21 ` Heiko Stuebner
0 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2020-07-22 19:21 UTC (permalink / raw)
To: Jagan Teki
Cc: Rob Herring, Suniel Mahesh, Michael Trimarchi, linux-arm-kernel,
open list:ARM/Rockchip SoC...,
devicetree, linux-kernel, linux-amarula
Am Mittwoch, 22. Juli 2020, 20:51:07 CEST schrieb Jagan Teki:
> Hi Heiko,
>
> On Mon, Jul 20, 2020 at 4:33 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
> >
> > This patch adds support to enable PCIe for RockPI N10.
> >
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> > .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 41 ++++++++++++++++++-
> > 1 file changed, 39 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
> > index ebccc4a153a2..b415b8a16c78 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
> > @@ -11,6 +11,19 @@
> >
> > / {
> > compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
> > +
> > +
>
> Sorry for this extra space, let me know so that I can resend next version.
I fixed that up when applying the series.
Heiko
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10
2020-07-20 11:02 [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10 Jagan Teki
2020-07-20 11:02 ` [PATCH 2/3] ARM: dts: rockchip: Add HDMI out " Jagan Teki
2020-07-20 11:02 ` [PATCH 3/3] arm64: dts: rockchip: Add PCIe for RockPI N10 Jagan Teki
@ 2020-07-21 8:15 ` kernel test robot
2020-07-22 19:21 ` Heiko Stuebner
3 siblings, 0 replies; 7+ messages in thread
From: kernel test robot @ 2020-07-21 8:15 UTC (permalink / raw)
To: Jagan Teki, Heiko Stuebner, Rob Herring
Cc: kbuild-all, Suniel Mahesh, Michael Trimarchi, linux-arm-kernel,
linux-rockchip, devicetree, linux-kernel, linux-amarula,
Jagan Teki
[-- Attachment #1: Type: text/plain, Size: 1374 bytes --]
Hi Jagan,
I love your patch! Yet something to improve:
[auto build test ERROR on rockchip/for-next]
[also build test ERROR on next-20200720]
[cannot apply to v5.8-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jagan-Teki/ARM-dts-rockchip-Add-USB-for-RockPI-N8-N10/20200720-190757
base: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next
config: arm-defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> Error: arch/arm/boot/dts/rk3288-vmarc-som.dtsi:292.1-16 Label or path usb_host0_ohci not found
>> FATAL ERROR: Syntax error parsing input tree
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 52662 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10
2020-07-20 11:02 [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10 Jagan Teki
` (2 preceding siblings ...)
2020-07-21 8:15 ` [PATCH 1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10 kernel test robot
@ 2020-07-22 19:21 ` Heiko Stuebner
3 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2020-07-22 19:21 UTC (permalink / raw)
To: Jagan Teki, Rob Herring
Cc: Heiko Stuebner, devicetree, linux-arm-kernel, Suniel Mahesh,
linux-rockchip, linux-amarula, linux-kernel, Michael Trimarchi
On Mon, 20 Jul 2020 16:32:28 +0530, Jagan Teki wrote:
> Radxa dalang carrier board has 2x USB 2.0 and 1x USB 3.0
> ports.
>
> This patch adds support to enable all these USB ports for
> N10 and N8 combinations SBCs.
>
> Note that the USB 3.0 port on RockPI N8 combination works
> as USB 2.0 OTG since it is driven from RK3288.
Applied, thanks!
[1/3] ARM: dts: rockchip: Add USB for RockPI N8/N10
commit: 417b188a985d3557b0ecb5623b27bd9843f03aec
[2/3] ARM: dts: rockchip: Add HDMI out for RockPI N8/N10
commit: d0cb2f30e7c033f0a8bbe98ec73dbc1db4788942
[3/3] arm64: dts: rockchip: Add PCIe for RockPI N10
commit: 93ca8ac2e8fcea6feb02a40edd2334144b62fc6e
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 7+ messages in thread