From: Stephen Boyd Date: Mon, 4 Jun 2018 19:32:24 +0000 (-0700) Subject: Merge branches 'clk-imx6sx', 'clk-imx7d-enet' and 'clk-aspeed-24' into clk-next X-Git-Tag: v4.18-rc1~79^2~6 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fff2e33717607dcfd9b7c36b244471e3cb271e4b;p=uclinux-h8%2Flinux.git Merge branches 'clk-imx6sx', 'clk-imx7d-enet' and 'clk-aspeed-24' into clk-next * clk-imx6sx: clk: imx6sl: correct ocram_podf clock type clk: imx6sx: disable unnecessary clocks during clock initialization clk: imx6sx: add missing lvds2 clock to the clock tree * clk-imx7d-enet: ARM: dts: imx7: correct enet ipg clock clk: imx7d: correct enet clock CCGR registers clk: imx7d: correct enet phy ref clock gates * clk-aspeed-24: clk: aspeed: Add 24MHz fixed clock --- fff2e33717607dcfd9b7c36b244471e3cb271e4b diff --cc drivers/clk/clk-aspeed.c index eb5fb7f88ccd,5eb50c31e455,5eb50c31e455,466408825406..4d425594999d --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@@@@ -14,10 -14,8 -14,8 -14,8 +14,10 @@@@@ #include --- #define ASPEED_NUM_CLKS 35 +++ #define ASPEED_NUM_CLKS 36 ++ +++#define ASPEED_RESET2_OFFSET 32 + #define ASPEED_RESET_CTRL 0x04 #define ASPEED_CLK_SELECTION 0x08 #define ASPEED_CLK_STOP_CTRL 0x0c @@@@@ -316,30 -306,18 -306,18 -306,18 +316,30 @@@@@ static int aspeed_reset_deassert(struc unsigned long id) { struct aspeed_reset *ar = to_aspeed_reset(rcdev); --- u32 rst = BIT(aspeed_resets[id]); +++ u32 reg = ASPEED_RESET_CTRL; +++ u32 bit = aspeed_resets[id]; + -- return regmap_update_bits(ar->map, ASPEED_RESET_CTRL, rst, 0); +++ if (bit >= ASPEED_RESET2_OFFSET) { +++ bit -= ASPEED_RESET2_OFFSET; +++ reg = ASPEED_RESET_CTRL2; +++ } ++ - return regmap_update_bits(ar->map, ASPEED_RESET_CTRL, rst, 0); +++ return regmap_update_bits(ar->map, reg, BIT(bit), 0); } static int aspeed_reset_assert(struct reset_controller_dev *rcdev, unsigned long id) { struct aspeed_reset *ar = to_aspeed_reset(rcdev); --- u32 rst = BIT(aspeed_resets[id]); +++ u32 reg = ASPEED_RESET_CTRL; +++ u32 bit = aspeed_resets[id]; ++ - return regmap_update_bits(ar->map, ASPEED_RESET_CTRL, rst, rst); +++ if (bit >= ASPEED_RESET2_OFFSET) { +++ bit -= ASPEED_RESET2_OFFSET; +++ reg = ASPEED_RESET_CTRL2; +++ } + -- return regmap_update_bits(ar->map, ASPEED_RESET_CTRL, rst, rst); +++ return regmap_update_bits(ar->map, reg, BIT(bit), BIT(bit)); } static int aspeed_reset_status(struct reset_controller_dev *rcdev,