projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: dts: rk3288-evb: add earlycon to args of cmdline
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
rk3288-miniarm.dts
diff --git
a/arch/arm/boot/dts/rk3288-miniarm.dts
b/arch/arm/boot/dts/rk3288-miniarm.dts
index e1177dd97dcbc6a59a1c05fd92817a4db39f89ca..eee3820747d68bcb1fbf3a33e97b16d8f42bc33e 100644
(file)
--- a/
arch/arm/boot/dts/rk3288-miniarm.dts
+++ b/
arch/arm/boot/dts/rk3288-miniarm.dts
@@
-111,13
+111,6
@@
regulator-boot-on;
};
regulator-boot-on;
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <&grf>;
-
- sdcard-supply = <&vccio_sd>;
- };
-
/*
* NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
* vcc_io directly. Those boards won't be able to power cycle SD cards
/*
* NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
* vcc_io directly. Those boards won't be able to power cycle SD cards
@@
-165,7
+158,16
@@
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <0>;
- ddc-i2c-bus = <&i2c5>;
+ status = "okay";
+ /* Don't use vopl for HDMI */
+ ports {
+ hdmi_in: port {
+ /delete-node/ endpoint@1;
+ };
+ };
+};
+
+&hevc_service {
status = "okay";
};
status = "okay";
};
@@
-179,7
+181,10
@@
interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
- pinctrl-0 = <&pmic_int &global_pwroff>;
+ pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
+ dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
+ <&gpio0 12 GPIO_ACTIVE_HIGH>;
+
rockchip,system-power-controller;
wakeup-source;
#clock-cells = <1>;
rockchip,system-power-controller;
wakeup-source;
#clock-cells = <1>;
@@
-191,12
+196,12
@@
vcc4-supply = <&vcc_sys>;
vcc6-supply = <&vcc_sys>;
vcc7-supply = <&vcc_sys>;
vcc4-supply = <&vcc_sys>;
vcc6-supply = <&vcc_sys>;
vcc7-supply = <&vcc_sys>;
- vcc8-supply = <&vcc_
18
>;
+ vcc8-supply = <&vcc_
io
>;
vcc9-supply = <&vcc_io>;
vcc10-supply = <&vcc_io>;
vcc11-supply = <&vcc_sys>;
vcc12-supply = <&vcc_io>;
vcc9-supply = <&vcc_io>;
vcc10-supply = <&vcc_io>;
vcc11-supply = <&vcc_sys>;
vcc12-supply = <&vcc_io>;
- vddio-supply = <&vcc
18_ldo1
>;
+ vddio-supply = <&vcc
_io
>;
regulators {
vdd_cpu: DCDC_REG1 {
regulators {
vdd_cpu: DCDC_REG1 {
@@
-205,6
+210,7
@@
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1350000>;
regulator-name = "vdd_arm";
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1350000>;
regulator-name = "vdd_arm";
+ regulator-ramp-delay = <6000>;
regulator-state-mem {
regulator-off-in-suspend;
};
regulator-state-mem {
regulator-off-in-suspend;
};
@@
-364,19
+370,25
@@
status = "okay";
};
status = "okay";
};
-&i2c5 {
+&i2s {
+ #sound-dai-cells = <0>;
status = "okay";
};
status = "okay";
};
-&i2s {
- #sound-dai-cells = <0>;
+&io_domains {
status = "okay";
status = "okay";
+
+ sdcard-supply = <&vccio_sd>;
};
&pwm0 {
status = "okay";
};
};
&pwm0 {
status = "okay";
};
+&rga {
+ status = "okay";
+};
+
&saradc {
vref-supply = <&vcc18_ldo1>;
status ="okay";
&saradc {
vref-supply = <&vcc18_ldo1>;
status ="okay";
@@
-393,7
+405,7
@@
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
status = "okay";
supports-sd;
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
status = "okay";
supports-sd;
- vmmc-supply = <&vcc_sd>;
+ vmmc-supply = <&vcc
33
_sd>;
vqmmc-supply = <&vccio_sd>;
};
vqmmc-supply = <&vccio_sd>;
};
@@
-428,6
+440,7
@@
};
&usb_host0_ehci {
};
&usb_host0_ehci {
+ no-relinquish-port;
status = "okay";
};
status = "okay";
};
@@
-449,13
+462,17
@@
&vopl {
status = "okay";
&vopl {
status = "okay";
+ /* Don't use vopl for HDMI */
+ vopl_out: port {
+ /delete-node/ endpoint@0;
+ };
};
&vopl_mmu {
status = "okay";
};
};
&vopl_mmu {
status = "okay";
};
-&vpu {
+&vpu
_service
{
status = "okay";
};
status = "okay";
};
@@
-495,6
+512,14
@@
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
};
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
};
+
+ dvs_1: dvs-1 {
+ rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+
+ dvs_2: dvs-2 {
+ rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
};
sdmmc {
};
sdmmc {