diff options
author | Olof Johansson <olof@lixom.net> | 2015-12-22 22:07:11 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-12-22 22:07:11 +0100 |
commit | 84658cbde8e3a7ef36f75a12929d49fedc0eff8c (patch) | |
tree | ed55861a6c35a98f4b70f26c2895e7573bc19112 /arch/arm/boot/dts/rk3188.dtsi | |
parent | Merge tag 'lpc18xx_dts_for_4.5' of https://github.com/manabian/linux-lpc into... (diff) | |
parent | ARM: dts: rockchip: add the kylin board for rk3036 (diff) | |
download | linux-84658cbde8e3a7ef36f75a12929d49fedc0eff8c.tar.xz linux-84658cbde8e3a7ef36f75a12929d49fedc0eff8c.zip |
Merge tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board,
support for the efuses on Rockchip socs and some improvements for
rk3288 regulators.
* tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add the kylin board for rk3036
ARM: dts: rockchip: add the sdio/sdmmc node for rk3036
ARM: dts: rockchip: fix the pinctrl bias settings for rk3036
ARM: dts: rockchip: add eFuse node for rk3188 SoCs
ARM: dts: rockchip: add eFuse node for rk3066a SoCs
ARM: dts: rockchip: add eFuse config of rk3288 SoC
ARM: dts: rockchip: add rk3228-evb board
ARM: dts: rockchip: add core rk3228 dtsi
clk: rockchip: Add the clock ids of rk3288 eFuses
ARM: dts: rockchip: Fix typo in rk3288 sdmmc card detect pin name
ARM: dts: rockchip: fix voltage ranges for rk3288-evb-act8846 board
ARM: dts: rockchip: move the public part to rk3288-evb common
ARM: dts: rockchip: add 2 regulators for rk3288-evb-act8846
ARM: dts: rockchip: correct the name of REG8 for rk3288-evb-act8846
clk: rockchip: add dt-binding header for rk3228
clk: rockchip: add id for mipidsi sclk on rk3288
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/rk3188.dtsi')
-rw-r--r-- | arch/arm/boot/dts/rk3188.dtsi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 42a67d8fe129..348d46b7ada5 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -146,6 +146,19 @@ #reset-cells = <1>; }; + efuse: efuse@20010000 { + compatible = "rockchip,rockchip-efuse"; + reg = <0x20010000 0x4000>; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&cru PCLK_EFUSE>; + clock-names = "pclk_efuse"; + + cpu_leakage: cpu_leakage { + reg = <0x17 0x1>; + }; + }; + usbphy: phy { compatible = "rockchip,rk3188-usb-phy", "rockchip,rk3288-usb-phy"; rockchip,grf = <&grf>; |