in addition,
resolve all the conflicts;
rename all the configs and macros that have a same name in midgard/;
Change-Id: I93a7cf42301a3af43d593965a3eac7fc2aa8276c
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
RK8xx PMICs would do real power off in syscore shutdown, if "pm_power_off"
is not assigned(e.g. PSCI is not enabled), we have to provide a dummy
callback for it, otherwise there comes a halt in Reboot system call:
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
This patch fix issue from:
94a7fc2 mfd: rk808: power off system in syscore shutdown
Change-Id: I099236bbbd7fcb35fe483fb8f08936fd7a75d2db
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
U-Boot fuel gauge may do ocv calibration which would update
rsoc, and it would lead a wrong halt judgement for kernel
fuel gauge driver. So we judege is_initialized firstly.
Change-Id: Ifed343b85d3f7e7a42545fc57efe460338f30e17
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
U-Boot fuel gauge may do ocv calibration which would update
rsoc, and it would lead a wrong halt judgement for kernel
fuel gauge driver. So we judege is_initialized firstly.
Change-Id: I2957c464dfde1dde4b7dd32778d373904209d575
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This patch is add for rockchip i2s/tdm controller.
Change-Id: I428e311402220ff14441c48e13fa51356ced46e8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This adds the necessary data for handling pvtm on the rk3308.
Change-Id: I54860da4aeea2c4c05fec717d73152a69d30a24f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
commit c420c1e4db ("clk: rockchip: Prevent calculating mmc phase
if clock rate is zero") catches one gremlin again for clk-rk3228.c
that the parent of SDMMC phase clock should be sclk_sdmmc0, but not
sclk_sdmmc. However, I don't like the name of sclk_sdmmc0, so I now
rename it to be sclk_sdmmc.
Change-Id: I1cf16aa1c639ce4776347b40a36bde241c800c03
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry-picked from https://patchwork.kernel.org/patch/10298427/)
commit c420c1e4db ("clk: rockchip: Prevent calculating mmc phase if clock rate is zero")
catches some gremlins for clk-rk3328.c that the parents of MMC phase
clock should be clk_{sdmmc, sdio, emmc}, but not sclk_{sdmmc, sdio,
emmc}.
Change-Id: I714d031e33dcbed120bd5c9c514f7a1d65446c18
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry-picked from https://patchwork.kernel.org/patch/10298425/)
The clk_rtc_32k is used as crystal input for wifi & bt device on
rk3308-evb-v10 board, and it should be always enabled.
Reivse the "BT,reset-gpio" to "BT,power-gpio" which the original is not
correspond to BT_REG_ON.
Change-Id: I210e5386d93fdd3004f483ab877e590f42e7ef83
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
If rtc_32k pin iomux is enabled, the grf_rtc_32k_ioe
needs to be enabled also.
Change-Id: I24d04c09b1190aa0cd323231c2f2e27ae900d200
Signed-off-by: David Wu <david.wu@rock-chips.com>
If hdmi plug in when kernel starting, hdmi may be without output.
Because the old criteria that to determine whether uboot logo is
on is hdmi phy pll locked and hdmi is connected. But in some
platform(such as rk3229), hdmi phy pll is locked even hdmi phy
is power down. In this case, the old criteria is unreliable.
So we add a new criteria that check Frame Composer register.If
the register value is not 0, we think that uboot logo is on,
hdmi has been setup.
Change-Id: Ifaa27030e5f5d551bec8f971694ff5d9c34a7c1d
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Ladder governor is for periodic timer tick, we use menu governor.
Change-Id: Iffb797a801563f6745238a26b2582ea57d6ab0a5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
