summaryrefslogtreecommitdiff
path: root/util/pinmap/pm
diff options
context:
space:
mode:
Diffstat (limited to 'util/pinmap/pm')
-rw-r--r--util/pinmap/pm/chip.go2
-rw-r--r--util/pinmap/pm/chip_test.go2
-rw-r--r--util/pinmap/pm/generate.go9
-rw-r--r--util/pinmap/pm/generate_test.go11
-rw-r--r--util/pinmap/pm/pins.go2
-rw-r--r--util/pinmap/pm/reader.go2
-rw-r--r--util/pinmap/pm/reader_test.go2
7 files changed, 14 insertions, 16 deletions
diff --git a/util/pinmap/pm/chip.go b/util/pinmap/pm/chip.go
index a940e7c5fe..9175647c9c 100644
--- a/util/pinmap/pm/chip.go
+++ b/util/pinmap/pm/chip.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/util/pinmap/pm/chip_test.go b/util/pinmap/pm/chip_test.go
index 0bfe601093..1606646588 100644
--- a/util/pinmap/pm/chip_test.go
+++ b/util/pinmap/pm/chip_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/util/pinmap/pm/generate.go b/util/pinmap/pm/generate.go
index 835206ad7b..629aeaee15 100644
--- a/util/pinmap/pm/generate.go
+++ b/util/pinmap/pm/generate.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -17,7 +17,7 @@ type lineName struct {
name string // Pin name
}
-const header = `/* Copyright %d The Chromium OS Authors. All rights reserved.
+const header = `/* Copyright %d The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
@@ -87,7 +87,6 @@ func adcConfig(out io.Writer, pin *Pin, chip Chip) {
}
lc := strings.ToLower(pin.Signal)
fmt.Fprintf(out, "\t\tadc_%s: %s {\n", lc, lc)
- fmt.Fprintf(out, "\t\t\tlabel = \"%s\";\n", pin.Signal)
if len(pin.Enum) > 0 {
fmt.Fprintf(out, "\t\t\tenum-name = \"%s\";\n", pin.Enum)
}
@@ -153,7 +152,7 @@ func i2cConfig(out io.Writer, pin *Pin, chip Chip) {
fmt.Fprintf(out, "\t\ti2c_%s: %s {\n", lc, lc)
fmt.Fprintf(out, "\t\t\ti2c-port = <&%s>;\n", c)
if len(pin.Enum) > 0 {
- fmt.Fprintf(out, "\t\t\tenum-name = \"%s\";\n", pin.Enum)
+ fmt.Fprintf(out, "\t\t\tenum-names = \"%s\";\n", pin.Enum)
}
fmt.Fprintf(out, "\t\t};\n")
}
@@ -193,7 +192,7 @@ func generateEnabledNodes(out io.Writer, nodes []string) {
func generateLineNames(out io.Writer, gpios map[string][]lineName) {
// Sort the GPIO controller names.
var gcList []string
- for gc, _ := range gpios {
+ for gc := range gpios {
gcList = append(gcList, gc)
}
sort.Strings(gcList)
diff --git a/util/pinmap/pm/generate_test.go b/util/pinmap/pm/generate_test.go
index 3903180b1b..3ecdb7d1c2 100644
--- a/util/pinmap/pm/generate_test.go
+++ b/util/pinmap/pm/generate_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -72,7 +72,7 @@ func TestGenerate(t *testing.T) {
* However this would considerably complicate this test.
*/
expFmt :=
- `/* Copyright %d The Chromium OS Authors. All rights reserved.
+ `/* Copyright %d The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
@@ -85,7 +85,6 @@ func TestGenerate(t *testing.T) {
compatible = "named-adc-channels";
adc_ec_adc_1: ec_adc_1 {
- label = "EC_ADC_1";
enum-name = "ENUM_ADC_1";
io-channels = <&adc0 A1>;
};
@@ -117,15 +116,15 @@ func TestGenerate(t *testing.T) {
i2c_ec_c_i2c_clk: ec_c_i2c_clk {
i2c-port = <&i2c0>;
- enum-name = "ENUM_I2C_0";
+ enum-names = "ENUM_I2C_0";
};
i2c_ec_b_i2c_clk: ec_b_i2c_clk {
i2c-port = <&i2c1>;
- enum-name = "ENUM_I2C_1";
+ enum-names = "ENUM_I2C_1";
};
i2c_ec_a_i2c_clk: ec_a_i2c_clk {
i2c-port = <&i2c2>;
- enum-name = "ENUM_I2C_2";
+ enum-names = "ENUM_I2C_2";
};
};
};
diff --git a/util/pinmap/pm/pins.go b/util/pinmap/pm/pins.go
index cb749eb166..61cd7cc043 100644
--- a/util/pinmap/pm/pins.go
+++ b/util/pinmap/pm/pins.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/util/pinmap/pm/reader.go b/util/pinmap/pm/reader.go
index 08dbb9e3af..4af8e29ed9 100644
--- a/util/pinmap/pm/reader.go
+++ b/util/pinmap/pm/reader.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/util/pinmap/pm/reader_test.go b/util/pinmap/pm/reader_test.go
index 5eabf67490..ca004eab6a 100644
--- a/util/pinmap/pm/reader_test.go
+++ b/util/pinmap/pm/reader_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Copyright 2021 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.