clk: stm32mp1: no more get ck_usbo_48m in device tree
authorPatrick Delaunay <patrick.delaunay@st.com>
Wed, 30 Jan 2019 12:07:00 +0000 (13:07 +0100)
committerTom Rini <trini@konsulko.com>
Sat, 9 Feb 2019 12:50:55 +0000 (07:50 -0500)
Remove support of ck_usbo_48m clock node in device tree,
but force 48MHz frequency to prepare alignment
with kernel device tree.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
drivers/clk/clk_stm32mp1.c

index b7c5d34fe063dfe54bdde90e8cbbda8fb3be002c..88f453caa8d687471d0cad8b9b62f88dcea4e389 100644 (file)
@@ -241,7 +241,6 @@ enum stm32mp1_parent_id {
        _LSI,
        _LSE,
        _I2S_CKIN,
-       _USB_PHY_48,
        NB_OSC,
 
 /* other parent source */
@@ -273,6 +272,7 @@ enum stm32mp1_parent_id {
        _CK_MPU,
        _CK_MCU,
        _DSI_PHY,
+       _USB_PHY_48,
        _PARENT_NB,
        _UNKNOWN_ID = 0xff,
 };
@@ -1079,7 +1079,7 @@ static ulong stm32mp1_clk_get(struct stm32mp1_clk_priv *priv, int p)
                break;
        /* other */
        case _USB_PHY_48:
-               clock = stm32mp1_clk_get_fixed(priv, _USB_PHY_48);
+               clock = 48000000;
                break;
        case _DSI_PHY:
        {
@@ -1859,7 +1859,7 @@ static void stm32mp1_osc_init(struct udevice *dev)
                [_HSE] = "clk-hse",
                [_CSI] = "clk-csi",
                [_I2S_CKIN] = "i2s_ckin",
-               [_USB_PHY_48] = "ck_usbo_48m"};
+       };
 
        for (i = 0; i < NB_OSC; i++) {
                stm32mp1_osc_clk_init(name[i], priv, i);