github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

NFC flash node on rk3066a-mk808 and some dts styling fixes

Browse Source 
(alignment and node names).
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmLEGIQQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgVS/B/0X0ztbwVTc44bRsyMScsocVK5N+URHUOMN
 4cCNtViXlI3Rqwea8WmwbEqTn3UwMHfOkF96OgGsTok/frNAkNEcFN8+r2Ott+Il
 3ggr8mfQ7fl2C2+zsdJNkykw0gq8NiM2T/P3OZhOFWXXy25MSaLpWpasYthL+AxC
 xdOEVgxy+3Pe/bCjYnqZ7a2VNs5L/U8q28qOZ0NPqVzD/HRhQa7vwk3IvoltTLrY
 EQPHIMr+PGA3CmMJ6XVNwdTC+XA+CDE5+dWCH/ylkrRi49MyromgSMlUH4ZrYdth
 hXAJOCRu4L8+y+9Yp7tE6UknLjfynoXZ/VtqUf9QzAA+tZKvZEAJ
 =FcZo
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmLFdJsACgkQmmx57+YA
 GNmnzg/+OfYFvbxIob1SyKCYGAeGT28TyeptANISKSdxJF5GgOFapbpOjZun1gLx
 NtkdAprOjoPAJwSz+N5IjH+maaUctOZGRT1Y1NNBMdKpNXRUTejgx5Up9j+V9EP5
 hpSq9FU3TS3Pa0jROgXToPsarNwQfqen41uveJrEUHYBMc0qF52uRfxQjUtWRI8h
 g5taktZMWUUnKbcs/qSH6SC6Smh5KZmnBmTa7fD1sK1qdH7pa9WISPcU1ihk1s5F
 m+aD84FRaNevtzSlgls1hjb6f904Ts+8/gxV0FGn51H4nPF0yw/2mRi+CwTy0kyn
 fFvLK8zUH+UsU9to5H79lz2iM3KafYG2JfDKni7ppTnqTnRVoOw7a/f11XQgvYvB
 J87QzyhBVZIHF6Xmrv70T256n9jHxM7UNNR3BFm33VKjWkFwtMSRWR4gqpO8Ljzl
 gWGlGHF0WNedAtp23mSsgC7TCW2NLlFIX60DYSIbtpkv+eQOSogRqGCA+6ta4WLE
 uceo6ZB/9zUtYHxIVC76IMV9c8FEfKx8rsBUR+QdjmJjfs3DUHYcvqWycqT9QS6V
 orxsPJJ/w6E8q/usKIEJa4BIIv7AaMNlIvij87gw7DHSBzWzNaF52LJi2NdY8b0M
 Zsu6XhTUpLKQv0ntY25GrpIOzG7HfinHPV13RS2LErJuauunNNQ=
 =S51s
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2022-07-06 13:40:10 +02:00
commit 2630a9127c
23 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk3066a-bqcurie2.dts
View File

@ -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-";

18
arch/arm/boot/dts/rk3066a-mk808.dts
View File

