diff --git a/arch/arm/boot/dts/omap4-samsung-espresso10.dts b/arch/arm/boot/dts/omap4-samsung-espresso10.dts index b80dbea98bc22b..79c1e85669e7fa 100644 --- a/arch/arm/boot/dts/omap4-samsung-espresso10.dts +++ b/arch/arm/boot/dts/omap4-samsung-espresso10.dts @@ -1,114 +1,104 @@ /dts-v1/; - +#include "gpio.h" #include "omap443x.dtsi" / { - model = "Samsung Galaxy Tab 2"; - compatible = "samsung,espresso10", "ti,omap4430", "ti,omap4"; - + model = "Samsung Galaxy Tab 2"; + compatible = "samsung,espresso10", "ti,omap4430", "ti,omap4"; + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x40000000>; /* 1 GB */ - }; - - + }; + + reserved-memory { #address-cells = <1>; #size-cells = <1>; ranges; ramoops_region@A0000000 { - no-map; - + no-map; + reg = <0xA0000000 0x200000>; - + }; + continuous_splash: framebuffer@bef00000{ //The framebuffer address is specific to your device! reg = <0xbef00000 (1024 * 600 * 4)>; no-map; - }; }; - + }; + chosen { #address-cells = <1>; #size-cells = <1>; ranges; - - framebuffer0: framebuffer@bef00000 { - compatible = "simple-framebuffer"; - reg = <0xbef00000 (1024 * 600 * 4)>; - width = <1024>; - height = <600>; - stride = <(4096)>; - format = "x8r8g8b8"; - status = "okay"; - }; - }; + }; reg_touch_ldo_en: regulator-touch-ldo-en { - compatible = "regulator-fixed"; + compatible = "regulator-fixed"; regulator-name = "touch_ldo_en"; - gpios = <&gpio2 22 0>; + gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; regulator-always-on; enable-active-high; - }; - - + }; + reg_lcd: regulator-lcd { - compatible = "regulator-fixed"; - regulator-name = "lcd_en"; - gpios = <&gpio5 7 0>; - enable-active-high; - //regulator-always-on; - regulator-boot-on; - }; - + compatible = "regulator-fixed"; + regulator-name = "lcd_en"; + gpios = <&gpio5 7 GPIO_ACTIVE_HIGH>; + enable-active-high; + //regulator-always-on; + regulator-boot-on; + }; + pwm10: dmtimer-pwm-10 { pinctrl-names = "default"; pinctrl-0 = <&pwm10_default>; - + compatible = "ti,omap-dmtimer-pwm"; #pwm-cells = <3>; ti,timers = <&timer10>; ti,clock-source = <0x01>; }; - backlight { - compatible = "pwm-backlight"; - pinctrl-names = "default"; + backlight: backlight { + compatible = "pwm-backlight"; + pinctrl-names = "default"; pinctrl-0 = <&backlight_pins>; - pwms = <&pwm10 0 5000000 0>; - power-supply = <®_lcd>; - enable-gpios = <&gpio3 31 0>; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <7>; - }; - - bridge { - compatible = "doestek,dtc34lm85am"; - enable-gpios = <&gpio5 8 0>; - vdd-supply = <®_lcd>; - ports { - - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - bridge_in: endpoint { - remote-endpoint = <&dpi_out>; - }; - }; - - port@1 { - reg = <1>; - bridge_out: endpoint { - remote-endpoint = <&panel_in>; - }; - }; - - }; - }; + pwms = <&pwm10 0 5000000 0>; + power-supply = <®_lcd>; + enable-gpios = <&gpio3 31 0>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + }; + + lvds-encoder { + compatible = "lvds-encoder", "doestek,dtc34lm85am"; + powerdown-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; + power-supply = <®_lcd>; + ports { + + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + bridge_in: endpoint { + remote-endpoint = <&dpi_out>; + }; + }; + + port@1 { + reg = <1>; + bridge_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + + }; + }; panel { compatible ="samsung,ltn070nl01", "panel-lvds"; @@ -116,19 +106,24 @@ width-mm = <154>; height-mm = <90>; data-mapping = "jeida-24"; + backlight = <&backlight>; panel-timing { - clock-frequency = <56888>; - + clock-frequency = <56888889>; + hback-porch = <210>; hactive = <1024>; hfront-porch = <186>; hsync-len = <50>; - + vback-porch = <11>; vactive = <600>; vfront-porch = <24>; vsync-len = <10>; - + + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; }; port { @@ -137,10 +132,8 @@ }; }; }; - }; &omap4_pmx_core { - pwm10_default: pinmux_pwm10_default { pinctrl-single,pins = < OMAP4_IOPAD(0X0D6, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE1) @@ -155,79 +148,79 @@ i2c1_pins: pinmux_i2c1_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ - OMAP4_IOPAD(0x124, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ + OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ + OMAP4_IOPAD(0x124, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ >; }; - + i2c2_pins: pinmux_i2c2_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */ - OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */ + OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_scl */ + OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c2_sda */ >; }; - + i2c3_pins: pinmux_i2c3_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */ - OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ + OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */ + OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ >; }; - + i2c4_pins: pinmux_i2c4_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x12e, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_scl */ - OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */ + OMAP4_IOPAD(0x12e, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_scl */ + OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */ >; }; mmc2_pins: pinmux_mmc2_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x040, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat0 */ - OMAP4_IOPAD(0x042, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat1 */ - OMAP4_IOPAD(0x044, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat2 */ - OMAP4_IOPAD(0x046, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat3 */ - OMAP4_IOPAD(0x048, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat4 */ - OMAP4_IOPAD(0x04a, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat5 */ - OMAP4_IOPAD(0x04c, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat6 */ - OMAP4_IOPAD(0x04e, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat7 */ - OMAP4_IOPAD(0x082, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_clk */ - OMAP4_IOPAD(0x084, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_cmd */ + OMAP4_IOPAD(0x040, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat0 */ + OMAP4_IOPAD(0x042, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat1 */ + OMAP4_IOPAD(0x044, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat2 */ + OMAP4_IOPAD(0x046, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat3 */ + OMAP4_IOPAD(0x048, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat4 */ + OMAP4_IOPAD(0x04a, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat5 */ + OMAP4_IOPAD(0x04c, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat6 */ + OMAP4_IOPAD(0x04e, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dat7 */ + OMAP4_IOPAD(0x082, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_clk */ + OMAP4_IOPAD(0x084, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_cmd */ >; }; - dss_dpi_pins: pinmux_dss_dpi_pins { + dss_dpi_pins: pinmux_dss_dpi_pins { pinctrl-single,pins = < - OMAP4_IOPAD(0x162, PIN_OUTPUT | MUX_MODE5) /* dispc2_data23 */ - OMAP4_IOPAD(0x164, PIN_OUTPUT | MUX_MODE5) /* dispc2_data22 */ - OMAP4_IOPAD(0x166, PIN_OUTPUT | MUX_MODE5) /* dispc2_data21 */ - OMAP4_IOPAD(0x168, PIN_OUTPUT | MUX_MODE5) /* dispc2_data20 */ - OMAP4_IOPAD(0x16a, PIN_OUTPUT | MUX_MODE5) /* dispc2_data19 */ - OMAP4_IOPAD(0x16c, PIN_OUTPUT | MUX_MODE5) /* dispc2_data18 */ - OMAP4_IOPAD(0x16e, PIN_OUTPUT | MUX_MODE5) /* dispc2_data15 */ - OMAP4_IOPAD(0x170, PIN_OUTPUT | MUX_MODE5) /* dispc2_data14 */ - OMAP4_IOPAD(0x172, PIN_OUTPUT | MUX_MODE5) /* dispc2_data13 */ - OMAP4_IOPAD(0x174, PIN_OUTPUT | MUX_MODE5) /* dispc2_data12 */ - OMAP4_IOPAD(0x176, PIN_OUTPUT | MUX_MODE5) /* dispc2_data11 */ - - OMAP4_IOPAD(0x1b4, PIN_OUTPUT | MUX_MODE5) /* dispc2_data10 */ - OMAP4_IOPAD(0x1b6, PIN_OUTPUT | MUX_MODE5) /* dispc2_data9 */ - OMAP4_IOPAD(0x1b8, PIN_OUTPUT | MUX_MODE5) /* dispc2_data16 */ - OMAP4_IOPAD(0x1ba, PIN_OUTPUT | MUX_MODE5) /* dispc2_data17 */ - OMAP4_IOPAD(0x1bc, PIN_OUTPUT | MUX_MODE5) /* dispc2_hsync */ - OMAP4_IOPAD(0x1be, PIN_OUTPUT | MUX_MODE5) /* dispc2_pclk */ - OMAP4_IOPAD(0x1c0, PIN_OUTPUT | MUX_MODE5) /* dispc2_vsync */ - OMAP4_IOPAD(0x1c2, PIN_OUTPUT | MUX_MODE5) /* dispc2_de */ - OMAP4_IOPAD(0x1c4, PIN_OUTPUT | MUX_MODE5) /* dispc2_data8 */ - OMAP4_IOPAD(0x1c6, PIN_OUTPUT | MUX_MODE5) /* dispc2_data7 */ - OMAP4_IOPAD(0x1c8, PIN_OUTPUT | MUX_MODE5) /* dispc2_data6 */ - OMAP4_IOPAD(0x1ca, PIN_OUTPUT | MUX_MODE5) /* dispc2_data5 */ - OMAP4_IOPAD(0x1cc, PIN_OUTPUT | MUX_MODE5) /* dispc2_data4 */ - OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE5) /* dispc2_data3 */ - - OMAP4_IOPAD(0x1d0, PIN_OUTPUT | MUX_MODE5) /* dispc2_data2 */ - OMAP4_IOPAD(0x1d2, PIN_OUTPUT | MUX_MODE5) /* dispc2_data1 */ - OMAP4_IOPAD(0x1d4, PIN_OUTPUT | MUX_MODE5) /* dispc2_data0 */ + OMAP4_IOPAD(0x162, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data23 */ + OMAP4_IOPAD(0x164, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data22 */ + OMAP4_IOPAD(0x166, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data21 */ + OMAP4_IOPAD(0x168, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data20 */ + OMAP4_IOPAD(0x16a, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data19 */ + OMAP4_IOPAD(0x16c, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data18 */ + OMAP4_IOPAD(0x16e, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data15 */ + OMAP4_IOPAD(0x170, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data14 */ + OMAP4_IOPAD(0x172, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data13 */ + OMAP4_IOPAD(0x174, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data12 */ + OMAP4_IOPAD(0x176, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data11 */ + + OMAP4_IOPAD(0x1b4, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data10 */ + OMAP4_IOPAD(0x1b6, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data9 */ + OMAP4_IOPAD(0x1b8, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data16 */ + OMAP4_IOPAD(0x1ba, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data17 */ + OMAP4_IOPAD(0x1bc, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_hsync */ + OMAP4_IOPAD(0x1be, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_pclk */ + OMAP4_IOPAD(0x1c0, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_vsync */ + OMAP4_IOPAD(0x1c2, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_de */ + OMAP4_IOPAD(0x1c4, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data8 */ + OMAP4_IOPAD(0x1c6, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data7 */ + OMAP4_IOPAD(0x1c8, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data6 */ + OMAP4_IOPAD(0x1ca, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data5 */ + OMAP4_IOPAD(0x1cc, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data4 */ + OMAP4_IOPAD(0x1ce, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data3 */ + + OMAP4_IOPAD(0x1d0, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data2 */ + OMAP4_IOPAD(0x1d2, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data1 */ + OMAP4_IOPAD(0x1d4, PIN_OFF_OUTPUT_LOW | MUX_MODE5) /* dispc2_data0 */ >; }; }; @@ -235,12 +228,12 @@ &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; - + twl: twl@48 { reg = <0x48>; interrupts = ; /* IRQ_SYS_1N cascaded to gic */ }; - + }; &i2c2 { @@ -270,12 +263,12 @@ }; &dss { - status = "ok"; - + status = "okay"; + pinctrl-names = "default"; pinctrl-0 = <&dss_dpi_pins>; - port { //TODO CHECK THIS + port { dpi_out: endpoint { remote-endpoint = <&bridge_in>; data-lines = <24>; @@ -283,8 +276,6 @@ }; }; - - #include "twl6030.dtsi" #include "twl6030_omap4.dtsi" @@ -312,7 +303,7 @@ &mmc2 { pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; - + vmmc-supply = <&vmmc>; ti,non-removable; bus-width = <8>; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 370ff9d0a32880..002e6bd27e34af 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -423,7 +423,7 @@ }; sgx_module: target-module@56000000 { - status="disabled"; + //status="disabled"; compatible = "ti,sysc-omap4", "ti,sysc"; reg = <0x5600fe00 0x4>, <0x5600fe10 0x4>; diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 8c1d04db990d5b..3f0e9a40e56a7c 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -4842,8 +4842,12 @@ struct clk_hw *of_clk_get_hw(struct device_node *np, int index, struct of_phandle_args clkspec; ret = of_parse_clkspec(np, index, con_id, &clkspec); + //printk("ret is %x \n", ret); if (ret) + { + //printk("ret error woohoo! \n"); return ERR_PTR(ret); + } hw = of_clk_get_hw_from_clkspec(&clkspec); of_node_put(clkspec.np); diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 0f2e3fcf0f19f1..dc119c2f0601f1 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -99,13 +99,18 @@ EXPORT_SYMBOL(clk_get_sys); struct clk *clk_get(struct device *dev, const char *con_id) { + //printk("clkdev function \n"); const char *dev_id = dev ? dev_name(dev) : NULL; struct clk_hw *hw; if (dev && dev->of_node) { hw = of_clk_get_hw(dev->of_node, 0, con_id); + //printk("dev and dev0>ofnode \n"); if (!IS_ERR(hw) || PTR_ERR(hw) == -EPROBE_DEFER) + { + //printk("is hw the error?\n"); return clk_hw_create_clk(dev, hw, dev_id, con_id); + } } return __clk_get_sys(dev, dev_id, con_id); diff --git a/drivers/gpu/drm/bridge/simple-bridge.c b/drivers/gpu/drm/bridge/simple-bridge.c index 31e5009618c295..e561dd071b923d 100644 --- a/drivers/gpu/drm/bridge/simple-bridge.c +++ b/drivers/gpu/drm/bridge/simple-bridge.c @@ -5,8 +5,6 @@ * * Maxime Ripard */ -#define DEBUG - #include #include #include @@ -265,17 +263,6 @@ static const struct drm_bridge_timings ti_ths8135_bridge_timings = { .hold_time_ps = 500, }; -/* - * Information taken from the dtc34lm85am datasheet - */ -static const struct drm_bridge_timings dtc34lm85am_bridge_timings = { - /* Timing specifications */ - .input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE, - .setup_time_ps = 2000, - .hold_time_ps = 2000, -}; - - static const struct of_device_id simple_bridge_match[] = { { .compatible = "dumb-vga-dac", @@ -306,13 +293,6 @@ static const struct of_device_id simple_bridge_match[] = { .connector_type = DRM_MODE_CONNECTOR_VGA, }, }, - { - .compatible = "doestek,dtc34lm85am", - .data = &(const struct simple_bridge_info) { - .timings = &dtc34lm85am_bridge_timings, - .connector_type = DRM_MODE_CONNECTOR_LVDS, - }, - }, {}, }; MODULE_DEVICE_TABLE(of, simple_bridge_match); diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 16cf9aca78eaaa..9659f3cc7674dc 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -3295,32 +3295,6 @@ static const struct panel_desc samsung_lsn122dl01_c01 = { }, }; -static const struct drm_display_mode samsung_ltn070nl01_mode = { - .clock = 56888, - .hdisplay = 1024, - .hsync_start = 1024 + 210, // + hbp - .hsync_end = 1024 + 210 + 50, // + hsw - .htotal = 1024 + 210 + 50 + 186, // + hfp - .vdisplay = 600, - .vsync_start = 600 + 11, // + vbp - .vsync_end = 600 + 11 + 10, // + vsw - .vtotal = 600 + 11 + 10 + 24, // + vfp -}; - -static const struct panel_desc samsung_ltn070nl01 = { - .modes = &samsung_ltn070nl01_mode, - .num_modes = 1, - .bpc = 8, - .size = { - .width = 154, - .height = 90, - }, - .bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA, - .bus_flags = DRM_BUS_FLAG_DE_HIGH, - .connector_type = DRM_MODE_CONNECTOR_LVDS, -}; - - static const struct drm_display_mode samsung_ltn101nt05_mode = { .clock = 54030, .hdisplay = 1024, @@ -3338,12 +3312,12 @@ static const struct panel_desc samsung_ltn101nt05 = { .num_modes = 1, .bpc = 6, .size = { - .width = 223, - .height = 125, + .width = 154, + .height = 90, }, .bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG, .bus_flags = DRM_BUS_FLAG_DE_HIGH, - .connector_type = DRM_MODE_CONNECTOR_LVDS, + .connector_type = DRM_MODE_CONNECTOR_DPI, }; static const struct drm_display_mode samsung_ltn140at29_301_mode = { @@ -4297,9 +4271,6 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "samsung,lsn122dl01-c01", .data = &samsung_lsn122dl01_c01, - }, { - .compatible = "samsung,ltn070nl01", - .data = &samsung_ltn070nl01, }, { .compatible = "samsung,ltn101nt05", .data = &samsung_ltn101nt05, diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c index 1bec626d126acb..1ea1ed6da3a02e 100644 --- a/drivers/input/touchscreen/mms114.c +++ b/drivers/input/touchscreen/mms114.c @@ -210,8 +210,8 @@ static irqreturn_t mms114_interrupt(int irq, void *dev_id) goto out; touch_size = packet_size / MMS114_PACKET_NUM; - printk("packet_size %d", packet_size); - printk("touch size %d", touch_size); + //printk("packet_size %d", packet_size); + //printk("touch size %d", touch_size); error = __mms114_read_reg(data, MMS114_INFORMATION, packet_size, (u8 *)touch); if (error < 0)