diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 13:07:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 13:07:48 -0800 |
| commit | 0ac01488315bac92de1b2086d87607b7ef798e8c (patch) | |
| tree | 7f73fd869a427fa513e6bd6a1de058f875501384 /arch/arm64/boot | |
| parent | 9205a7ade810783a93d329c662fc0969ecc16afb (diff) | |
| parent | b8084e5b34e83875846053bf9cd951b7640e40fe (diff) | |
| download | linux-0ac01488315bac92de1b2086d87607b7ef798e8c.tar.gz linux-0ac01488315bac92de1b2086d87607b7ef798e8c.tar.bz2 linux-0ac01488315bac92de1b2086d87607b7ef798e8c.zip | |
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>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3368.dtsi | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts b/arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts index eed6d3c775ce..8a5275f0539b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts @@ -104,8 +104,8 @@ 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 @@ vccio_sd: REG5 { regulator-name = "VCCIO_SD"; - regulator-min-microvolt = <3300000>; + regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index 61ca1abde947..122777b1441e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -579,6 +579,12 @@ 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 @@ 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>; }; |