mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
On the Rock5b a fix the newly added rtc node and cpu-regulators for the big
cluster. Volume-keys (via adc) for the Pinephone Pro, display support for the Anbernic RG353. As well as gpio-ranges for rk356x and fixes for the audio-codec node-names on two boards. -----BEGIN PGP SIGNATURE----- iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmQ92RgQHGhlaWtvQHNu dGVjaC5kZQAKCRDzpnnJnNEdgcXBB/43meqk8lbSdnOl12+ct+JC6U7wK6WB3RHk 1vVlzxQTL5myaKlVdXbA55FoxkETs2fL4oBeekJ/ajlRysQkW3nEQl6QsnbPY2gn sDVDvogX7EKsp7X2ECLmzxxgJl/R2PY2Jsl5mbqMt3tXAl3J75fSIrPwptd4JTqg IxtN16IHBmTPwlyDY/AXSDICudMET/URUkjaYOR4S6BcN2+7oR5M9NP4DD9/0P6f 1FV0FxTMSNAMiEpDCtHPfa29pjh83CtIpW57v2yvXthsiSR3McmNXPhnYbuZKCvD ZE7NzhgXHvbRatR0YHj+vj8HHoYDYkRYTrbIRoWMvc2tT/ht34QQ =4xMh -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmQ+pEUACgkQYKtH/8kJ UifF7RAA1hp77ZVpV6LElyFAF+SsiVb46Vn6vD54pvYmPno6AcdKmei8blv2QLWQ UfjZWj0k84Mg+GfB0CSO+Aey+oiugnRVAeYxHoaAH2K2lJozRhbVpAU4qatSB9N/ 0w3pQoJPiBfHmQqGKcTEmmfrR7aFKmDrw8P4UlG58Oawv2kN80Ntw0DeOSKyOXSR RiOGGrEh7LJ24F+uGaVyAejC6km/eVDaCovJ/EISNG3MUpd5M3Z6amKGIDHLoJPR avk8OAWoSh1dYnrk+jeW+Yuc7JLjlDsORuZNq+a+0mL5Hi+5E2VLT8sZ3ff/RGYu +if9OY3ooNj7RVgE8+su3g2U6o07pc9Gr4pFuTHKhXmT7L1qQn6x8koLq+PdZbyk E26EyUiwF4RZ/q3MK8OQxIGfjW5VgADvwXxpw4VPo3F4qRX7igK6aPLWZ1VS61mt cHShMNQPLzlHXlcMEice3693gIXu1izeOBRVDL6gkp/d6SQhENP51NmYuZyfEk/z XG3KM+8DIqAzQq5M+AIpsGvg6E7fqd8ihQDhM0TAkSYTX1CBcTNF0b0s0dOAZCG6 Mgw8W7U36NUCF0D1RGSeIxckNLBXjOIMDRY4g8VqP4EtcmFKosdyHOU2cVzViisI OIHLz6C32zafKZTxQP2BC5l/N6Z0sd7JAwLM6mbqahsFBJcuJlk= =d/86 -----END PGP SIGNATURE----- Merge tag 'v6.4-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt On the Rock5b a fix the newly added rtc node and cpu-regulators for the big cluster. Volume-keys (via adc) for the Pinephone Pro, display support for the Anbernic RG353. As well as gpio-ranges for rk356x and fixes for the audio-codec node-names on two boards. * tag 'v6.4-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add support for volume keys to rk3399-pinephone-pro arm64: dts: rockchip: Add vdd_cpu_big regulators to rk3588-rock-5b arm64: dts: rockchip: Use generic name for es8316 on Pinebook Pro and Rock 5B arm64: dts: rockchip: Drop RTC clock-frequency on rk3588-rock-5b arm64: dts: rockchip: Add pinctrl gpio-ranges for rk356x arm64: dts: rockchip: add panel to Anbernic RG353 series Link: https://lore.kernel.org/r/5144826.MHq7AAxBmi@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
460df798ca
5 changed files with 147 additions and 3 deletions
|
|
@ -675,7 +675,7 @@ &i2c1 {
|
|||
i2c-scl-rising-time-ns = <168>;
|
||||
status = "okay";
|
||||
|
||||
es8316: es8316@11 {
|
||||
es8316: audio-codec@11 {
|
||||
compatible = "everest,es8316";
|
||||
reg = <0x11>;
|
||||
clocks = <&cru SCLK_I2S_8CH_OUT>;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include <dt-bindings/input/gpio-keys.h>
|
||||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include "rk3399.dtsi"
|
||||
#include "rk3399-opp.dtsi"
|
||||
|
|
@ -29,6 +30,26 @@ chosen {
|
|||
stdout-path = "serial2:115200n8";
|
||||
};
|
||||
|
||||
adc-keys {
|
||||
compatible = "adc-keys";
|
||||
io-channels = <&saradc 1>;
|
||||
io-channel-names = "buttons";
|
||||
keyup-threshold-microvolt = <1600000>;
|
||||
poll-interval = <100>;
|
||||
|
||||
button-up {
|
||||
label = "Volume Up";
|
||||
linux,code = <KEY_VOLUMEUP>;
|
||||
press-threshold-microvolt = <100000>;
|
||||
};
|
||||
|
||||
button-down {
|
||||
label = "Volume Down";
|
||||
linux,code = <KEY_VOLUMEDOWN>;
|
||||
press-threshold-microvolt = <600000>;
|
||||
};
|
||||
};
|
||||
|
||||
backlight: backlight {
|
||||
compatible = "pwm-backlight";
|
||||
pwms = <&pwm0 0 50000 0>;
|
||||
|
|
@ -519,6 +540,11 @@ &pwm0 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&saradc {
|
||||
vref-supply = <&vcca1v8_s3>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&sdmmc {
|
||||
bus-width = <4>;
|
||||
cap-sd-highspeed;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,48 @@ &cru {
|
|||
assigned-clock-rates = <1200000000>, <200000000>, <241500000>;
|
||||
};
|
||||
|
||||
&dsi_dphy0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&dsi0 {
|
||||
status = "okay";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
ports {
|
||||
dsi0_in: port@0 {
|
||||
reg = <0>;
|
||||
dsi0_in_vp1: endpoint {
|
||||
remote-endpoint = <&vp1_out_dsi0>;
|
||||
};
|
||||
};
|
||||
|
||||
dsi0_out: port@1 {
|
||||
reg = <1>;
|
||||
mipi_out_panel: endpoint {
|
||||
remote-endpoint = <&mipi_in_panel>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
panel: panel@0 {
|
||||
compatible = "anbernic,rg353p-panel", "newvision,nv3051d";
|
||||
reg = <0>;
|
||||
backlight = <&backlight>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&lcd_rst>;
|
||||
reset-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_LOW>;
|
||||
vdd-supply = <&vcc3v3_lcd0_n>;
|
||||
|
||||
port {
|
||||
mipi_in_panel: endpoint {
|
||||
remote-endpoint = <&mipi_out_panel>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&gpio_keys_control {
|
||||
button-a {
|
||||
gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
|
||||
|
|
@ -55,6 +97,22 @@ power-monitor@62 {
|
|||
};
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
gpio-lcd {
|
||||
lcd_rst: lcd-rst {
|
||||
rockchip,pins =
|
||||
<4 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pwm4 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vp1 {
|
||||
vp1_out_dsi0: endpoint@ROCKCHIP_VOP2_EP_MIPI0 {
|
||||
reg = <ROCKCHIP_VOP2_EP_MIPI0>;
|
||||
remote-endpoint = <&dsi0_in_vp1>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1808,6 +1808,7 @@ gpio0: gpio@fdd60000 {
|
|||
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>;
|
||||
gpio-controller;
|
||||
gpio-ranges = <&pinctrl 0 0 32>;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
|
@ -1819,6 +1820,7 @@ gpio1: gpio@fe740000 {
|
|||
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>;
|
||||
gpio-controller;
|
||||
gpio-ranges = <&pinctrl 0 32 32>;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
|
@ -1830,6 +1832,7 @@ gpio2: gpio@fe750000 {
|
|||
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>;
|
||||
gpio-controller;
|
||||
gpio-ranges = <&pinctrl 0 64 32>;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
|
@ -1841,6 +1844,7 @@ gpio3: gpio@fe760000 {
|
|||
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>;
|
||||
gpio-controller;
|
||||
gpio-ranges = <&pinctrl 0 96 32>;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
|
@ -1852,6 +1856,7 @@ gpio4: gpio@fe770000 {
|
|||
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>;
|
||||
gpio-controller;
|
||||
gpio-ranges = <&pinctrl 0 128 32>;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,62 @@ vcc5v0_sys: vcc5v0-sys-regulator {
|
|||
};
|
||||
};
|
||||
|
||||
&cpu_b0 {
|
||||
cpu-supply = <&vdd_cpu_big0_s0>;
|
||||
};
|
||||
|
||||
&cpu_b1 {
|
||||
cpu-supply = <&vdd_cpu_big0_s0>;
|
||||
};
|
||||
|
||||
&cpu_b2 {
|
||||
cpu-supply = <&vdd_cpu_big1_s0>;
|
||||
};
|
||||
|
||||
&cpu_b3 {
|
||||
cpu-supply = <&vdd_cpu_big1_s0>;
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c0m2_xfer>;
|
||||
status = "okay";
|
||||
|
||||
vdd_cpu_big0_s0: regulator@42 {
|
||||
compatible = "rockchip,rk8602";
|
||||
reg = <0x42>;
|
||||
fcs,suspend-voltage-selector = <1>;
|
||||
regulator-name = "vdd_cpu_big0_s0";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <550000>;
|
||||
regulator-max-microvolt = <1050000>;
|
||||
regulator-ramp-delay = <2300>;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
};
|
||||
|
||||
vdd_cpu_big1_s0: regulator@43 {
|
||||
compatible = "rockchip,rk8603", "rockchip,rk8602";
|
||||
reg = <0x43>;
|
||||
fcs,suspend-voltage-selector = <1>;
|
||||
regulator-name = "vdd_cpu_big1_s0";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <550000>;
|
||||
regulator-max-microvolt = <1050000>;
|
||||
regulator-ramp-delay = <2300>;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&i2c6 {
|
||||
status = "okay";
|
||||
|
||||
|
|
@ -60,7 +116,6 @@ hym8563: rtc@51 {
|
|||
compatible = "haoyu,hym8563";
|
||||
reg = <0x51>;
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <32768>;
|
||||
clock-output-names = "hym8563";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&hym8563_int>;
|
||||
|
|
@ -73,7 +128,7 @@ hym8563: rtc@51 {
|
|||
&i2c7 {
|
||||
status = "okay";
|
||||
|
||||
es8316: es8316@11 {
|
||||
es8316: audio-codec@11 {
|
||||
compatible = "everest,es8316";
|
||||
reg = <0x11>;
|
||||
clocks = <&cru I2S0_8CH_MCLKOUT>;
|
||||
|
|
|
|||
Loading…
Reference in a new issue