diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/aspeed/clk_ast2500.c | 4 | ||||
| -rw-r--r-- | drivers/gpio/db8500_gpio.c | 2 | ||||
| -rw-r--r-- | drivers/net/cpsw-common.c | 2 | ||||
| -rw-r--r-- | drivers/power/regulator/palmas_regulator.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/Makefile | 13 |
5 files changed, 11 insertions, 12 deletions
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c index af369cc..26a5e58 100644 --- a/drivers/clk/aspeed/clk_ast2500.c +++ b/drivers/clk/aspeed/clk_ast2500.c @@ -35,7 +35,7 @@ static ulong ast2500_get_mpll_rate(ulong clkin, u32 mpll_reg) const ulong post_div = (mpll_reg >> SCU_MPLL_POST_SHIFT) & SCU_MPLL_POST_MASK; - return (clkin * ((num + 1) / (denum + 1))) / post_div; + return (clkin * ((num + 1) / (denum + 1))) / (post_div + 1); } /* @@ -50,7 +50,7 @@ static ulong ast2500_get_hpll_rate(ulong clkin, u32 hpll_reg) const ulong post_div = (hpll_reg >> SCU_HPLL_POST_SHIFT) & SCU_HPLL_POST_MASK; - return (clkin * ((num + 1) / (denum + 1))) / post_div; + return (clkin * ((num + 1) / (denum + 1))) / (post_div + 1); } static ulong ast2500_get_clkin(struct ast2500_scu *scu) diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c index db32db6..eefb56d 100644 --- a/drivers/gpio/db8500_gpio.c +++ b/drivers/gpio/db8500_gpio.c @@ -174,7 +174,7 @@ void db8500_gpio_set_output(unsigned gpio, int val) /** * config_pin - configure a pin's mux attributes - * @cfg: pin confguration + * @cfg: pin configuration * * Configures a pin's mode (alternate function or GPIO), its pull up status, * and its sleep mode based on the specified configuration. The @cfg is diff --git a/drivers/net/cpsw-common.c b/drivers/net/cpsw-common.c index aa52503..55f56d9 100644 --- a/drivers/net/cpsw-common.c +++ b/drivers/net/cpsw-common.c @@ -110,7 +110,7 @@ int ti_cm_get_macid(struct udevice *dev, int slave, u8 *mac_addr) if (of_device_is_compatible(dev, "ti,dm816-emac")) return cpsw_am33xx_cm_get_macid(dev, 0x30, slave, mac_addr); - if (of_machine_is_compatible("ti,am4372")) + if (of_machine_is_compatible("ti,am43")) return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr); if (of_machine_is_compatible("ti,dra7")) diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c index cce7cd2..399f7a5 100644 --- a/drivers/power/regulator/palmas_regulator.c +++ b/drivers/power/regulator/palmas_regulator.c @@ -356,7 +356,7 @@ static int palmas_smps_probe(struct udevice *dev) case 8: case 9: case 10: - idx = dev->driver_data - 4; + idx = dev->driver_data - 3; uc_pdata->ctrl_reg = palmas_smps_ctrl[type][idx]; uc_pdata->volt_reg = palmas_smps_volt[type][idx]; break; diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index af39347..b037130 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -10,10 +10,9 @@ #ccflags-y += -DDEBUG -obj-$(CONFIG_DM_PWM) += pwm-uclass.o -obj-$(CONFIG_PWM_ROCKCHIP) += rk_pwm.o -obj-$(CONFIG_PWM_IMX) += pwm-imx.o pwm-imx-util.o -ifdef CONFIG_DM_PWM -obj-$(CONFIG_PWM_TEGRA) += tegra_pwm.o -obj-$(CONFIG_PWM_EXYNOS) += exynos_pwm.o -endif +obj-$(CONFIG_DM_PWM) += pwm-uclass.o + +obj-$(CONFIG_PWM_EXYNOS) += exynos_pwm.o +obj-$(CONFIG_PWM_IMX) += pwm-imx.o pwm-imx-util.o +obj-$(CONFIG_PWM_ROCKCHIP) += rk_pwm.o +obj-$(CONFIG_PWM_TEGRA) += tegra_pwm.o |