From d901f21180246b49e963743ddbcd916e1c1fd187 Mon Sep 17 00:00:00 2001 From: Elaine Zhang Date: Fri, 18 May 2018 15:50:30 +0800 Subject: [PATCH] ARM: dts: rk3288: mark xin32k clk as fixed clk Change-Id: I1fc9c2f8213f6645659bd731546ca9cafd7d63d0 Signed-off-by: Elaine Zhang --- arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-rk808-linux.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-evb-rk808.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-fennec.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-firefly-rk808.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-miniarm.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-phycore-som.dtsi | 9 ++++++++- arch/arm/boot/dts/rk3288-popmetal-android-vga.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-popmetal-android.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-popmetal.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-th804.dts | 9 ++++++++- arch/arm/boot/dts/rk3288-veyron.dtsi | 9 ++++++++- arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts | 9 ++++++++- 18 files changed, 144 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dts index 34747d4bc0ad..19a1a042bec8 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dts @@ -79,6 +79,13 @@ regulator-always-on; regulator-boot-on; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -166,7 +173,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts index 0319415ceda5..ad5020357730 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts @@ -78,6 +78,13 @@ regulator-name = "vcc_lcd"; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -172,7 +179,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts index fdfa2805c19f..70bc513743c7 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts @@ -78,6 +78,13 @@ regulator-name = "vcc_lcd"; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -142,7 +149,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts index a3cf184eabc6..82436bc65783 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts @@ -78,6 +78,13 @@ regulator-name = "vcc_lcd"; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -171,7 +178,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts index 6ff4b2b0d5a4..73d04fd9671b 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts @@ -78,6 +78,13 @@ regulator-name = "vcc_lcd"; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -121,7 +128,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts index d67ca12d99c0..25bb3a1d5dc5 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts @@ -78,6 +78,13 @@ regulator-name = "vcc_lcd"; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -126,7 +133,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts index 397d46b7e65b..d40270752a40 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts @@ -140,6 +140,13 @@ regulator-always-on; regulator-boot-on; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -191,7 +198,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts index 4f3366d8415b..e2d4dff27ad7 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk808.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts @@ -67,6 +67,13 @@ */ reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -90,7 +97,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts index 3e02e5897a60..d346149243a8 100644 --- a/arch/arm/boot/dts/rk3288-fennec.dts +++ b/arch/arm/boot/dts/rk3288-fennec.dts @@ -138,6 +138,13 @@ regulator-always-on; }; + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; + wireless-bluetooth { compatible = "bluetooth-platdata"; uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>; @@ -232,7 +239,7 @@ interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; pinctrl-names = "default"; pinctrl-0 = <&pmic_int &global_pwroff>; rockchip,system-power-controller; diff --git a/arch/arm/boot/dts/rk3288-firefly-rk808.dts b/arch/arm/boot/dts/rk3288-firefly-rk808.dts index f109e90967c2..bc8a5ddb6cd3 100644 --- a/arch/arm/boot/dts/rk3288-firefly-rk808.dts +++ b/arch/arm/boot/dts/rk3288-firefly-rk808.dts @@ -179,6 +179,13 @@ pinctrl-0 = <&uart2_xfer>; }; + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; + vccadc_ref: vccadc-ref { compatible = "regulator-fixed"; regulator-name = "vcc1v8_sys"; @@ -406,7 +413,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; vcc3-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index a1744fb3a570..a5c5300797ab 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -191,6 +191,13 @@ clock-output-names = "CLK_CAMERA_25MHZ"; #clock-cells = <0>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -261,7 +268,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rk3288-phycore-som.dtsi index 9abfcad395b3..8b4922ff8b37 100644 --- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi +++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi @@ -108,6 +108,13 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -213,7 +220,7 @@ rk818: pmic@1c { compatible = "rockchip,rk818"; reg = <0x1c>; - clock-output-names = "xin32k"; + clock-output-names = "rk818-clkout1"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts index edb427795c68..0d10abb99d1c 100644 --- a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts +++ b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts @@ -198,6 +198,13 @@ regulator-always-on; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -298,7 +305,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-popmetal-android.dts b/arch/arm/boot/dts/rk3288-popmetal-android.dts index c57138334635..d207e33dd373 100644 --- a/arch/arm/boot/dts/rk3288-popmetal-android.dts +++ b/arch/arm/boot/dts/rk3288-popmetal-android.dts @@ -159,6 +159,13 @@ regulator-always-on; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -275,7 +282,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts index f9b023bfe647..773756faf516 100644 --- a/arch/arm/boot/dts/rk3288-popmetal.dts +++ b/arch/arm/boot/dts/rk3288-popmetal.dts @@ -140,6 +140,13 @@ regulator-always-on; vin-supply = <&vcc_io>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -217,7 +224,7 @@ rockchip,system-power-controller; wakeup-source; #clock-cells = <1>; - clock-output-names = "xin32k", "rk808-clkout2"; + clock-output-names = "rk808-clkout1", "rk808-clkout2"; vcc1-supply = <&vcc_sys>; vcc2-supply = <&vcc_sys>; diff --git a/arch/arm/boot/dts/rk3288-th804.dts b/arch/arm/boot/dts/rk3288-th804.dts index d23fe458b652..5f9082e35731 100644 --- a/arch/arm/boot/dts/rk3288-th804.dts +++ b/arch/arm/boot/dts/rk3288-th804.dts @@ -32,6 +32,13 @@ vin-supply = <&vcc_sys>; }; + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk818 1>; @@ -134,7 +141,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 066267bbe878..c7b47085c81a 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -124,6 +124,13 @@ regulator-boot-on; vin-supply = <&vcc_5v>; }; + + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; }; &cpu0 { @@ -159,7 +166,7 @@ rk808: pmic@1b { compatible = "rockchip,rk808"; reg = <0x1b>; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk808-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts b/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts index 1c3fb47b1f03..5b159c9156b5 100644 --- a/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts +++ b/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts @@ -74,6 +74,13 @@ status = "okay"; }; + xin32k: xin32k { + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + #clock-cells = <0>; + }; + }; &cpu0 { @@ -113,7 +120,7 @@ reg = <0x1c>; status = "okay"; - clock-output-names = "xin32k", "wifibt_32kin"; + clock-output-names = "rk818-clkout1", "wifibt_32kin"; interrupt-parent = <&gpio0>; interrupts = <4 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default";