Module Name: src
Committed By: jmcneill
Date: Tue Dec 22 22:12:08 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_i2c.c tegra_var.h
Log Message:
tegra_car_* and tegra_i2c_dvc_write are no more
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra_i2c.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/nvidia/tegra_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.11 src/sys/arch/arm/nvidia/tegra_i2c.c:1.12
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.11 Tue Dec 22 22:10:36 2015
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Tue Dec 22 22:12:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.11 2015/12/22 22:10:36 jmcneill Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.12 2015/12/22 22:12:08 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.11 2015/12/22 22:10:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.12 2015/12/22 22:12:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -493,20 +493,3 @@ tegra_i2c_read(struct tegra_i2c_softc *s
return tegra_i2c_wait(sc, flags);
}
-
-void
-tegra_i2c_dvc_write(uint8_t addr, uint32_t data, size_t datalen)
-{
- bus_space_tag_t bst = &armv7_generic_bs_tag;
- bus_space_handle_t bsh;
-
- bus_space_subregion(bst, tegra_apb_bsh, TEGRA_I2C5_OFFSET,
- TEGRA_I2C5_SIZE, &bsh);
-
- bus_space_write_4(bst, bsh, I2C_CMD_ADDR0_REG, addr << 1);
- bus_space_write_4(bst, bsh, I2C_CMD_DATA1_REG, data);
- bus_space_write_4(bst, bsh, I2C_CNFG_REG,
- __SHIFTIN(datalen - 1, I2C_CNFG_LENGTH) |
- I2C_CNFG_NEW_MASTER_FSM |
- I2C_CNFG_SEND);
-}
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.28 src/sys/arch/arm/nvidia/tegra_var.h:1.29
--- src/sys/arch/arm/nvidia/tegra_var.h:1.28 Sat Nov 21 22:55:32 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Tue Dec 22 22:12:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_var.h,v 1.28 2015/11/21 22:55:32 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.29 2015/12/22 22:12:08 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -88,33 +88,6 @@ void tegra_bootstrap(void);
void tegra_dma_bootstrap(psize_t);
void tegra_cpuinit(void);
-u_int tegra_car_osc_rate(void);
-u_int tegra_car_pllc_rate(void);
-u_int tegra_car_plle_rate(void);
-u_int tegra_car_pllx_rate(void);
-void tegra_car_pllx_set_rate(u_int, u_int, u_int);
-u_int tegra_car_pllu_rate(void);
-u_int tegra_car_pllp0_rate(void);
-u_int tegra_car_plld2_rate(void);
-u_int tegra_car_uart_rate(u_int);
-u_int tegra_car_periph_sdmmc_rate(u_int);
-int tegra_car_periph_sdmmc_set_rate(u_int, u_int);
-int tegra_car_periph_usb_enable(u_int);
-void tegra_car_periph_hda_enable(void);
-void tegra_car_periph_sata_enable(void);
-int tegra_car_periph_i2c_enable(u_int, u_int);
-void tegra_car_periph_cec_enable(void);
-void tegra_car_utmip_init(void);
-void tegra_car_utmip_enable(u_int);
-void tegra_car_hdmi_enable(u_int);
-int tegra_car_dc_enable(u_int);
-void tegra_car_host1x_enable(void);
-void tegra_car_wdt_enable(u_int, bool);
-void tegra_car_gpu_enable(void);
-void tegra_car_fuse_enable(void);
-void tegra_car_fuse_disable(void);
-void tegra_car_soctherm_enable(void);
-
struct tegra_gpio_pin;
struct tegra_gpio_pin *tegra_gpio_acquire(const char *, u_int);
void tegra_gpio_release(struct tegra_gpio_pin *);
@@ -147,8 +120,6 @@ void tegra_pmc_power(u_int, bool);
void tegra_pmc_remove_clamping(u_int);
void tegra_pmc_hdmi_enable(void);
-void tegra_i2c_dvc_write(uint8_t, uint32_t, size_t);
-
psize_t tegra_mc_memsize(void);
uint32_t tegra_fuse_read(u_int);
