i2c: drivers: Use generic definitions for bus frequencies (90224e64) · Commits · 戴 / test

drivers/i2c/busses/i2c-altera.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ static void altr_i2c_init(struct altr_i2c_dev *idev)
		(ALTR_I2C_THRESHOLD << ALTR_I2C_CTRL_TCT_SHFT);
		u32 t_high, t_low;

		if (idev->bus_clk_rate <= 100000) {
		if (idev->bus_clk_rate <= I2C_MAX_STANDARD_MODE_FREQ) {
		tmp &= ~ALTR_I2C_CTRL_BSPEED;
		/* Standard mode SCL 50/50 */
		t_high = divisor * 1 / 2;
		@@ -423,10 +423,10 @@ static int altr_i2c_probe(struct platform_device *pdev)
		&idev->bus_clk_rate);
		if (val) {
		dev_err(&pdev->dev, "Default to 100kHz\n");
		idev->bus_clk_rate = 100000; /* default clock rate */
		idev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ; /* default clock rate */
		}

		if (idev->bus_clk_rate > 400000) {
		if (idev->bus_clk_rate > I2C_MAX_FAST_MODE_FREQ) {
		dev_err(&pdev->dev, "invalid clock-frequency %d\n",
		idev->bus_clk_rate);
		return -EINVAL;

drivers/i2c/busses/i2c-amd-mp2-plat.c

+16 −11

Original line number	Diff line number	Diff line
		@@ -201,32 +201,37 @@ static int i2c_amd_resume(struct amd_i2c_common *i2c_common)
		}
		#endif

		static const u32 supported_speeds[] = {
		I2C_MAX_HIGH_SPEED_MODE_FREQ,
		I2C_MAX_TURBO_MODE_FREQ,
		I2C_MAX_FAST_MODE_PLUS_FREQ,
		I2C_MAX_FAST_MODE_FREQ,
		I2C_MAX_STANDARD_MODE_FREQ,
		};

		static enum speed_enum i2c_amd_get_bus_speed(struct platform_device *pdev)
		{
		u32 acpi_speed;
		int i;
		static const u32 supported_speeds[] = {
		0, 100000, 400000, 1000000, 1400000, 3400000
		};

		acpi_speed = i2c_acpi_find_bus_speed(&pdev->dev);
		/* round down to the lowest standard speed */
		for (i = 1; i < ARRAY_SIZE(supported_speeds); i++) {
		if (acpi_speed < supported_speeds[i])
		for (i = 0; i < ARRAY_SIZE(supported_speeds); i++) {
		if (acpi_speed >= supported_speeds[i])
		break;
		}
		acpi_speed = supported_speeds[i - 1];
		acpi_speed = i < ARRAY_SIZE(supported_speeds) ? supported_speeds[i] : 0;

		switch (acpi_speed) {
		case 100000:
		case I2C_MAX_STANDARD_MODE_FREQ:
		return speed100k;
		case 400000:
		case I2C_MAX_FAST_MODE_FREQ:
		return speed400k;
		case 1000000:
		case I2C_MAX_FAST_MODE_PLUS_FREQ:
		return speed1000k;
		case 1400000:
		case I2C_MAX_TURBO_MODE_FREQ:
		return speed1400k;
		case 3400000:
		case I2C_MAX_HIGH_SPEED_MODE_FREQ:
		return speed3400k;
		default:
		return speed400k;

drivers/i2c/busses/i2c-aspeed.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -997,7 +997,7 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev)
		if (ret < 0) {
		dev_err(&pdev->dev,
		"Could not read bus-frequency property\n");
		bus->bus_frequency = 100000;
		bus->bus_frequency = I2C_MAX_STANDARD_MODE_FREQ;
		}

		match = of_match_node(aspeed_i2c_bus_of_table, pdev->dev.of_node);

drivers/i2c/busses/i2c-axxia.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ static int axxia_i2c_init(struct axxia_i2c_dev *idev)
		/* Enable Master Mode */
		writel(0x1, idev->base + GLOBAL_CONTROL);

		if (idev->bus_clk_rate <= 100000) {
		if (idev->bus_clk_rate <= I2C_MAX_STANDARD_MODE_FREQ) {
		/* Standard mode SCL 50/50, tSU:DAT = 250 ns */
		t_high = divisor * 1 / 2;
		t_low = divisor * 1 / 2;
		@@ -765,7 +765,7 @@ static int axxia_i2c_probe(struct platform_device *pdev)

		of_property_read_u32(np, "clock-frequency", &idev->bus_clk_rate);
		if (idev->bus_clk_rate == 0)
		idev->bus_clk_rate = 100000; /* default clock rate */
		idev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ; /* default clock rate */

		ret = clk_prepare_enable(idev->i2c_clk);
		if (ret) {

drivers/i2c/busses/i2c-bcm-iproc.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -858,25 +858,25 @@ static int bcm_iproc_i2c_cfg_speed(struct bcm_iproc_i2c_dev *iproc_i2c)
		if (ret < 0) {
		dev_info(iproc_i2c->device,
		"unable to interpret clock-frequency DT property\n");
		bus_speed = 100000;
		bus_speed = I2C_MAX_STANDARD_MODE_FREQ;
		}

		if (bus_speed < 100000) {
		if (bus_speed < I2C_MAX_STANDARD_MODE_FREQ) {
		dev_err(iproc_i2c->device, "%d Hz bus speed not supported\n",
		bus_speed);
		dev_err(iproc_i2c->device,
		"valid speeds are 100khz and 400khz\n");
		return -EINVAL;
		} else if (bus_speed < 400000) {
		bus_speed = 100000;
		} else if (bus_speed < I2C_MAX_FAST_MODE_FREQ) {
		bus_speed = I2C_MAX_STANDARD_MODE_FREQ;
		} else {
		bus_speed = 400000;
		bus_speed = I2C_MAX_FAST_MODE_FREQ;
		}

		iproc_i2c->bus_speed = bus_speed;
		val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET);
		val &= ~BIT(TIM_CFG_MODE_400_SHIFT);
		val \|= (bus_speed == 400000) << TIM_CFG_MODE_400_SHIFT;
		val \|= (bus_speed == I2C_MAX_FAST_MODE_FREQ) << TIM_CFG_MODE_400_SHIFT;
		iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val);

		dev_info(iproc_i2c->device, "bus set to %u Hz\n", bus_speed);
		@@ -1029,7 +1029,7 @@ static int bcm_iproc_i2c_resume(struct device *dev)
		/* configure to the desired bus speed */
		val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET);
		val &= ~BIT(TIM_CFG_MODE_400_SHIFT);
		val \|= (iproc_i2c->bus_speed == 400000) << TIM_CFG_MODE_400_SHIFT;
		val \|= (iproc_i2c->bus_speed == I2C_MAX_FAST_MODE_FREQ) << TIM_CFG_MODE_400_SHIFT;
		iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val);

		bcm_iproc_i2c_enable_disable(iproc_i2c, true);

Admin message