Unverified Commit 2630a912 authored Jul 06, 2022 by Arnd Bergmann

Merge tag 'v5.20-rockchip-dts32-1' of...

Merge tag 'v5.20-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

NFC flash node on rk3066a-mk808 and some dts styling fixes
(alignment and node names).

* tag 'v5.20-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: correct gpio-keys properties on rk3288-tinker
  ARM: dts: rockchip: align gpio-key node names with dtschema
  ARM: dts: rockchip: adjust whitespace around '='
  ARM: dts: rockchip: enable nfc node in rk3066a-mk808.dts

Link: https://lore.kernel.org/r/14795241.VsHLxoZxqI@phil


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 73a4ccf9 e5a3cbe8

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ gpio-keys {
		compatible = "gpio-keys";
		autorepeat;

		power {
		key-power {
		gpios = <&gpio6 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
		linux,code = <KEY_POWER>;
		label = "GPIO Key Power";
		@@ -56,7 +56,7 @@ power {
		wakeup-source;
		debounce-interval = <100>;
		};
		volume-down {
		key-volume-down {
		gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
		linux,code = <KEY_VOLUMEDOWN>;
		label = "GPIO Key Vol-";

arch/arm/boot/dts/rk3066a-mk808.dts

+18 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,24 @@ &mmc1 {
		status = "okay";
		};

		&nfc {
		#address-cells = <1>;
		#size-cells = <0>;
		status = "okay";

		nand@0 {
		reg = <0>;
		label = "rk-nand";
		nand-bus-width = <8>;
		nand-ecc-mode = "hw";
		nand-ecc-step-size = <1024>;
		nand-ecc-strength = <40>;
		nand-is-boot-medium;
		rockchip,boot-blks = <8>;
		rockchip,boot-ecc-strength = <24>;
		};
		};

		&pinctrl {
		usb-host {
		host_drv: host-drv {

arch/arm/boot/dts/rk3066a-rayeager.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ ir: ir-receiver {
		keys: gpio-keys {
		compatible = "gpio-keys";

		power {
		key-power {
		wakeup-source;
		gpios = <&gpio6 RK_PA2 GPIO_ACTIVE_LOW>;
		label = "GPIO Power";

arch/arm/boot/dts/rk3188-bqedison2qc.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ gpio-keys {
		pinctrl-names = "default";
		pinctrl-0 = <&pwr_key &usb_int>;

		power {
		key-power {
		gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_POWER>;
		label = "GPIO Key Power";
		@@ -46,7 +46,7 @@ power {
		wakeup-source;
		};

		wake_on_usb: wake-on-usb {
		wake_on_usb: key-wake-on-usb {
		label = "Wake-on-USB";
		gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_WAKEUP>;

arch/arm/boot/dts/rk3188-px3-evb.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ gpio-keys {
		compatible = "gpio-keys";
		autorepeat;

		power {
		key-power {
		gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
		linux,code = <KEY_POWER>;
		label = "GPIO Key Power";