@ -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 {

2
arch/arm/boot/dts/rk3066a-rayeager.dts
View File

@ -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";

4
arch/arm/boot/dts/rk3188-bqedison2qc.dts
View File

@ -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>;

2
arch/arm/boot/dts/rk3188-px3-evb.dts
View File

@ -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";

2
arch/arm/boot/dts/rk3188-radxarock.dts
View File

@ -24,7 +24,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";

2
arch/arm/boot/dts/rk3229-evb.dts
View File

@ -107,7 +107,7 @@ vdd_log: vdd-log-regulator {
regulator-boot-on;
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
autorepeat;
pinctrl-names = "default";

2
arch/arm/boot/dts/rk3288-evb.dtsi
View File

@ -118,7 +118,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>;
power {
key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "GPIO Key Power";

2
arch/arm/boot/dts/rk3288-firefly-reload.dts
View File

@ -27,7 +27,7 @@ button-recovery {
gpio-keys {
compatible = "gpio-keys";
power {
key-power {
wakeup-source;
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power";

2
arch/arm/boot/dts/rk3288-firefly.dtsi
View File

@ -49,7 +49,7 @@ ir: ir-receiver {
keys: gpio-keys {
compatible = "gpio-keys";
power {
key-power {
wakeup-source;
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power";

4
arch/arm/boot/dts/rk3288-phycore-rdk.dts
View File

@ -20,14 +20,14 @@ user_buttons: user-buttons {
pinctrl-names = "default";
pinctrl-0 = <&user_button_pins>;
button@0 {
button-0 {
label = "home";
linux,code = <KEY_HOME>;
gpios = <&gpio8 0 GPIO_ACTIVE_HIGH>;
wakeup-source;
};
button@1 {
button-1 {
label = "menu";
linux,code = <KEY_MENU>;
gpios = <&gpio8 3 GPIO_ACTIVE_HIGH>;

2
arch/arm/boot/dts/rk3288-popmetal.dts
View File

@ -30,7 +30,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>;
power {
key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "GPIO Key Power";

2
arch/arm/boot/dts/rk3288-r89.dts
View File

@ -31,7 +31,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>;
power {
key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "GPIO Key Power";

2
arch/arm/boot/dts/rk3288-rock2-square.dts
View File

@ -28,7 +28,7 @@ button-recovery {
gpio-keys {
compatible = "gpio-keys";
power {
key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <KEY_POWER>;

4
arch/arm/boot/dts/rk3288-tinker.dtsi
View File

@ -26,14 +26,12 @@ ext_gmac: external-gmac-clock {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
autorepeat;
pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>;
button@0 {
button {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "GPIO Key Power";

10
arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi
View File

@ -13,10 +13,10 @@ bluetooth {
<&bt_dev_wake>;
compatible = "brcm,bcm43540-bt";
host-wakeup-gpios = <&gpio4 RK_PD7 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>;
device-wakeup-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
max-speed = <3000000>;
brcm,bt-pcm-int-params = [01 02 00 01 01];
host-wakeup-gpios = <&gpio4 RK_PD7 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>;
device-wakeup-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
max-speed = <3000000>;
brcm,bt-pcm-int-params = [01 02 00 01 01];
};
};

2
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
View File

@ -32,7 +32,7 @@ lid_switch: lid-switch {
pinctrl-names = "default";
pinctrl-0 = <&ap_lid_int_l>;
lid {
switch-lid {
label = "Lid";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
wakeup-source;

4
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View File

@ -21,14 +21,14 @@ volume_buttons: volume-buttons {
pinctrl-names = "default";
pinctrl-0 = <&volum_down_l &volum_up_l>;
volum_down {
key-volum-down {
label = "Volum_down";
gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <100>;
};
volum_up {
key-volum-up {
label = "Volum_up";
gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;

2
arch/arm/boot/dts/rk3288-veyron-pinky.dts
View File

@ -45,7 +45,7 @@ &edp {
&lid_switch {
pinctrl-0 = <&pwr_key_h &ap_lid_int_l>;
power {
key-power {
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
};
};

2
arch/arm/boot/dts/rk3288-veyron.dtsi
View File

@ -29,7 +29,7 @@ power_button: power-button {
pinctrl-names = "default";
pinctrl-0 = <&pwr_key_l>;
power {
key-power {
label = "Power";
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;

14
arch/arm/boot/dts/rv1108-elgin-r1.dts
View File

@ -83,7 +83,7 @@ rk805: pmic@18 {
regulators {
vdd_core: DCDC_REG1 {
regulator-name= "vdd_core";
regulator-name = "vdd_core";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1500000>;
regulator-always-on;
@ -95,7 +95,7 @@ regulator-state-mem {
};
vdd_buck2: DCDC_REG2 {
regulator-name= "vdd_buck2";
regulator-name = "vdd_buck2";
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
regulator-always-on;
@ -106,7 +106,7 @@ regulator-state-mem {
};
vcc_ddr: DCDC_REG3 {
regulator-name= "vcc_ddr";
regulator-name = "vcc_ddr";
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
@ -115,7 +115,7 @@ regulator-state-mem {
};
vcc_io: DCDC_REG4 {
regulator-name= "vcc_io";
regulator-name = "vcc_io";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@ -127,7 +127,7 @@ regulator-state-mem {
};
vdd_10: LDO_REG1 {
regulator-name= "vdd_10";
regulator-name = "vdd_10";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
@ -138,7 +138,7 @@ regulator-state-mem {
};
vcc_18: LDO_REG2 {
regulator-name= "vcc_18";
regulator-name = "vcc_18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
@ -149,7 +149,7 @@ regulator-state-mem {
};
vdd10_pmu: LDO_REG3 {
regulator-name= "vdd10_pmu";
regulator-name = "vdd10_pmu";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;

14
arch/arm/boot/dts/rv1108-evb.dts
View File

@ -96,7 +96,7 @@ rk805: pmic@18 {
regulators {
vdd_core: DCDC_REG1 {
regulator-name= "vdd_core";
regulator-name = "vdd_core";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1500000>;
regulator-always-on;
@ -108,7 +108,7 @@ regulator-state-mem {
};
vdd_cam: DCDC_REG2 {
regulator-name= "vdd_cam";
regulator-name = "vdd_cam";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <2000000>;
regulator-state-mem {
@ -117,7 +117,7 @@ regulator-state-mem {
};
vcc_ddr: DCDC_REG3 {
regulator-name= "vcc_ddr";
regulator-name = "vcc_ddr";
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
@ -126,7 +126,7 @@ regulator-state-mem {
};
vcc_io: DCDC_REG4 {
regulator-name= "vcc_io";
regulator-name = "vcc_io";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@ -138,7 +138,7 @@ regulator-state-mem {
};
vdd_10: LDO_REG1 {
regulator-name= "vdd_10";
regulator-name = "vdd_10";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
@ -149,7 +149,7 @@ regulator-state-mem {
};
vcc_18: LDO_REG2 {
regulator-name= "vcc_18";
regulator-name = "vcc_18";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
@ -160,7 +160,7 @@ regulator-state-mem {
};
vdd10_pmu: LDO_REG3 {
regulator-name= "vdd10_pmu";
regulator-name = "vdd10_pmu";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;

2
arch/arm/boot/dts/rv1108.dtsi
View File

@ -748,7 +748,7 @@ sfc_clk: sfc-clk {
gmac {
rmii_pins: rmii-pins {
rockchip,pins = <1 RK_PC5 2 &pcfg_pull_none>,
rockchip,pins = <1 RK_PC5 2 &pcfg_pull_none>,
<1 RK_PC3 2 &pcfg_pull_none>,
<1 RK_PC4 2 &pcfg_pull_none>,
<1 RK_PB2 3 &pcfg_pull_none_drv_12ma>,