* [PATCH 1/5] ARM: dts: rockchip: fix rk3288 power-domain unit names
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
@ 2016-03-31 20:54 ` Heiko Stuebner
2016-03-31 20:54 ` [PATCH 2/5] ARM: dts: rockchip: fix missing usbphy unit-names Heiko Stuebner
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-03-31 20:54 UTC (permalink / raw)
To: linux-arm-kernel
The power-domain sub-nodes do have reg properties, but so far are
missing the expected unit names. So add the missing ones.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 74eae99..f445d19 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -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>;
};
--
2.6.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/5] ARM: dts: rockchip: fix missing usbphy unit-names
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
2016-03-31 20:54 ` [PATCH 1/5] ARM: dts: rockchip: fix rk3288 power-domain unit names Heiko Stuebner
@ 2016-03-31 20:54 ` Heiko Stuebner
2016-04-01 12:32 ` Wadim Egorov
2016-03-31 20:54 ` [PATCH 3/5] ARM: dts: rockchip: clean up gpio-keys nodes Heiko Stuebner
` (4 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Heiko Stuebner @ 2016-03-31 20:54 UTC (permalink / raw)
To: linux-arm-kernel
The usbphy subnodes do have a reg property but no unitname, add them.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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(-)
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index cb0a552..c84a306 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 9271833..c44c318 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index f445d19..ee4085d 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -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>;
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index de2f2f9..0239b45 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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);
--
2.6.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/5] ARM: dts: rockchip: fix missing usbphy unit-names
2016-03-31 20:54 ` [PATCH 2/5] ARM: dts: rockchip: fix missing usbphy unit-names Heiko Stuebner
@ 2016-04-01 12:32 ` Wadim Egorov
2016-04-01 13:27 ` [PATCH v2 " Heiko Stuebner
0 siblings, 1 reply; 10+ messages in thread
From: Wadim Egorov @ 2016-04-01 12:32 UTC (permalink / raw)
To: linux-arm-kernel
Hi Heiko,
you have changes in the spi.c file here.
On 31.03.2016 22:54, Heiko Stuebner wrote:
> The usbphy subnodes do have a reg property but no unitname, add them.
>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
> index cb0a552..c84a306 100644
> --- a/arch/arm/boot/dts/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rk3066a.dtsi
> @@ -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>;
> diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
> index 9271833..c44c318 100644
> --- a/arch/arm/boot/dts/rk3188.dtsi
> +++ b/arch/arm/boot/dts/rk3188.dtsi
> @@ -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>;
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index f445d19..ee4085d 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -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>;
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index de2f2f9..0239b45 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -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);
>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 2/5] ARM: dts: rockchip: fix missing usbphy unit-names
2016-04-01 12:32 ` Wadim Egorov
@ 2016-04-01 13:27 ` Heiko Stuebner
0 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-04-01 13:27 UTC (permalink / raw)
To: linux-arm-kernel
The usbphy subnodes do have a reg property but no unitname, add them.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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(-)
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index cb0a552..c84a306 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 9271833..c44c318 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index f445d19..ee4085d 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -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>;
--
2.6.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/5] ARM: dts: rockchip: clean up gpio-keys nodes
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
2016-03-31 20:54 ` [PATCH 1/5] ARM: dts: rockchip: fix rk3288 power-domain unit names Heiko Stuebner
2016-03-31 20:54 ` [PATCH 2/5] ARM: dts: rockchip: fix missing usbphy unit-names Heiko Stuebner
@ 2016-03-31 20:54 ` Heiko Stuebner
2016-03-31 20:54 ` [PATCH 4/5] ARM: dts: rockchip: drop unneeded properties from mipi node Heiko Stuebner
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-03-31 20:54 UTC (permalink / raw)
To: linux-arm-kernel
Drop superfluous #address-cells and #size-cells, rename
key-nodes to individual names and also use the key constants
intead of numbers.
Reported-by: Julien Chauveau <chauveau.julien@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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(-)
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 6d2a5b3..bc674ee 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -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>;
diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 3a5989b..6e7f218 100644
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -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>;
};
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 0b6924c..1da46d1 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -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;
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 3ccd8f3..963365d 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -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;
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 5f06d8c..d6cf9ad 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -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>;
};
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index eb77276..720717b 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -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;
diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 510a1d0..4b8a8ad 100644
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -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;
--
2.6.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/5] ARM: dts: rockchip: drop unneeded properties from mipi node
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
` (2 preceding siblings ...)
2016-03-31 20:54 ` [PATCH 3/5] ARM: dts: rockchip: clean up gpio-keys nodes Heiko Stuebner
@ 2016-03-31 20:54 ` Heiko Stuebner
2016-03-31 20:54 ` [PATCH 5/5] ARM: dts: rockchip: add missing unitname to cpu_leakage efuse Heiko Stuebner
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-03-31 20:54 UTC (permalink / raw)
To: linux-arm-kernel
The 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.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rk3288.dtsi | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index ee4085d..9114c7b 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -888,10 +888,6 @@
status = "disabled";
ports {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <1>;
-
mipi_in: port {
#address-cells = <1>;
#size-cells = <0>;
--
2.6.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/5] ARM: dts: rockchip: add missing unitname to cpu_leakage efuse
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
` (3 preceding siblings ...)
2016-03-31 20:54 ` [PATCH 4/5] ARM: dts: rockchip: drop unneeded properties from mipi node Heiko Stuebner
@ 2016-03-31 20:54 ` Heiko Stuebner
2016-03-31 21:26 ` [PATCH 0/5] ARM: dts: rockchip: small cleanups Rob Herring
2016-04-06 23:17 ` Heiko Stuebner
6 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-03-31 20:54 UTC (permalink / raw)
To: linux-arm-kernel
The cpu_leakage efuse on rk3288 did get it right including the
unitname but on both rk3066a and rk3188 it was missing, fix that.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/boot/dts/rk3066a.dtsi | 2 +-
arch/arm/boot/dts/rk3188.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index c84a306..c0ba86c 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -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>;
};
};
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index c44c318..31f81b2 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -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>;
};
};
--
2.6.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 0/5] ARM: dts: rockchip: small cleanups
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
` (4 preceding siblings ...)
2016-03-31 20:54 ` [PATCH 5/5] ARM: dts: rockchip: add missing unitname to cpu_leakage efuse Heiko Stuebner
@ 2016-03-31 21:26 ` Rob Herring
2016-04-06 23:17 ` Heiko Stuebner
6 siblings, 0 replies; 10+ messages in thread
From: Rob Herring @ 2016-03-31 21:26 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 31, 2016 at 3:54 PM, Heiko Stuebner <heiko@sntech.de> wrote:
> 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
For the series:
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 0/5] ARM: dts: rockchip: small cleanups
2016-03-31 20:54 [PATCH 0/5] ARM: dts: rockchip: small cleanups Heiko Stuebner
` (5 preceding siblings ...)
2016-03-31 21:26 ` [PATCH 0/5] ARM: dts: rockchip: small cleanups Rob Herring
@ 2016-04-06 23:17 ` Heiko Stuebner
6 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-04-06 23:17 UTC (permalink / raw)
To: linux-arm-kernel
Am Donnerstag, 31. M?rz 2016, 22:54:06 schrieb 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]
applied these with patch 2 fixed up to v2 for 4.7
^ permalink raw reply [flat|nested] 10+ messages in thread