mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
Fixes to make the automated binding tools happier (node-names,
undocumented + unneeded properties) and fixes for non-working devices on some boards. -----BEGIN PGP SIGNATURE----- iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmN94lwQHGhlaWtvQHNu dGVjaC5kZQAKCRDzpnnJnNEdgUJrB/4t+O8PYOt+5//D9I/3p5s4YczbkZzKCqKD +2oxMsBRSYY2kQoZcgSWxY5Z/IWwztVRdDOFmUYq6BexCdGQE6QrbLT+e1XXZP0b lbgfMaHKqGkQkFXRIG3K9ogHXPNes0u48ct2FYzJcbeKDd7Jm75l8n6n/k/xjh6h lkJap/nm5W/hhTowvLyOZpflVUreUrYyeZ87fh2n5favD4cNqUe4NqODRgBrCDkQ zXHcaFkOh6jF0sVtLE2gJVBJn7e4WkN5YhnHAOOypGepji/eQtzUjBq0D3SzfHTR jZZRzjFZlMBqKa3Mms71rRirgrQD9I3spzPYhnuPMwDShrbAY3Bm =yPZY -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmN+B4cACgkQmmx57+YA GNlZJxAAvFCcT/9ZfOn2/AZscYC2/3FR75mJxCbWpHcIgJNMq+7tuhuAVcZOTD72 0fat5eHq2GUT0DjESFxbuAbPP2YyXfXei47ADtaH9CESYjn5Gg6P0aKb2/GFKP+B O8s4vg6tHiebx8qkkr97wcOPrSjj/k1Ol8gXn/q3jyB52n4L2aG9j0nwygIWsjAn B0GhyLmcmpp+/VXWJll65eWeKf6k9FEnHSbupcyjGbdmcOaeETSyPsIMGbBH7dR3 YmtBYZgufYMgiDbx4S50auej8vYBH1ryH27jLxb5VgMee87uk7gn0h3eDDR5gOPP EvHee5MORVTfz6zIDzSrSNq2jj9eLoOWhFusE4VImac63Imi8kpM0iiEQcM1gu/e 69M42Xupi/fwx1Txb+zZxvj1UxQd/6GMEWpvCzgj7qRepAJyEkRPuczJPaSQ7rCd 0Cvnu/jbE8gm36sVLc1rwcD/tmaZquBXzohxW5hcijhGgTo4mDhgA/tt7EvVdo4/ ifWpNVBfNXaNFbLzG/4vZnuKWbotPcLD4GzSIJSExkP21EMDsWB6Qa2YSUOq0dM4 bbn7LHvUrW6HbR/BFYsplE2/p3YVHgcbIDXz3OCQL4Ap0baI+gbNwYspDjbc007d bH7563ydwWfV6ccpnApE/Sbr4GT/+zdehLiFyno0QTV8ttpk7Dg= =/0fj -----END PGP SIGNATURE----- Merge tag 'v6.1-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes Fixes to make the automated binding tools happier (node-names, undocumented + unneeded properties) and fixes for non-working devices on some boards. * tag 'v6.1-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Fix Pine64 Quartz4-B PMIC interrupt ARM: dts: rockchip: rk3188: fix lcdc1-rgb24 node name arm64: dts: rockchip: fix ir-receiver node names ARM: dts: rockchip: fix ir-receiver node names arm64: dts: rockchip: fix adc-keys sub node names ARM: dts: rockchip: fix adc-keys sub node names arm: dts: rockchip: remove clock-frequency from rtc arm: dts: rockchip: fix node name for hym8563 rtc arm64: dts: rockchip: remove clock-frequency from rtc arm64: dts: rockchip: fix node name for hym8563 rtc arm64: dts: rockchip: lower rk3399-puma-haikou SD controller clock frequency arm64: dts: rockchip: keep I2S1 disabled for GPIO function on ROCK Pi 4 series arm64: dts: rockchip: fix quartz64-a bluetooth configuration arm64: dts: rockchip: add enable-strobe-pulldown to emmc phy on nanopi4 arm64: dts: rockchip: remove i2c5 from rk3566-roc-pc arm64: dts: rockchip: Fix i2c3 pinctrl on rk3566-roc-pc arm64: dts: rockchip: Fix gmac failure of rgmii-id from rk3566-roc-pc arm64: dts: rockchip: Drop RK3399-Scarlet's repeated ec_ap_int_l definition Link: https://lore.kernel.org/r/6274427.GXAFRqVoOG@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
706450b5c3
34 changed files with 46 additions and 64 deletions
|
@ -35,11 +35,10 @@ phy0: ethernet-phy@0 {
|
||||||
&i2c1 {
|
&i2c1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -32,7 +32,7 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <2500000>;
|
keyup-threshold-microvolt = <2500000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "recovery";
|
label = "recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <0>;
|
press-threshold-microvolt = <0>;
|
||||||
|
|
|
@ -71,7 +71,7 @@ spdif_out: spdif-out {
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
ir_recv: gpio-ir-receiver {
|
ir_recv: ir-receiver {
|
||||||
compatible = "gpio-ir-receiver";
|
compatible = "gpio-ir-receiver";
|
||||||
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
|
@ -379,7 +379,7 @@ lcdc1_vsync: lcdc1-vsync {
|
||||||
rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>;
|
rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>;
|
||||||
};
|
};
|
||||||
|
|
||||||
lcdc1_rgb24: ldcd1-rgb24 {
|
lcdc1_rgb24: lcdc1-rgb24 {
|
||||||
rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>,
|
rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>,
|
||||||
<2 RK_PA1 1 &pcfg_pull_none>,
|
<2 RK_PA1 1 &pcfg_pull_none>,
|
||||||
<2 RK_PA2 1 &pcfg_pull_none>,
|
<2 RK_PA2 1 &pcfg_pull_none>,
|
||||||
|
|
|
@ -54,7 +54,7 @@ vdd_gpu: syr828@41 {
|
||||||
vin-supply = <&vcc_sys>;
|
vin-supply = <&vcc_sys>;
|
||||||
};
|
};
|
||||||
|
|
||||||
hym8563@51 {
|
rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
|
|
||||||
|
|
|
@ -28,19 +28,19 @@ button-down {
|
||||||
press-threshold-microvolt = <300000>;
|
press-threshold-microvolt = <300000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
menu {
|
button-menu {
|
||||||
label = "Menu";
|
label = "Menu";
|
||||||
linux,code = <KEY_MENU>;
|
linux,code = <KEY_MENU>;
|
||||||
press-threshold-microvolt = <640000>;
|
press-threshold-microvolt = <640000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
esc {
|
button-esc {
|
||||||
label = "Esc";
|
label = "Esc";
|
||||||
linux,code = <KEY_ESC>;
|
linux,code = <KEY_ESC>;
|
||||||
press-threshold-microvolt = <1000000>;
|
press-threshold-microvolt = <1000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
home {
|
button-home {
|
||||||
label = "Home";
|
label = "Home";
|
||||||
linux,code = <KEY_HOME>;
|
linux,code = <KEY_HOME>;
|
||||||
press-threshold-microvolt = <1300000>;
|
press-threshold-microvolt = <1300000>;
|
||||||
|
|
|
@ -233,11 +233,10 @@ vdd_gpu: syr828@41 {
|
||||||
vin-supply = <&vcc_sys>;
|
vin-supply = <&vcc_sys>;
|
||||||
};
|
};
|
||||||
|
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
interrupt-parent = <&gpio7>;
|
interrupt-parent = <&gpio7>;
|
||||||
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
|
||||||
|
|
|
@ -162,11 +162,10 @@ vdd_gpu: syr828@41 {
|
||||||
vin-supply = <&vcc_sys>;
|
vin-supply = <&vcc_sys>;
|
||||||
};
|
};
|
||||||
|
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -165,11 +165,10 @@ &hdmi {
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c0 {
|
&i2c0 {
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
interrupt-parent = <&gpio0>;
|
interrupt-parent = <&gpio0>;
|
||||||
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
|
||||||
|
|
|
@ -241,7 +241,6 @@ hym8563: rtc@51 {
|
||||||
interrupt-parent = <&gpio5>;
|
interrupt-parent = <&gpio5>;
|
||||||
interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "hym8563";
|
clock-output-names = "hym8563";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&hym8563_int>;
|
pinctrl-0 = <&hym8563_int>;
|
||||||
|
|
|
@ -30,31 +30,31 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <1800000>;
|
keyup-threshold-microvolt = <1800000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
esc-key {
|
button-esc {
|
||||||
label = "esc";
|
label = "esc";
|
||||||
linux,code = <KEY_ESC>;
|
linux,code = <KEY_ESC>;
|
||||||
press-threshold-microvolt = <1310000>;
|
press-threshold-microvolt = <1310000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
home-key {
|
button-home {
|
||||||
label = "home";
|
label = "home";
|
||||||
linux,code = <KEY_HOME>;
|
linux,code = <KEY_HOME>;
|
||||||
press-threshold-microvolt = <624000>;
|
press-threshold-microvolt = <624000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
menu-key {
|
button-menu {
|
||||||
label = "menu";
|
label = "menu";
|
||||||
linux,code = <KEY_MENU>;
|
linux,code = <KEY_MENU>;
|
||||||
press-threshold-microvolt = <987000>;
|
press-threshold-microvolt = <987000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
vol-down-key {
|
button-down {
|
||||||
label = "volume down";
|
label = "volume down";
|
||||||
linux,code = <KEY_VOLUMEDOWN>;
|
linux,code = <KEY_VOLUMEDOWN>;
|
||||||
press-threshold-microvolt = <300000>;
|
press-threshold-microvolt = <300000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
vol-up-key {
|
button-up {
|
||||||
label = "volume up";
|
label = "volume up";
|
||||||
linux,code = <KEY_VOLUMEUP>;
|
linux,code = <KEY_VOLUMEUP>;
|
||||||
press-threshold-microvolt = <17000>;
|
press-threshold-microvolt = <17000>;
|
||||||
|
|
|
@ -23,7 +23,7 @@ adc-keys0 {
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
keyup-threshold-microvolt = <1800000>;
|
keyup-threshold-microvolt = <1800000>;
|
||||||
|
|
||||||
func-key {
|
button-func {
|
||||||
linux,code = <KEY_FN>;
|
linux,code = <KEY_FN>;
|
||||||
label = "function";
|
label = "function";
|
||||||
press-threshold-microvolt = <18000>;
|
press-threshold-microvolt = <18000>;
|
||||||
|
@ -37,31 +37,31 @@ adc-keys1 {
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
keyup-threshold-microvolt = <1800000>;
|
keyup-threshold-microvolt = <1800000>;
|
||||||
|
|
||||||
esc-key {
|
button-esc {
|
||||||
linux,code = <KEY_MICMUTE>;
|
linux,code = <KEY_MICMUTE>;
|
||||||
label = "micmute";
|
label = "micmute";
|
||||||
press-threshold-microvolt = <1130000>;
|
press-threshold-microvolt = <1130000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
home-key {
|
button-home {
|
||||||
linux,code = <KEY_MODE>;
|
linux,code = <KEY_MODE>;
|
||||||
label = "mode";
|
label = "mode";
|
||||||
press-threshold-microvolt = <901000>;
|
press-threshold-microvolt = <901000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
menu-key {
|
button-menu {
|
||||||
linux,code = <KEY_PLAY>;
|
linux,code = <KEY_PLAY>;
|
||||||
label = "play";
|
label = "play";
|
||||||
press-threshold-microvolt = <624000>;
|
press-threshold-microvolt = <624000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
vol-down-key {
|
button-down {
|
||||||
linux,code = <KEY_VOLUMEDOWN>;
|
linux,code = <KEY_VOLUMEDOWN>;
|
||||||
label = "volume down";
|
label = "volume down";
|
||||||
press-threshold-microvolt = <300000>;
|
press-threshold-microvolt = <300000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
vol-up-key {
|
button-up {
|
||||||
linux,code = <KEY_VOLUMEUP>;
|
linux,code = <KEY_VOLUMEUP>;
|
||||||
label = "volume up";
|
label = "volume up";
|
||||||
press-threshold-microvolt = <18000>;
|
press-threshold-microvolt = <18000>;
|
||||||
|
|
|
@ -19,7 +19,7 @@ chosen {
|
||||||
stdout-path = "serial2:1500000n8";
|
stdout-path = "serial2:1500000n8";
|
||||||
};
|
};
|
||||||
|
|
||||||
ir_rx {
|
ir-receiver {
|
||||||
compatible = "gpio-ir-receiver";
|
compatible = "gpio-ir-receiver";
|
||||||
gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
|
gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
|
@ -25,7 +25,7 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <1800000>;
|
keyup-threshold-microvolt = <1800000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "recovery";
|
label = "recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <17000>;
|
press-threshold-microvolt = <17000>;
|
||||||
|
|
|
@ -208,11 +208,10 @@ vdd_cpu: syr827@40 {
|
||||||
vin-supply = <&vcc_sys>;
|
vin-supply = <&vcc_sys>;
|
||||||
};
|
};
|
||||||
|
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
/* rtc_int is not connected */
|
/* rtc_int is not connected */
|
||||||
};
|
};
|
||||||
|
|
|
@ -192,11 +192,10 @@ vdd_cpu: syr827@40 {
|
||||||
vin-supply = <&vcc_sys>;
|
vin-supply = <&vcc_sys>;
|
||||||
};
|
};
|
||||||
|
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
/* rtc_int is not connected */
|
/* rtc_int is not connected */
|
||||||
};
|
};
|
||||||
|
|
|
@ -734,10 +734,6 @@ qca_bt: bluetooth@1 {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* PINCTRL OVERRIDES */
|
/* PINCTRL OVERRIDES */
|
||||||
&ec_ap_int_l {
|
|
||||||
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
||||||
};
|
|
||||||
|
|
||||||
&ap_fw_wp {
|
&ap_fw_wp {
|
||||||
rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
|
rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -123,7 +123,7 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <1800000>;
|
keyup-threshold-microvolt = <1800000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "Recovery";
|
label = "Recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <18000>;
|
press-threshold-microvolt = <18000>;
|
||||||
|
|
|
@ -39,7 +39,7 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <1800000>;
|
keyup-threshold-microvolt = <1800000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "Recovery";
|
label = "Recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <18000>;
|
press-threshold-microvolt = <18000>;
|
||||||
|
|
|
@ -19,7 +19,7 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <1500000>;
|
keyup-threshold-microvolt = <1500000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "Recovery";
|
label = "Recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <18000>;
|
press-threshold-microvolt = <18000>;
|
||||||
|
|
|
@ -167,6 +167,7 @@ &cpu_l3 {
|
||||||
};
|
};
|
||||||
|
|
||||||
&emmc_phy {
|
&emmc_phy {
|
||||||
|
rockchip,enable-strobe-pulldown;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -52,13 +52,13 @@ button-down {
|
||||||
press-threshold-microvolt = <300000>;
|
press-threshold-microvolt = <300000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
back {
|
button-back {
|
||||||
label = "Back";
|
label = "Back";
|
||||||
linux,code = <KEY_BACK>;
|
linux,code = <KEY_BACK>;
|
||||||
press-threshold-microvolt = <985000>;
|
press-threshold-microvolt = <985000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
menu {
|
button-menu {
|
||||||
label = "Menu";
|
label = "Menu";
|
||||||
linux,code = <KEY_MENU>;
|
linux,code = <KEY_MENU>;
|
||||||
press-threshold-microvolt = <1314000>;
|
press-threshold-microvolt = <1314000>;
|
||||||
|
|
|
@ -207,7 +207,7 @@ &sdmmc {
|
||||||
cap-sd-highspeed;
|
cap-sd-highspeed;
|
||||||
cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
|
cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
|
||||||
disable-wp;
|
disable-wp;
|
||||||
max-frequency = <150000000>;
|
max-frequency = <40000000>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
|
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
|
||||||
vmmc-supply = <&vcc3v3_baseboard>;
|
vmmc-supply = <&vcc3v3_baseboard>;
|
||||||
|
|
|
@ -98,13 +98,12 @@ &fusb0 {
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c0 {
|
&i2c0 {
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
interrupt-parent = <&gpio0>;
|
interrupt-parent = <&gpio0>;
|
||||||
interrupts = <RK_PA5 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <RK_PA5 IRQ_TYPE_EDGE_FALLING>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "xin32k";
|
clock-output-names = "xin32k";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&hym8563_int>;
|
pinctrl-0 = <&hym8563_int>;
|
||||||
|
|
|
@ -41,7 +41,7 @@ adc-keys {
|
||||||
keyup-threshold-microvolt = <1500000>;
|
keyup-threshold-microvolt = <1500000>;
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "Recovery";
|
label = "Recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <18000>;
|
press-threshold-microvolt = <18000>;
|
||||||
|
|
|
@ -509,7 +509,6 @@ i2s0_p0_0: endpoint {
|
||||||
&i2s1 {
|
&i2s1 {
|
||||||
rockchip,playback-channels = <2>;
|
rockchip,playback-channels = <2>;
|
||||||
rockchip,capture-channels = <2>;
|
rockchip,capture-channels = <2>;
|
||||||
status = "okay";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2s2 {
|
&i2s2 {
|
||||||
|
|
|
@ -33,13 +33,13 @@ button-down {
|
||||||
press-threshold-microvolt = <300000>;
|
press-threshold-microvolt = <300000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
back {
|
button-back {
|
||||||
label = "Back";
|
label = "Back";
|
||||||
linux,code = <KEY_BACK>;
|
linux,code = <KEY_BACK>;
|
||||||
press-threshold-microvolt = <985000>;
|
press-threshold-microvolt = <985000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
menu {
|
button-menu {
|
||||||
label = "Menu";
|
label = "Menu";
|
||||||
linux,code = <KEY_MENU>;
|
linux,code = <KEY_MENU>;
|
||||||
press-threshold-microvolt = <1314000>;
|
press-threshold-microvolt = <1314000>;
|
||||||
|
|
|
@ -297,11 +297,10 @@ &i2c2 {
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
hym8563: hym8563@51 {
|
hym8563: rtc@51 {
|
||||||
compatible = "haoyu,hym8563";
|
compatible = "haoyu,hym8563";
|
||||||
reg = <0x51>;
|
reg = <0x51>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "hym8563";
|
clock-output-names = "hym8563";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&hym8563_int>;
|
pinctrl-0 = <&hym8563_int>;
|
||||||
|
|
|
@ -23,7 +23,7 @@ adc-keys {
|
||||||
io-channel-names = "buttons";
|
io-channel-names = "buttons";
|
||||||
keyup-threshold-microvolt = <1750000>;
|
keyup-threshold-microvolt = <1750000>;
|
||||||
|
|
||||||
recovery {
|
button-recovery {
|
||||||
label = "recovery";
|
label = "recovery";
|
||||||
linux,code = <KEY_VENDOR>;
|
linux,code = <KEY_VENDOR>;
|
||||||
press-threshold-microvolt = <0>;
|
press-threshold-microvolt = <0>;
|
||||||
|
|
|
@ -740,7 +740,7 @@ &uart0 {
|
||||||
|
|
||||||
&uart1 {
|
&uart1 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
|
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
uart-has-rtscts;
|
uart-has-rtscts;
|
||||||
|
|
||||||
|
@ -748,13 +748,14 @@ bluetooth {
|
||||||
compatible = "brcm,bcm43438-bt";
|
compatible = "brcm,bcm43438-bt";
|
||||||
clocks = <&rk817 1>;
|
clocks = <&rk817 1>;
|
||||||
clock-names = "lpo";
|
clock-names = "lpo";
|
||||||
device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
|
host-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
|
||||||
host-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
|
device-wakeup-gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
|
||||||
shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
|
shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
||||||
vbat-supply = <&vcc_sys>;
|
vbat-supply = <&vcc_sys>;
|
||||||
vddio-supply = <&vcca1v8_pmu>;
|
vddio-supply = <&vcca1v8_pmu>;
|
||||||
|
max-speed = <3000000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,7 @@ rk809: pmic@20 {
|
||||||
compatible = "rockchip,rk809";
|
compatible = "rockchip,rk809";
|
||||||
reg = <0x20>;
|
reg = <0x20>;
|
||||||
interrupt-parent = <&gpio0>;
|
interrupt-parent = <&gpio0>;
|
||||||
interrupts = <RK_PA7 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
|
||||||
assigned-clocks = <&cru I2S1_MCLKOUT_TX>;
|
assigned-clocks = <&cru I2S1_MCLKOUT_TX>;
|
||||||
assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>;
|
assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>;
|
||||||
clock-names = "mclk";
|
clock-names = "mclk";
|
||||||
|
|
|
@ -142,7 +142,7 @@ &gmac1 {
|
||||||
assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
|
assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
|
||||||
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
|
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
|
||||||
clock_in_out = "input";
|
clock_in_out = "input";
|
||||||
phy-mode = "rgmii-id";
|
phy-mode = "rgmii";
|
||||||
phy-supply = <&vcc_3v3>;
|
phy-supply = <&vcc_3v3>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&gmac1m0_miim
|
pinctrl-0 = <&gmac1m0_miim
|
||||||
|
@ -432,11 +432,7 @@ &i2c2 {
|
||||||
|
|
||||||
&i2c3 {
|
&i2c3 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&i2c3m1_xfer>;
|
pinctrl-0 = <&i2c3m0_xfer>;
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
&i2c5 {
|
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -500,7 +500,6 @@ hym8563: rtc@51 {
|
||||||
interrupt-parent = <&gpio0>;
|
interrupt-parent = <&gpio0>;
|
||||||
interrupts = <RK_PD3 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <RK_PD3 IRQ_TYPE_EDGE_FALLING>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "rtcic_32kout";
|
clock-output-names = "rtcic_32kout";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&hym8563_int>;
|
pinctrl-0 = <&hym8563_int>;
|
||||||
|
|
|
@ -509,7 +509,6 @@ hym8563: rtc@51 {
|
||||||
interrupt-parent = <&gpio0>;
|
interrupt-parent = <&gpio0>;
|
||||||
interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
|
||||||
clock-output-names = "rtcic_32kout";
|
clock-output-names = "rtcic_32kout";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&hym8563_int>;
|
pinctrl-0 = <&hym8563_int>;
|
||||||
|
|
Loading…
Reference in a new issue