ARM: dts: rockchip: small cleanups
Subsystems (3)
Heiko Stuebner
maintainercover ARM: dts: rockchip: small cleanups
Fix some missing unitnames on nodes having a reg property and drop unitnames on gpio-keys.
This explicitly leaves out the memory nodes, as it seems memory without unitname will keep being allowed, also to keep compatibility with bootloaders who may insert the actual amount of memory into those nodes. [0]
[0] http://www.spinics.net/lists/arm-kernel/msg494038.html
Heiko Stuebner (5):
ARM: dts: rockchip: fix rk3288 power-domain unit names
ARM: dts: rockchip: fix missing usbphy unit-names
ARM: dts: rockchip: clean up gpio-keys nodes
ARM: dts: rockchip: drop unneeded properties from mipi node
ARM: dts: rockchip: add missing unitname to cpu_leakage efuse
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 11 +++++------ arch/arm/boot/dts/rk3066a-rayeager.dts | 7 +++---- arch/arm/boot/dts/rk3066a.dtsi | 6 +++--- arch/arm/boot/dts/rk3188-radxarock.dts | 7 +++---- arch/arm/boot/dts/rk3188.dtsi | 6 +++--- arch/arm/boot/dts/rk3288-evb.dtsi | 7 +++---- arch/arm/boot/dts/rk3288-firefly.dtsi | 7 +++---- arch/arm/boot/dts/rk3288-popmetal.dts | 8 +++----- arch/arm/boot/dts/rk3288-r89.dts | 7 +++---- arch/arm/boot/dts/rk3288.dtsi | 18 +++++++----------- drivers/spi/spi.c | 4 ++-- 11 files changed, 38 insertions(+), 50 deletions(-)
Signature · 1 line
2.6.4
Heiko Stuebner
maintainerPATCH 1/5 ARM: dts: rockchip: fix rk3288 power-domain unit names
The power-domain sub-nodes do have reg properties, but so far are missing the expected unit names. So add the missing ones.
--- arch/arm/boot/dts/rk3288.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +4 -4
@@ -659,7 +659,7 @@ * *_HDMI HDMI * *_MIPI_* MIPI */ - pd_vio { + pd_vio at RK3288_PD_VIO { reg = <RK3288_PD_VIO>; clocks = <&cru ACLK_IEP>, <&cru ACLK_ISP>,
@@ -692,7 +692,7 @@ * Note: The following 3 are HEVC(H.265) clocks, * and on the ACLK_HEVC_NIU (NOC). */ - pd_hevc { + pd_hevc at RK3288_PD_HEVC { reg = <RK3288_PD_HEVC>; clocks = <&cru ACLK_HEVC>, <&cru SCLK_HEVC_CABAC>,
@@ -704,7 +704,7 @@ * (video endecoder & decoder) clocks that on the * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC). */ - pd_video { + pd_video at RK3288_PD_VIDEO { reg = <RK3288_PD_VIDEO>; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
@@ -714,7 +714,7 @@ * Note: ACLK_GPU is the GPU clock, * and on the ACLK_GPU_NIU (NOC). */ - pd_gpu { + pd_gpu at RK3288_PD_GPU { reg = <RK3288_PD_GPU>; clocks = <&cru ACLK_GPU>; };
Signature · 1 line
2.6.4
Heiko Stuebner
maintainerPATCH 2/5 ARM: dts: rockchip: fix missing usbphy unit-names
In reply to Heiko StuebnerThe usbphy subnodes do have a reg property but no unitname, add them.
--- arch/arm/boot/dts/rk3066a.dtsi | 4 ++-- arch/arm/boot/dts/rk3188.dtsi | 4 ++-- arch/arm/boot/dts/rk3288.dtsi | 6 +++--- drivers/spi/spi.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/boot/dts/rk3066a.dtsi +2 -2
@@ -207,7 +207,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 17c { #phy-cells = <0>; reg = <0x17c>; clocks = <&cru SCLK_OTGPHY0>;
@@ -215,7 +215,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 188 { #phy-cells = <0>; reg = <0x188>; clocks = <&cru SCLK_OTGPHY1>;
arch/arm/boot/dts/rk3188.dtsi +2 -2
@@ -166,7 +166,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 10c { #phy-cells = <0>; reg = <0x10c>; clocks = <&cru SCLK_OTGPHY0>;
@@ -174,7 +174,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 11c { #phy-cells = <0>; reg = <0x11c>; clocks = <&cru SCLK_OTGPHY1>;
arch/arm/boot/dts/rk3288.dtsi +3 -3
@@ -967,7 +967,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 320 { #phy-cells = <0>; reg = <0x320>; clocks = <&cru SCLK_OTGPHY0>;
@@ -975,7 +975,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 334 { #phy-cells = <0>; reg = <0x334>; clocks = <&cru SCLK_OTGPHY1>;
@@ -983,7 +983,7 @@ #clock-cells = <0>; }; - usbphy2: usb-phy2 { + usbphy2: usb-phy at 348 { #phy-cells = <0>; reg = <0x348>; clocks = <&cru SCLK_OTGPHY2>;
drivers/spi/spi.c +2 -2
@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)struct spi_master *master = container_of(work, struct spi_master, pump_messages); -__spi_pump_messages (master, true, false); +__spi_pump_messages (master, true, master->bus_lock_flag); }static int spi_init_queue (struct spi_master *master)
@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message,*/ int spi_sync (struct spi_device *spi,struct spi_message *message) { -return __spi_sync (spi, message,0 ); +return __spi_sync (spi, message, spi->master->bus_lock_flag); }EXPORT_SYMBOL_GPL (spi_sync);
Signature · 1 line
2.6.4
PATCH 2/5 ARM: dts: rockchip: fix missing usbphy unit-names
Hi Heiko,
you have changes in the spi.c file here.
Quoted 107 lines · Heiko Stuebner
The usbphy subnodes do have a reg property but no unitname, add them.
Signed-off-by Heiko Stuebner <[email protected]>--- arch/arm/boot/dts/rk3066a.dtsi | 4 ++-- arch/arm/boot/dts/rk3188.dtsi | 4 ++-- arch/arm/boot/dts/rk3288.dtsi | 6 +++--- drivers/spi/spi.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)arch/arm/boot/dts/rk3066a.dtsi +2
-2@@ -207,7 +207,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 17c { #phy-cells = <0>; reg = <0x17c>; clocks = <&cru SCLK_OTGPHY0>;@@ -215,7 +215,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 188 { #phy-cells = <0>; reg = <0x188>; clocks = <&cru SCLK_OTGPHY1>;arch/arm/boot/dts/rk3188.dtsi +2
-2@@ -166,7 +166,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 10c { #phy-cells = <0>; reg = <0x10c>; clocks = <&cru SCLK_OTGPHY0>;@@ -174,7 +174,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 11c { #phy-cells = <0>; reg = <0x11c>; clocks = <&cru SCLK_OTGPHY1>;arch/arm/boot/dts/rk3288.dtsi +3
-3@@ -967,7 +967,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 320 { #phy-cells = <0>; reg = <0x320>; clocks = <&cru SCLK_OTGPHY0>;@@ -975,7 +975,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 334 { #phy-cells = <0>; reg = <0x334>; clocks = <&cru SCLK_OTGPHY1>;@@ -983,7 +983,7 @@ #clock-cells = <0>; }; - usbphy2: usb-phy2 { + usbphy2: usb-phy at 348 { #phy-cells = <0>; reg = <0x348>; clocks = <&cru SCLK_OTGPHY2>;drivers/spi/spi.c +2
-2@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)struct spi_master *master = container_of(work, struct spi_master, pump_messages); -__spi_pump_messages (master, true, false); +__spi_pump_messages (master, true, master->bus_lock_flag); }static int spi_init_queue (struct spi_master *master)@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message,*/ int spi_sync (struct spi_device *spi,struct spi_message *message) { -return __spi_sync (spi, message,0 ); +return __spi_sync (spi, message, spi->master->bus_lock_flag); }EXPORT_SYMBOL_GPL (spi_sync);
Heiko Stuebner
maintainerPATCH v2 2/5 ARM: dts: rockchip: fix missing usbphy unit-names
The usbphy subnodes do have a reg property but no unitname, add them.
---
Hi Wadim,
thanks for catching this. I needed this change to make my veyron board boot on 4.6-rc1 (it is in the spi-fixes branch already now), and seem to have accidentially commited it after testing.
arch/arm/boot/dts/rk3066a.dtsi | 4 ++-- arch/arm/boot/dts/rk3188.dtsi | 4 ++-- arch/arm/boot/dts/rk3288.dtsi | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/rk3066a.dtsi +2 -2
@@ -207,7 +207,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 17c { #phy-cells = <0>; reg = <0x17c>; clocks = <&cru SCLK_OTGPHY0>;
@@ -215,7 +215,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 188 { #phy-cells = <0>; reg = <0x188>; clocks = <&cru SCLK_OTGPHY1>;
arch/arm/boot/dts/rk3188.dtsi +2 -2
@@ -166,7 +166,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 10c { #phy-cells = <0>; reg = <0x10c>; clocks = <&cru SCLK_OTGPHY0>;
@@ -174,7 +174,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 11c { #phy-cells = <0>; reg = <0x11c>; clocks = <&cru SCLK_OTGPHY1>;
arch/arm/boot/dts/rk3288.dtsi +3 -3
@@ -967,7 +967,7 @@ #size-cells = <0>; status = "disabled"; - usbphy0: usb-phy0 { + usbphy0: usb-phy at 320 { #phy-cells = <0>; reg = <0x320>; clocks = <&cru SCLK_OTGPHY0>;
@@ -975,7 +975,7 @@ #clock-cells = <0>; }; - usbphy1: usb-phy1 { + usbphy1: usb-phy at 334 { #phy-cells = <0>; reg = <0x334>; clocks = <&cru SCLK_OTGPHY1>;
@@ -983,7 +983,7 @@ #clock-cells = <0>; }; - usbphy2: usb-phy2 { + usbphy2: usb-phy at 348 { #phy-cells = <0>; reg = <0x348>; clocks = <&cru SCLK_OTGPHY2>;
Signature · 1 line
2.6.4
Heiko Stuebner
maintainerPATCH 3/5 ARM: dts: rockchip: clean up gpio-keys nodes
In reply to Heiko StuebnerDrop superfluous #address-cells and #size-cells, rename key-nodes to individual names and also use the key constants intead of numbers.
--- arch/arm/boot/dts/rk3066a-bqcurie2.dts | 11 +++++------ arch/arm/boot/dts/rk3066a-rayeager.dts | 7 +++---- arch/arm/boot/dts/rk3188-radxarock.dts | 7 +++---- arch/arm/boot/dts/rk3288-evb.dtsi | 7 +++---- arch/arm/boot/dts/rk3288-firefly.dtsi | 7 +++---- arch/arm/boot/dts/rk3288-popmetal.dts | 8 +++----- arch/arm/boot/dts/rk3288-r89.dts | 7 +++---- 7 files changed, 23 insertions(+), 31 deletions(-)
arch/arm/boot/dts/rk3066a-bqcurie2.dts +5 -6
@@ -42,6 +42,7 @@ */ /dts-v1/; +#include <dt-bindings/input/input.h> #include "rk3066a.dtsi" / {
@@ -77,21 +78,19 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button at 0 { + power { gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */ - linux,code = <116>; + linux,code = <KEY_POWER>; label = "GPIO Key Power"; linux,input-type = <1>; wakeup-source; debounce-interval = <100>; }; - button at 1 { + volume-down { gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */ - linux,code = <104>; + linux,code = <KEY_VOLUMEDOWN>; label = "GPIO Key Vol-"; linux,input-type = <1>; debounce-interval = <100>;
arch/arm/boot/dts/rk3066a-rayeager.dts +3 -4
@@ -41,6 +41,7 @@ */ /dts-v1/; +#include <dt-bindings/input/input.h> #include "rk3066a.dtsi" / {
@@ -61,14 +62,12 @@ keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - button at 0 { + power { wakeup-source; gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; label = "GPIO Power"; - linux,code = <116>; + linux,code = <KEY_POWER>; pinctrl-names = "default"; pinctrl-0 = <&pwr_key>; };
arch/arm/boot/dts/rk3188-radxarock.dts +3 -4
@@ -41,6 +41,7 @@ */ /dts-v1/; +#include <dt-bindings/input/input.h> #include "rk3188.dtsi" / {
@@ -54,13 +55,11 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button at 0 { + power { gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; - linux,code = <116>; + linux,code = <KEY_POWER>; label = "GPIO Key Power"; linux,input-type = <1>; wakeup-source;
arch/arm/boot/dts/rk3288-evb.dtsi +3 -4
@@ -38,6 +38,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include <dt-bindings/input/input.h> #include <dt-bindings/pwm/pwm.h> #include "rk3288.dtsi"
@@ -98,16 +99,14 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; pinctrl-names = "default"; pinctrl-0 = <&pwrbtn>; - button at 0 { + power { gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - linux,code = <116>; + linux,code = <KEY_POWER>; label = "GPIO Key Power"; linux,input-type = <1>; wakeup-source;
arch/arm/boot/dts/rk3288-firefly.dtsi +3 -4
@@ -40,6 +40,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include <dt-bindings/input/input.h> #include "rk3288.dtsi" / {
@@ -87,14 +88,12 @@ keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - button at 0 { + power { wakeup-source; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; label = "GPIO Power"; - linux,code = <116>; + linux,code = <KEY_POWER>; pinctrl-names = "default"; pinctrl-0 = <&pwr_key>; };
arch/arm/boot/dts/rk3288-popmetal.dts +3 -5
@@ -41,7 +41,7 @@ */ /dts-v1/; - +#include <dt-bindings/input/input.h> #include "rk3288.dtsi" / {
@@ -62,16 +62,14 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; pinctrl-names = "default"; pinctrl-0 = <&pwrbtn>; - button at 0 { + power { gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - linux,code = <116>; + linux,code = <KEY_POWER>; label = "GPIO Key Power"; linux,input-type = <1>; wakeup-source;
arch/arm/boot/dts/rk3288-r89.dts +3 -4
@@ -41,6 +41,7 @@ */ /dts-v1/; +#include <dt-bindings/input/input.h> #include <dt-bindings/pwm/pwm.h> #include "rk3288.dtsi"
@@ -61,16 +62,14 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; pinctrl-names = "default"; pinctrl-0 = <&pwrbtn>; - button at 0 { + power { gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - linux,code = <116>; + linux,code = <KEY_POWER>; label = "GPIO Key Power"; linux,input-type = <1>; wakeup-source;
Signature · 1 line
2.6.4
Heiko Stuebner
maintainerPATCH 4/5 ARM: dts: rockchip: drop unneeded properties from mipi node
In reply to Heiko StuebnerThe mipi controller node does contain an unused reg property as well as unnecessary #address-cells and #size-cells properties for subnodes not using addresses, so remove those to also make dtc happy.
--- arch/arm/boot/dts/rk3288.dtsi | 4 ---- 1 file changed, 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +0 -4
@@ -888,10 +888,6 @@ status = "disabled"; ports { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - mipi_in: port { #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.6.4
Heiko Stuebner
maintainerPATCH 5/5 ARM: dts: rockchip: add missing unitname to cpu_leakage efuse
In reply to Heiko StuebnerThe cpu_leakage efuse on rk3288 did get it right including the unitname but on both rk3066a and rk3188 it was missing, fix that.
--- arch/arm/boot/dts/rk3066a.dtsi | 2 +- arch/arm/boot/dts/rk3188.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk3066a.dtsi +1 -1
@@ -169,7 +169,7 @@ clocks = <&cru PCLK_EFUSE>; clock-names = "pclk_efuse"; - cpu_leakage: cpu_leakage { + cpu_leakage: cpu_leakage at 17 { reg = <0x17 0x1>; }; };
arch/arm/boot/dts/rk3188.dtsi +1 -1
@@ -154,7 +154,7 @@ clocks = <&cru PCLK_EFUSE>; clock-names = "pclk_efuse"; - cpu_leakage: cpu_leakage { + cpu_leakage: cpu_leakage at 17 { reg = <0x17 0x1>; }; };
Signature · 1 line
2.6.4
Rob Herring
maintainercover ARM: dts: rockchip: small cleanups
In reply to Heiko StuebnerQuoted 9 lines · Heiko Stuebner
Fix some missing unitnames on nodes having a reg property and drop unitnames on gpio-keys.
This explicitly leaves out the memory nodes, as it seems memory without unitname will keep being allowed, also to keep compatibility with bootloaders who may insert the actual amount of memory into those nodes. [0]
Quoted 8 lines
[0] http://www.spinics.net/lists/arm-kernel/msg494038.html
Heiko Stuebner (5):
ARM: dts: rockchip: fix rk3288 power-domain unit names
ARM: dts: rockchip: fix missing usbphy unit-names
ARM: dts: rockchip: clean up gpio-keys nodes
ARM: dts: rockchip: drop unneeded properties from mipi node
ARM: dts: rockchip: add missing unitname tocpu_leakageefuse
For the series:
cover ARM: dts: rockchip: small cleanups
In reply to Heiko StuebnerAm Donnerstag, 31. M?rz 2016, 22:54:06 schrieb Heiko Stuebner:
Quoted 7 lines
Fix some missing unitnames on nodes having a reg property and drop unitnames on gpio-keys.
This explicitly leaves out the memory nodes, as it seems memory without unitname will keep being allowed, also to keep compatibility with bootloaders who may insert the actual amount of memory into those nodes. [0]
applied these with patch 2 fixed up to v2 for 4.7