mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 09:50:04 +00:00
Code Issues Releases Wiki Activity

New node for the broadcast-timer of the rk3368, a non-critical fix for

Browse source 
a regulator voltage and a typo fix.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWd005AAoJEPOmecmc0R2BT1cH/AtopgXkiguqobWz/tHhaz/T
 OHETYVDzISgp4w/FnpugPollw4LhLkC4JkA7Sr41tNZzIq2loqSW1f94ige1Qmfo
 dtt/eUr9ULN3GAa3b1sUbK7W/slw3zt7o2TggEG375BsubQagyVNE2P28j9vIArr
 XL+XsekAGnj46MwvP/1Wro/fm6wUWZJV22itIBllZnQoTm51CjmzXajAeO1p4pxx
 /K9pc+twcEjk2IoIWmn9gLLUC96HsQDCxU8lo74Ywiz9B5GZ+JFIJLAGjwAmPLei
 O66yl/gnzJlszt09L0p6MqwzavJhVX80xcWiBdEKj8FRjOeSvfn7nnuYt5sPb6s=
 =zB/I
 -----END PGP SIGNATURE-----

Merge tag 'v4.5-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

New node for the broadcast-timer of the rk3368, a non-critical fix for
a regulator voltage and a typo fix.

* tag 'v4.5-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add the broadcast-timer for RK3368 SoC
  arm64: dts: rockchip: Fix typo in rk3368 sdmmc card detect pin name
  arm64: dts: rockchip: correct voltage range for rk3368-evb-act8846 board

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-12-22 13:07:48 -08:00
commit 0ac0148831
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts
View file

@ -104,8 +104,8 @@ vcc_io: REG2 {
vdd_log: REG3 {
regulator-name = "VDD_LOG";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1500000>;
regulator-always-on;
};
@ -118,7 +118,7 @@ vcc_20: REG4 {
vccio_sd: REG5 {
regulator-name = "VCCIO_SD";
regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};

8
arch/arm64/boot/dts/rockchip/rk3368.dtsi
View file

@ -579,6 +579,12 @@ wdt: watchdog@ff800000 {
status = "disabled";
};
timer@ff810000 {
compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer";
reg = <0x0 0xff810000 0x0 0x20>;
interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
};
gic: interrupt-controller@ffb71000 {
compatible = "arm,gic-400";
interrupt-controller;
@ -849,7 +855,7 @@ sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_up>;
};
sdmmc_cd: sdmcc-cd {
sdmmc_cd: sdmmc-cd {
rockchip,pins = <2 11 RK_FUNC_1 &pcfg_pull_up>;
};