Skip to content

L
linux
Commit 8739f728 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'v3.20-rockchip-dts1' of... 

Merge tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: soc updates for 3.20" [sic!] from Heiko Stübner:

dts part of core suspend support and limiting of rk3288
sd-card clockspeed to 150mhz

* tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add suspend settings for rk3288-evb-rk808
  ARM: dts: rockchip: add RK3288 suspend support
  ARM: dts: rockchip: set dw_mmc max-freq 150Mhz
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 68f173f5 5963e106
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 1 deletion
arch/arm/boot/dts/rk3288-evb-rk808.dts
View file @ 8739f728
...@@ -31,7 +31,7 @@ rk808: pmic@1b { ...@@ -31,7 +31,7 @@ rk808: pmic@1b {
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int>; pinctrl-0 = <&pmic_int &global_pwroff>;
rockchip,system-power-controller; rockchip,system-power-controller;
wakeup-source; wakeup-source;
#clock-cells = <1>; #clock-cells = <1>;
...@@ -50,6 +50,9 @@ vdd_cpu: DCDC_REG1 { ...@@ -50,6 +50,9 @@ vdd_cpu: DCDC_REG1 {
regulator-min-microvolt = <750000>; regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1350000>; regulator-max-microvolt = <1350000>;
regulator-name = "vdd_arm"; regulator-name = "vdd_arm";
regulator-state-mem {
regulator-off-in-suspend;
};
}; };
vdd_gpu: DCDC_REG2 { vdd_gpu: DCDC_REG2 {
...@@ -58,12 +61,19 @@ vdd_gpu: DCDC_REG2 { ...@@ -58,12 +61,19 @@ vdd_gpu: DCDC_REG2 {
regulator-min-microvolt = <850000>; regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1250000>; regulator-max-microvolt = <1250000>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
};
}; };
vcc_ddr: DCDC_REG3 { vcc_ddr: DCDC_REG3 {
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
regulator-name = "vcc_ddr"; regulator-name = "vcc_ddr";
regulator-state-mem {
regulator-on-in-suspend;
};
}; };
vcc_io: DCDC_REG4 { vcc_io: DCDC_REG4 {
...@@ -72,6 +82,10 @@ vcc_io: DCDC_REG4 { ...@@ -72,6 +82,10 @@ vcc_io: DCDC_REG4 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vcc_io"; regulator-name = "vcc_io";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
};
}; };
vccio_pmu: LDO_REG1 { vccio_pmu: LDO_REG1 {
...@@ -80,6 +94,10 @@ vccio_pmu: LDO_REG1 { ...@@ -80,6 +94,10 @@ vccio_pmu: LDO_REG1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vccio_pmu"; regulator-name = "vccio_pmu";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
};
}; };
vcc_tp: LDO_REG2 { vcc_tp: LDO_REG2 {
...@@ -88,6 +106,9 @@ vcc_tp: LDO_REG2 { ...@@ -88,6 +106,9 @@ vcc_tp: LDO_REG2 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vcc_tp"; regulator-name = "vcc_tp";
regulator-state-mem {
regulator-off-in-suspend;
};
}; };
vdd_10: LDO_REG3 { vdd_10: LDO_REG3 {
...@@ -96,6 +117,10 @@ vdd_10: LDO_REG3 { ...@@ -96,6 +117,10 @@ vdd_10: LDO_REG3 {
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
regulator-name = "vdd_10"; regulator-name = "vdd_10";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
};
}; };
vcc18_lcd: LDO_REG4 { vcc18_lcd: LDO_REG4 {
...@@ -104,6 +129,10 @@ vcc18_lcd: LDO_REG4 { ...@@ -104,6 +129,10 @@ vcc18_lcd: LDO_REG4 {
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-name = "vcc18_lcd"; regulator-name = "vcc18_lcd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
};
}; };
vccio_sd: LDO_REG5 { vccio_sd: LDO_REG5 {
...@@ -112,6 +141,10 @@ vccio_sd: LDO_REG5 { ...@@ -112,6 +141,10 @@ vccio_sd: LDO_REG5 {
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vccio_sd"; regulator-name = "vccio_sd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
};
}; };
vdd10_lcd: LDO_REG6 { vdd10_lcd: LDO_REG6 {
...@@ -120,6 +153,10 @@ vdd10_lcd: LDO_REG6 { ...@@ -120,6 +153,10 @@ vdd10_lcd: LDO_REG6 {
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
regulator-name = "vdd10_lcd"; regulator-name = "vdd10_lcd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
};
}; };
vcc_18: LDO_REG7 { vcc_18: LDO_REG7 {
...@@ -128,6 +165,10 @@ vcc_18: LDO_REG7 { ...@@ -128,6 +165,10 @@ vcc_18: LDO_REG7 {
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-name = "vcc_18"; regulator-name = "vcc_18";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
};
}; };
vcca_codec: LDO_REG8 { vcca_codec: LDO_REG8 {
...@@ -136,18 +177,28 @@ vcca_codec: LDO_REG8 { ...@@ -136,18 +177,28 @@ vcca_codec: LDO_REG8 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vcca_codec"; regulator-name = "vcca_codec";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
};
}; };
vcc_wl: SWITCH_REG1 { vcc_wl: SWITCH_REG1 {
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
regulator-name = "vcc_wl"; regulator-name = "vcc_wl";
regulator-state-mem {
regulator-on-in-suspend;
};
}; };
vcc_lcd: SWITCH_REG2 { vcc_lcd: SWITCH_REG2 {
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
regulator-name = "vcc_lcd"; regulator-name = "vcc_lcd";
regulator-state-mem {
regulator-on-in-suspend;
};
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288.dtsi
View file @ 8739f728
...@@ -151,6 +151,7 @@ timer { ...@@ -151,6 +151,7 @@ timer {
sdmmc: dwmmc@ff0c0000 { sdmmc: dwmmc@ff0c0000 {
compatible = "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3288-dw-mshc";
clock-freq-min-max = <400000 150000000>;
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
clock-names = "biu", "ciu"; clock-names = "biu", "ciu";
fifo-depth = <0x100>; fifo-depth = <0x100>;
...@@ -161,6 +162,7 @@ sdmmc: dwmmc@ff0c0000 { ...@@ -161,6 +162,7 @@ sdmmc: dwmmc@ff0c0000 {
sdio0: dwmmc@ff0d0000 { sdio0: dwmmc@ff0d0000 {
compatible = "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3288-dw-mshc";
clock-freq-min-max = <400000 150000000>;
clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>; clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>;
clock-names = "biu", "ciu"; clock-names = "biu", "ciu";
fifo-depth = <0x100>; fifo-depth = <0x100>;
...@@ -171,6 +173,7 @@ sdio0: dwmmc@ff0d0000 { ...@@ -171,6 +173,7 @@ sdio0: dwmmc@ff0d0000 {
sdio1: dwmmc@ff0e0000 { sdio1: dwmmc@ff0e0000 {
compatible = "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3288-dw-mshc";
clock-freq-min-max = <400000 150000000>;
clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>; clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>;
clock-names = "biu", "ciu"; clock-names = "biu", "ciu";
fifo-depth = <0x100>; fifo-depth = <0x100>;
...@@ -181,6 +184,7 @@ sdio1: dwmmc@ff0e0000 { ...@@ -181,6 +184,7 @@ sdio1: dwmmc@ff0e0000 {
emmc: dwmmc@ff0f0000 { emmc: dwmmc@ff0f0000 {
compatible = "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3288-dw-mshc";
clock-freq-min-max = <400000 150000000>;
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>; clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
clock-names = "biu", "ciu"; clock-names = "biu", "ciu";
fifo-depth = <0x100>; fifo-depth = <0x100>;
...@@ -502,6 +506,11 @@ smp-sram@0 { ...@@ -502,6 +506,11 @@ smp-sram@0 {
}; };
}; };
sram@ff720000 {
compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
reg = <0xff720000 0x1000>;
};
pmu: power-management@ff730000 { pmu: power-management@ff730000 {
compatible = "rockchip,rk3288-pmu", "syscon"; compatible = "rockchip,rk3288-pmu", "syscon";
reg = <0xff730000 0x100>; reg = <0xff730000 0x100>;
...@@ -725,6 +734,24 @@ pcfg_pull_none: pcfg-pull-none { ...@@ -725,6 +734,24 @@ pcfg_pull_none: pcfg-pull-none {
bias-disable; bias-disable;
}; };
sleep {
global_pwroff: global-pwroff {
rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
};
ddrio_pwroff: ddrio-pwroff {
rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
};
ddr0_retention: ddr0-retention {
rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
};
ddr1_retention: ddr1-retention {
rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
};
};
i2c0 { i2c0 {
i2c0_xfer: i2c0-xfer { i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7