修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/sh/boards/mach-kfr2r09/setup.c
..
..
@@ -14,7 +14,6 @@
14
14
 
15
15
 #include <linux/clkdev.h>
16
16
 #include <linux/delay.h>
17
-#include <linux/dma-mapping.h>
18
17
 #include <linux/gpio.h>
19
18
 #include <linux/gpio/machine.h>
20
19
 #include <linux/i2c.h>
..
..
@@ -33,6 +32,7 @@
33
32
 #include <linux/sh_intc.h>
34
33
 #include <linux/usb/r8a66597.h>
35
34
 #include <linux/videodev2.h>
35
+#include <linux/dma-map-ops.h>
36
36
 
37
37
 #include <mach/kfr2r09.h>
38
38
 
..
..
@@ -477,7 +477,7 @@
477
477
 
478
478
 static int __init kfr2r09_devices_setup(void)
479
479
 {
480
-	static struct clk *camera_clk;
480
+	struct clk *camera_clk;
481
481
 
482
482
 	/* register board specific self-refresh code */
483
483
 	sh_mobile_register_self_refresh(SUSP_SH_STANDBY | SUSP_SH_SF |
..
..
@@ -601,11 +601,9 @@
601
601
 
602
602
 	/* Initialize CEU platform device separately to map memory first */
603
603
 	device_initialize(&kfr2r09_ceu_device.dev);
604
-	arch_setup_pdev_archdata(&kfr2r09_ceu_device);
605
604
 	dma_declare_coherent_memory(&kfr2r09_ceu_device.dev,
606
-				    ceu_dma_membase, ceu_dma_membase,
607
-				    ceu_dma_membase + CEU_BUFFER_MEMORY_SIZE - 1,
608
-				    DMA_MEMORY_EXCLUSIVE);
605
+			ceu_dma_membase, ceu_dma_membase,
606
+			CEU_BUFFER_MEMORY_SIZE);
609
607
 
610
608
 	platform_device_add(&kfr2r09_ceu_device);
611
609
 
..
..
@@ -631,7 +629,10 @@
631
629
 	phys_addr_t phys;
632
630
 	phys_addr_t size = CEU_BUFFER_MEMORY_SIZE;
633
631
 
634
-	phys = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_ALLOC_ANYWHERE);
632
+	phys = memblock_phys_alloc(size, PAGE_SIZE);
633
+	if (!phys)
634
+		panic("Failed to allocate CEU memory\n");
635
+
635
636
 	memblock_free(phys, size);
636
637
 	memblock_remove(phys, size);
637
638