Message ID | 20220909090558.3609190-2-jay.xu@rock-chips.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | gpio: rockchip: support acpi | expand |
-------------- jay.xu@rock-chips.com >Add gpio alias for gpio controller dt nodes, which is used by the >new gpio driver to get the index of gpio controller for driver. > >Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> >--- > arch/arm/boot/dts/rk3036.dtsi | 3 +++ > arch/arm/boot/dts/rk3066a.dtsi | 6 ++++++ > arch/arm/boot/dts/rk322x.dtsi | 4 ++++ > arch/arm/boot/dts/rk3288.dtsi | 9 +++++++++ > arch/arm/boot/dts/rk3xxx.dtsi | 4 ++++ > 5 files changed, 26 insertions(+) > >diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi >index 9b0f0497567d..912c21667dd4 100644 >--- a/arch/arm/boot/dts/rk3036.dtsi >+++ b/arch/arm/boot/dts/rk3036.dtsi >@@ -17,6 +17,9 @@ / { > interrupt-parent = <&gic>; > > aliases { >+ gpio0 = &gpio0; >+ gpio1 = &gpio1; >+ gpio2 = &gpio2; > i2c0 = &i2c0; > i2c1 = &i2c1; > i2c2 = &i2c2; >diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi >index de9915d946f7..fe565440d6ad 100644 >--- a/arch/arm/boot/dts/rk3066a.dtsi >+++ b/arch/arm/boot/dts/rk3066a.dtsi >@@ -13,6 +13,12 @@ > / { > compatible = "rockchip,rk3066a"; > >+ aliases { >+ gpio4 = &gpio4; >+ gpio5 = &gpio5; the gpio5 will be removed next version >+ gpio6 = &gpio6; >+ }; >+ > cpus { > #address-cells = <1>; > #size-cells = <0>; >diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi >index ffc16d6b97e1..a814e813a5da 100644 >--- a/arch/arm/boot/dts/rk322x.dtsi >+++ b/arch/arm/boot/dts/rk322x.dtsi >@@ -15,6 +15,10 @@ / { > interrupt-parent = <&gic>; > > aliases { >+ gpio0 = &gpio0; >+ gpio1 = &gpio1; >+ gpio2 = &gpio2; >+ gpio3 = &gpio3; > serial0 = &uart0; > serial1 = &uart1; > serial2 = &uart2; >diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi >index 487b0e03d4b4..4d5184e27389 100644 >--- a/arch/arm/boot/dts/rk3288.dtsi >+++ b/arch/arm/boot/dts/rk3288.dtsi >@@ -19,6 +19,15 @@ / { > > aliases { > ethernet0 = &gmac; >+ gpio0 = &gpio0; >+ gpio1 = &gpio1; >+ gpio2 = &gpio2; >+ gpio3 = &gpio3; >+ gpio4 = &gpio4; >+ gpio5 = &gpio5; >+ gpio6 = &gpio6; >+ gpio7 = &gpio7; >+ gpio8 = &gpio8; > i2c0 = &i2c0; > i2c1 = &i2c1; > i2c2 = &i2c2; >diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi >index 616a828e0c6e..e2cb4b51d02f 100644 >--- a/arch/arm/boot/dts/rk3xxx.dtsi >+++ b/arch/arm/boot/dts/rk3xxx.dtsi >@@ -16,6 +16,10 @@ / { > > aliases { > ethernet0 = &emac; >+ gpio0 = &gpio0; >+ gpio1 = &gpio1; >+ gpio2 = &gpio2; >+ gpio3 = &gpio3; > i2c0 = &i2c0; > i2c1 = &i2c1; > i2c2 = &i2c2; >-- >2.25.1 >
Hi Jianqun, Thank you for the patch! Yet something to improve: [auto build test ERROR on rockchip/for-next] [also build test ERROR on rafael-pm/linux-next brgl/gpio/for-next linus/master v6.0-rc4 next-20220909] [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#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Jianqun-Xu/gpio-rockchip-support-acpi/20220909-170917 base: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next config: arm-defconfig compiler: arm-linux-gnueabi-gcc (GCC) 12.1.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 # https://github.com/intel-lab-lkp/linux/commit/0ea828ae972ccfc3e06fce7104242336cc983cc3 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Jianqun-Xu/gpio-rockchip-support-acpi/20220909-170917 git checkout 0ea828ae972ccfc3e06fce7104242336cc983cc3 # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash If you fix the issue, kindly add following tag where applicable Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): also defined at arch/arm/boot/dts/rk3066a.dtsi:16.10-20.4 also defined at arch/arm/boot/dts/rk3066a-bqcurie2.dts:15.10-18.4 >> ERROR: Input tree has errors, aborting (use -f to force output) -- also defined at arch/arm/boot/dts/rk3066a.dtsi:16.10-20.4 also defined at arch/arm/boot/dts/rk3066a-marsboard.dts:13.10-15.4 >> ERROR: Input tree has errors, aborting (use -f to force output) -- also defined at arch/arm/boot/dts/rk3066a.dtsi:16.10-20.4 also defined at arch/arm/boot/dts/rk3066a-mk808.dts:14.10-17.4 >> ERROR: Input tree has errors, aborting (use -f to force output) -- also defined at arch/arm/boot/dts/rk3066a.dtsi:16.10-20.4 also defined at arch/arm/boot/dts/rk3066a-rayeager.dts:14.10-18.4 >> ERROR: Input tree has errors, aborting (use -f to force output)
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 9b0f0497567d..912c21667dd4 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -17,6 +17,9 @@ / { interrupt-parent = <&gic>; aliases { + gpio0 = &gpio0; + gpio1 = &gpio1; + gpio2 = &gpio2; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index de9915d946f7..fe565440d6ad 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -13,6 +13,12 @@ / { compatible = "rockchip,rk3066a"; + aliases { + gpio4 = &gpio4; + gpio5 = &gpio5; + gpio6 = &gpio6; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index ffc16d6b97e1..a814e813a5da 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -15,6 +15,10 @@ / { interrupt-parent = <&gic>; aliases { + gpio0 = &gpio0; + gpio1 = &gpio1; + gpio2 = &gpio2; + gpio3 = &gpio3; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 487b0e03d4b4..4d5184e27389 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -19,6 +19,15 @@ / { aliases { ethernet0 = &gmac; + gpio0 = &gpio0; + gpio1 = &gpio1; + gpio2 = &gpio2; + gpio3 = &gpio3; + gpio4 = &gpio4; + gpio5 = &gpio5; + gpio6 = &gpio6; + gpio7 = &gpio7; + gpio8 = &gpio8; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 616a828e0c6e..e2cb4b51d02f 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -16,6 +16,10 @@ / { aliases { ethernet0 = &emac; + gpio0 = &gpio0; + gpio1 = &gpio1; + gpio2 = &gpio2; + gpio3 = &gpio3; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2;
Add gpio alias for gpio controller dt nodes, which is used by the new gpio driver to get the index of gpio controller for driver. Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- arch/arm/boot/dts/rk3036.dtsi | 3 +++ arch/arm/boot/dts/rk3066a.dtsi | 6 ++++++ arch/arm/boot/dts/rk322x.dtsi | 4 ++++ arch/arm/boot/dts/rk3288.dtsi | 9 +++++++++ arch/arm/boot/dts/rk3xxx.dtsi | 4 ++++ 5 files changed, 26 insertions(+)