Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2a05e333c2cee711c828d79300010b721c81574f

Authored by Holger Brunck
Committed by Kumar Gala
1 parent 37caf9f2a1
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

powerpc/82xx: updates for mgcoge 

Add:
 - Setup dts node for USB
 - pin description and setup for SMC1 (serial interface)

Update and cleanup mgcoge_defconfig:
- enable: TIPC, UBIFS, USB_GADGET driver, SQUASHFS, HIGHRES timers
          POSIX_MQUEUE, EMBEDDED
- disable: EXT3, PPC_PMAC

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Showing 3 changed files with 29 additions and 11 deletions Side-by-side Diff

arch/powerpc/boot/dts/mgcoge.dts
Diff comments   View file @ 2a05e33
... ... @@ -213,6 +213,15 @@
213 213 linux,network-index = <2>;
214 214 fsl,cpm-command = <0x16200300>;
215 215 };
  216 +
  217 + usb@11b60 {
  218 + compatible = "fsl,mpc8272-cpm-usb";
  219 + mode = "peripheral";
  220 + reg = <0x11b60 0x40 0x8b00 0x100>;
  221 + interrupts = <11 8>;
  222 + interrupt-parent = <&PIC>;
  223 + usb-clock = <5>;
  224 + };
216 225 };
217 226  
218 227 cpm2_pio_c: gpio-controller@10d40 {
arch/powerpc/configs/mgcoge_defconfig
Diff comments   View file @ 2a05e33
  1 +CONFIG_EXPERIMENTAL=y
  2 +# CONFIG_SWAP is not set
1 3 CONFIG_SYSVIPC=y
  4 +CONFIG_POSIX_MQUEUE=y
2 5 CONFIG_SPARSE_IRQ=y
3 6 CONFIG_IKCONFIG=y
4 7 CONFIG_IKCONFIG_PROC=y
5 8 CONFIG_LOG_BUF_SHIFT=14
6 9 CONFIG_BLK_DEV_INITRD=y
7   -CONFIG_EXPERT=y
  10 +# CONFIG_RD_GZIP is not set
8 11 CONFIG_KALLSYMS_ALL=y
  12 +# CONFIG_PCSPKR_PLATFORM is not set
  13 +CONFIG_EMBEDDED=y
9 14 CONFIG_SLAB=y
10 15 # CONFIG_IOSCHED_CFQ is not set
  16 +# CONFIG_PPC_PMAC is not set
11 17 CONFIG_PPC_82xx=y
12 18 CONFIG_MGCOGE=y
  19 +CONFIG_HIGH_RES_TIMERS=y
13 20 CONFIG_BINFMT_MISC=y
14 21 # CONFIG_SECCOMP is not set
15 22 CONFIG_NET=y
16 23  
... ... @@ -24,11 +31,10 @@
24 31 # CONFIG_INET_LRO is not set
25 32 # CONFIG_IPV6 is not set
26 33 CONFIG_NETFILTER=y
  34 +CONFIG_TIPC=y
27 35 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28 36 # CONFIG_FW_LOADER is not set
29 37 CONFIG_MTD=y
30   -CONFIG_MTD_CONCAT=y
31   -CONFIG_MTD_PARTITIONS=y
32 38 CONFIG_MTD_CMDLINE_PARTS=y
33 39 CONFIG_MTD_CHAR=y
34 40 CONFIG_MTD_BLKDEVS=y
... ... @@ -42,7 +48,6 @@
42 48 CONFIG_PROC_DEVICETREE=y
43 49 CONFIG_BLK_DEV_LOOP=y
44 50 CONFIG_BLK_DEV_RAM=y
45   -# CONFIG_MACINTOSH_DRIVERS is not set
46 51 CONFIG_NETDEVICES=y
47 52 CONFIG_FIXED_PHY=y
48 53 CONFIG_NET_ETHERNET=y
... ... @@ -50,6 +55,7 @@
50 55 CONFIG_FS_ENET_MDIO_FCC=y
51 56 # CONFIG_NETDEV_1000 is not set
52 57 # CONFIG_NETDEV_10000 is not set
  58 +# CONFIG_WLAN is not set
53 59 # CONFIG_INPUT is not set
54 60 # CONFIG_SERIO is not set
55 61 # CONFIG_VT is not set
56 62  
57 63  
58 64  
59 65  
... ... @@ -57,24 +63,24 @@
57 63 CONFIG_SERIAL_CPM_CONSOLE=y
58 64 CONFIG_I2C=y
59 65 CONFIG_I2C_CHARDEV=y
60   -# CONFIG_I2C_POWERMAC is not set
61 66 CONFIG_I2C_CPM=y
62 67 # CONFIG_HWMON is not set
63   -# CONFIG_USB_SUPPORT is not set
  68 +CONFIG_USB_GADGET=y
  69 +CONFIG_USB_FSL_USB2=y
  70 +CONFIG_USB_G_SERIAL=y
  71 +CONFIG_UIO=y
  72 +CONFIG_UIO_PDRV=y
64 73 CONFIG_EXT2_FS=y
65   -CONFIG_EXT3_FS=y
66   -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
67   -# CONFIG_EXT3_FS_XATTR is not set
68 74 CONFIG_AUTOFS4_FS=y
69 75 CONFIG_PROC_KCORE=y
70 76 CONFIG_TMPFS=y
71 77 CONFIG_JFFS2_FS=y
72 78 CONFIG_CRAMFS=y
  79 +CONFIG_SQUASHFS=y
73 80 CONFIG_NFS_FS=y
74 81 CONFIG_NFS_V3=y
75 82 CONFIG_ROOT_NFS=y
76 83 CONFIG_PARTITION_ADVANCED=y
77   -# CONFIG_MAC_PARTITION is not set
78 84 CONFIG_NLS=y
79 85 CONFIG_NLS_CODEPAGE_437=y
80 86 CONFIG_NLS_ASCII=y
... ... @@ -82,7 +88,6 @@
82 88 CONFIG_NLS_UTF8=y
83 89 CONFIG_MAGIC_SYSRQ=y
84 90 CONFIG_DEBUG_FS=y
85   -CONFIG_DEBUG_KERNEL=y
86 91 # CONFIG_SCHED_DEBUG is not set
87 92 CONFIG_DEBUG_INFO=y
88 93 CONFIG_SYSCTL_SYSCALL_CHECK=y
arch/powerpc/platforms/82xx/km82xx.c
Diff comments   View file @ 2a05e33
... ... @@ -49,6 +49,9 @@
49 49 };
50 50  
51 51 static __initdata struct cpm_pin km82xx_pins[] = {
  52 + /* SMC1 */
  53 + {2, 4, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
  54 + {2, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
52 55  
53 56 /* SMC2 */
54 57 {0, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
... ... @@ -137,6 +140,7 @@
137 140 }
138 141  
139 142 cpm2_smc_clk_setup(CPM_CLK_SMC2, CPM_BRG8);
  143 + cpm2_smc_clk_setup(CPM_CLK_SMC1, CPM_BRG7);
140 144 cpm2_clk_setup(CPM_CLK_SCC1, CPM_CLK11, CPM_CLK_RX);
141 145 cpm2_clk_setup(CPM_CLK_SCC1, CPM_CLK11, CPM_CLK_TX);
142 146 cpm2_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_RTX);